diff --git a/src/common/network/rest/http/ClientConnection.h b/src/common/network/rest/http/ClientConnection.h
index 3b574abb..0290144a 100644
--- a/src/common/network/rest/http/ClientConnection.h
+++ b/src/common/network/rest/http/ClientConnection.h
@@ -22,6 +22,7 @@
 #include <memory>
 #include <utility>
 #include <iterator>
+
 #include <asio.hpp>
 
 namespace network
diff --git a/src/common/network/rest/http/HTTPClient.h b/src/common/network/rest/http/HTTPClient.h
index 7d544f2a..fb4191ba 100644
--- a/src/common/network/rest/http/HTTPClient.h
+++ b/src/common/network/rest/http/HTTPClient.h
@@ -18,8 +18,6 @@
 #include "common/network/rest/http/HTTPRequestHandler.h"
 #include "common/Thread.h"
 
-#include <asio.hpp>
-
 #include <thread>
 #include <string>
 #include <signal.h>
@@ -27,6 +25,8 @@
 #include <memory>
 #include <mutex>
 
+#include <asio.hpp>
+
 namespace network
 {
     namespace rest
diff --git a/src/common/network/rest/http/HTTPServer.h b/src/common/network/rest/http/HTTPServer.h
index 825c05ee..c147182b 100644
--- a/src/common/network/rest/http/HTTPServer.h
+++ b/src/common/network/rest/http/HTTPServer.h
@@ -20,14 +20,14 @@
 #include "common/network/rest/http/ServerConnectionManager.h"
 #include "common/network/rest/http/HTTPRequestHandler.h"
 
-#include <asio.hpp>
-
 #include <thread>
 #include <string>
 #include <signal.h>
 #include <utility>
 #include <memory>
 
+#include <asio.hpp>
+
 namespace network
 {
     namespace rest
diff --git a/src/common/network/rest/http/SecureClientConnection.h b/src/common/network/rest/http/SecureClientConnection.h
index f930e597..3fb661bc 100644
--- a/src/common/network/rest/http/SecureClientConnection.h
+++ b/src/common/network/rest/http/SecureClientConnection.h
@@ -24,6 +24,7 @@
 #include <memory>
 #include <utility>
 #include <iterator>
+
 #include <asio.hpp>
 #include <asio/ssl.hpp>
 
diff --git a/src/common/network/rest/http/SecureHTTPClient.h b/src/common/network/rest/http/SecureHTTPClient.h
index 41216e8c..243cde54 100644
--- a/src/common/network/rest/http/SecureHTTPClient.h
+++ b/src/common/network/rest/http/SecureHTTPClient.h
@@ -20,9 +20,6 @@
 #include "common/network/rest/http/HTTPRequestHandler.h"
 #include "common/Thread.h"
 
-#include <asio.hpp>
-#include <asio/ssl.hpp>
-
 #include <thread>
 #include <string>
 #include <signal.h>
@@ -30,6 +27,9 @@
 #include <memory>
 #include <mutex>
 
+#include <asio.hpp>
+#include <asio/ssl.hpp>
+
 namespace network
 {
     namespace rest
diff --git a/src/common/network/rest/http/SecureHTTPServer.h b/src/common/network/rest/http/SecureHTTPServer.h
index 218f7b05..4fb47cf0 100644
--- a/src/common/network/rest/http/SecureHTTPServer.h
+++ b/src/common/network/rest/http/SecureHTTPServer.h
@@ -22,15 +22,15 @@
 #include "common/network/rest/http/ServerConnectionManager.h"
 #include "common/network/rest/http/HTTPRequestHandler.h"
 
-#include <asio.hpp>
-#include <asio/ssl.hpp>
-
 #include <thread>
 #include <string>
 #include <signal.h>
 #include <utility>
 #include <memory>
 
+#include <asio.hpp>
+#include <asio/ssl.hpp>
+
 namespace network
 {
     namespace rest
diff --git a/src/common/network/rest/http/SecureServerConnection.h b/src/common/network/rest/http/SecureServerConnection.h
index 0fa1f7e1..1e9a6946 100644
--- a/src/common/network/rest/http/SecureServerConnection.h
+++ b/src/common/network/rest/http/SecureServerConnection.h
@@ -26,6 +26,7 @@
 #include <memory>
 #include <utility>
 #include <iterator>
+
 #include <asio.hpp>
 #include <asio/ssl.hpp>
 
diff --git a/src/common/network/rest/http/ServerConnection.h b/src/common/network/rest/http/ServerConnection.h
index 83beeb2d..4cc6d835 100644
--- a/src/common/network/rest/http/ServerConnection.h
+++ b/src/common/network/rest/http/ServerConnection.h
@@ -24,6 +24,7 @@
 #include <memory>
 #include <utility>
 #include <iterator>
+
 #include <asio.hpp>
 
 namespace network