diff --git a/HTTPServer.cpp b/HTTPServer.cpp
index 6897a347..bf895ced 100644
--- a/HTTPServer.cpp
+++ b/HTTPServer.cpp
@@ -1,7 +1,13 @@
 #include <ctime>
 #include <iomanip>
+#include <sstream>
+#include <thread>
+#include <memory>
+
+#include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+
 #include "Base.h"
 #include "FS.h"
 #include "Log.h"
@@ -9,6 +15,7 @@
 #include "TransitTunnel.h"
 #include "Transports.h"
 #include "NetDb.h"
+#include "LeaseSet.h"
 #include "I2PEndian.h"
 #include "Streaming.h"
 #include "Destination.h"
diff --git a/HTTPServer.h b/HTTPServer.h
index 889afca9..ead03cde 100644
--- a/HTTPServer.h
+++ b/HTTPServer.h
@@ -1,14 +1,6 @@
 #ifndef HTTP_SERVER_H__
 #define HTTP_SERVER_H__
 
-#include <sstream>
-#include <thread>
-#include <memory>
-#include <boost/asio.hpp>
-#include <boost/array.hpp>
-#include "LeaseSet.h"
-#include "Streaming.h"
-
 namespace i2p
 {
 namespace util
@@ -135,6 +127,4 @@ namespace util
 }
 }
 
-#endif
-
-
+#endif /* HTTP_SERVER_H__ */