Used IWYU to tidy up some inclusions.

4 files changed, 45 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f241abd..0d88d63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,16 @@ if(DOXYGEN_FOUND)
 	)
 endif(DOXYGEN_FOUND)
 
+option(USE_iwyu "Use include-what-you-use to trace unneeded #includes" OFF)
+if(USE_iwyu)
+	find_program(iwyu NAMES include-what-you-use iwyu)
+	if(NOT iwyu)
+		message(FATAL_ERROR "Could not find the program include-what-you-use")
+	else(NOT iwyu)
+		set(iwyu ${iwyu} -Xiwyu --mapping_file=${CMAKE_SOURCE_DIR}/cmix.imp)
+	endif(NOT iwyu)
+endif(USE_iwyu)
+	
 option(use_lto "Enable link time optimalisation" OFF)
 if(use_lto)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
diff --git a/client/cmixclient.cpp b/client/cmixclient.cpp
index 3abe1eb..ea178d3 100644
--- a/client/cmixclient.cpp
+++ b/client/cmixclient.cpp
@@ -1,7 +1,16 @@
 
 #include "cmixclient.hpp"
 
-#include <iostream>
+#include "senderreceiver.hpp"
+#include "cmix.pb.h"
+
+#include <boost/log/trivial.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/ssl.hpp>
+#include <boost/log/trivial.hpp>
+
+#include <cstdint>
+#include <algorithm>
 
 using namespace boost::asio::ip;
 using namespace boost::asio;
diff --git a/client/cmixclient.hpp b/client/cmixclient.hpp
index f1c726d..ee99d38 100644
--- a/client/cmixclient.hpp
+++ b/client/cmixclient.hpp
@@ -1,15 +1,21 @@
 #pragma once
 
 #include "senderreceiver.hpp"
-
 #include "api.h"
-#include "logging.hpp"
-#include "client.hpp"
-#include "connect.hpp"
-#include "cmix.pb.h"
+#include "groupelement.h"
+#include "keypair.h"
+#include "sharedkey.h"
+
+#include <boost/asio/io_service.hpp>
 
 #include <string>
 #include <vector>
+#include <memory>
+#include <cstddef>
+
+namespace boost { namespace asio { namespace ssl { class context; } } }
+namespace cmix_proto { class CMixMessage; }
+namespace cmix_proto { class KeyExchange; }
 
 /*!
  * \file
diff --git a/client/main.cpp b/client/main.cpp
index b84c3df..63d1ebf 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -1,14 +1,25 @@
 
 #include "cmixclient.hpp"
 
-#include "uriparser.hpp"
 #include "logging.hpp"
+#include "uriparser.hpp"
 
-#include <boost/program_options.hpp>
 #include <boost/filesystem/operations.hpp>
+#include <boost/lexical_cast/bad_lexical_cast.hpp>
+#include <boost/log/core/record.hpp>
+#include <boost/log/detail/attachable_sstream_buf.hpp>
+#include <boost/log/keywords/severity.hpp>
+#include <boost/log/sources/record_ostream.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/parameter/keyword.hpp>
+#include <boost/preprocessor/seq/enum.hpp>
+#include <boost/preprocessor/seq/size.hpp>
+#include <boost/program_options.hpp>
+#include <boost/type_index/type_index_facade.hpp>
 
-#include <vector>
 #include <iostream>
+#include <string>
+#include <vector>
 
 int main(int argc, char* argv[]) {
 	namespace po = boost::program_options;