diff --git a/AddressBook.cpp b/AddressBook.cpp
index 40e4c383..5a07b3c8 100644
--- a/AddressBook.cpp
+++ b/AddressBook.cpp
@@ -5,7 +5,6 @@
 #include <fstream>
 #include <chrono>
 #include <condition_variable>
-#include <boost/lexical_cast.hpp>
 #include <openssl/rand.h>
 #include "Base.h"
 #include "util.h"
diff --git a/ClientContext.h b/ClientContext.h
index cfbc039f..f5696902 100644
--- a/ClientContext.h
+++ b/ClientContext.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <boost/asio.hpp>
 #include "Destination.h"
+#include "I2PService.h"
 #include "HTTPProxy.h"
 #include "SOCKS.h"
 #include "I2PTunnel.h"
diff --git a/HTTPProxy.cpp b/HTTPProxy.cpp
index 6104e15e..d7af51e5 100644
--- a/HTTPProxy.cpp
+++ b/HTTPProxy.cpp
@@ -4,6 +4,13 @@
 #include <boost/regex.hpp>
 #include <string>
 #include <atomic>
+#include <memory>
+#include <set>
+#include <boost/asio.hpp>
+#include <mutex>
+
+#include "I2PService.h"
+#include "Destination.h"
 #include "HTTPProxy.h"
 #include "util.h"
 #include "Identity.h"
@@ -351,6 +358,5 @@ namespace proxy
 	{
 		return std::make_shared<HTTPProxyHandler> (this, socket);
 	}
-
 }
 }
diff --git a/HTTPProxy.h b/HTTPProxy.h
index b5ed77b9..0356adb5 100644
--- a/HTTPProxy.h
+++ b/HTTPProxy.h
@@ -1,13 +1,6 @@
 #ifndef HTTP_PROXY_H__
 #define HTTP_PROXY_H__
 
-#include <memory>
-#include <set>
-#include <boost/asio.hpp>
-#include <mutex>
-#include "I2PService.h"
-#include "Destination.h"
-
 namespace i2p
 {
 namespace proxy