diff --git a/client_http.hpp b/client_http.hpp
index fc3a057..71e6960 100644
--- a/client_http.hpp
+++ b/client_http.hpp
@@ -1,15 +1,13 @@
 #ifndef CLIENT_HTTP_HPP
 #define	CLIENT_HTTP_HPP
 
+#include "utility.hpp"
 #include <vector>
 #include <random>
 #include <mutex>
-#include <type_traits>
-#include "utility.hpp"
 
 #ifdef USE_STANDALONE_ASIO
 #include <asio.hpp>
-#include <system_error>
 namespace SimpleWeb {
     using error_code = std::error_code;
     using errc = std::errc;
diff --git a/server_http.hpp b/server_http.hpp
index ea82df8..b65b45d 100644
--- a/server_http.hpp
+++ b/server_http.hpp
@@ -1,16 +1,15 @@
 #ifndef SERVER_HTTP_HPP
 #define	SERVER_HTTP_HPP
 
+#include "utility.hpp"
 #include <map>
 #include <thread>
 #include <functional>
 #include <iostream>
 #include <sstream>
-#include "utility.hpp"
 
 #ifdef USE_STANDALONE_ASIO
 #include <asio.hpp>
-#include <type_traits>
 namespace SimpleWeb {
     using error_code = std::error_code;
     using errc = std::errc;