From 66176d44d79187720dbbae92f86ed6331436f9f4 Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Mon, 22 Jun 2020 16:23:04 -0300
Subject: [PATCH] include fixes from iwyu

---
 lokimq/address.cpp      |  8 +++++---
 lokimq/address.h        |  2 ++
 lokimq/bt_serialize.cpp |  1 +
 lokimq/bt_serialize.h   | 10 ++++++++--
 lokimq/connections.h    |  5 +++++
 lokimq/lokimq.cpp       |  4 +++-
 lokimq/lokimq.h         |  1 +
 lokimq/worker.cpp       |  1 -
 8 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/lokimq/address.cpp b/lokimq/address.cpp
index 9c3d07d..6fa0c17 100644
--- a/lokimq/address.cpp
+++ b/lokimq/address.cpp
@@ -1,10 +1,12 @@
 #include "address.h"
+#include <tuple>
+#include <limits>
+#include <cstddef>
+#include <utility>
+#include <stdexcept>
 #include "hex.h"
 #include "base32z.h"
 #include "base64.h"
-#include <tuple>
-#include <limits>
-#include <iostream>
 
 namespace lokimq {
 
diff --git a/lokimq/address.h b/lokimq/address.h
index 6aa0179..2a47557 100644
--- a/lokimq/address.h
+++ b/lokimq/address.h
@@ -29,6 +29,8 @@
 #pragma once
 #include <string>
 #include <string_view>
+#include <cstdint>
+#include <iosfwd>
 
 namespace lokimq {
 
diff --git a/lokimq/bt_serialize.cpp b/lokimq/bt_serialize.cpp
index 3e91e37..0619401 100644
--- a/lokimq/bt_serialize.cpp
+++ b/lokimq/bt_serialize.cpp
@@ -27,6 +27,7 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "bt_serialize.h"
+#include <iterator>
 
 namespace lokimq {
 namespace detail {
diff --git a/lokimq/bt_serialize.h b/lokimq/bt_serialize.h
index 4720569..c7437b3 100644
--- a/lokimq/bt_serialize.h
+++ b/lokimq/bt_serialize.h
@@ -29,13 +29,19 @@
 #pragma once
 
 #include <vector>
-#include <algorithm>
 #include <functional>
 #include <cstring>
-#include <ostream>
 #include <sstream>
+#include <ostream>
+#include <string>
 #include <string_view>
 #include <variant>
+#include <cstdint>
+#include <limits>
+#include <stdexcept>
+#include <type_traits>
+#include <utility>
+#include <algorithm>
 
 #include "bt_value.h"
 
diff --git a/lokimq/connections.h b/lokimq/connections.h
index 677c9d7..f43c567 100644
--- a/lokimq/connections.h
+++ b/lokimq/connections.h
@@ -2,6 +2,11 @@
 #include "auth.h"
 #include "bt_value.h"
 #include <string_view>
+#include <iosfwd>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <variant>
 
 namespace lokimq {
 
diff --git a/lokimq/lokimq.cpp b/lokimq/lokimq.cpp
index a9b3df8..01a939e 100644
--- a/lokimq/lokimq.cpp
+++ b/lokimq/lokimq.cpp
@@ -4,7 +4,9 @@
 #include <random>
 
 extern "C" {
-#include <sodium.h>
+#include <sodium/core.h>
+#include <sodium/crypto_box.h>
+#include <sodium/crypto_scalarmult.h>
 }
 #include "hex.h"
 
diff --git a/lokimq/lokimq.h b/lokimq/lokimq.h
index 5f51e06..93a3d4a 100644
--- a/lokimq/lokimq.h
+++ b/lokimq/lokimq.h
@@ -42,6 +42,7 @@
 #include <chrono>
 #include <atomic>
 #include <cassert>
+#include <cstdint>
 #include "zmq.hpp"
 #include "bt_serialize.h"
 #include "connections.h"
diff --git a/lokimq/worker.cpp b/lokimq/worker.cpp
index df982cf..86386d4 100644
--- a/lokimq/worker.cpp
+++ b/lokimq/worker.cpp
@@ -1,6 +1,5 @@
 #include "lokimq.h"
 #include "batch.h"
-#include "hex.h"
 #include "lokimq-internal.h"
 
 namespace lokimq {