From 2d825c248990d863f3b5e54c00b43ec0248388c1 Mon Sep 17 00:00:00 2001
From: bcsgh <33939446+bcsgh@users.noreply.github.com>
Date: Mon, 9 Mar 2020 20:38:12 -0700
Subject: [PATCH 1/3] Apply IWYU to {test/unit,examples,src}/*.{cpp,hpp}.

---
 examples/allowing_disallowing_methods.cpp    |  3 ++
 examples/basic_authentication.cpp            |  4 +++
 examples/benchmark_nodelay.cpp               |  1 +
 examples/benchmark_select.cpp                |  1 +
 examples/benchmark_threads.cpp               |  1 +
 examples/custom_access_log.cpp               |  3 ++
 examples/custom_error.cpp                    |  3 ++
 examples/deferred_with_accumulator.cpp       |  5 ++++
 examples/digest_authentication.cpp           |  4 +++
 examples/handlers.cpp                        |  3 ++
 examples/hello_with_get_arg.cpp              |  4 +++
 examples/hello_world.cpp                     |  3 ++
 examples/minimal_deferred.cpp                |  6 ++++
 examples/minimal_file_response.cpp           |  3 ++
 examples/minimal_hello_world.cpp             |  3 ++
 examples/minimal_https.cpp                   |  3 ++
 examples/minimal_ip_ban.cpp                  |  2 ++
 examples/service.cpp                         |  4 ++-
 examples/setting_headers.cpp                 |  2 ++
 examples/url_registration.cpp                |  3 ++
 src/details/http_endpoint.cpp                |  6 +++-
 src/file_response.cpp                        |  3 ++
 src/http_request.cpp                         |  3 ++
 src/http_resource.cpp                        |  5 +---
 src/http_response.cpp                        |  8 ++----
 src/http_utils.cpp                           | 17 +++++++-----
 src/httpserver.hpp                           |  3 ++
 src/httpserver/basic_auth_fail_response.hpp  |  4 +++
 src/httpserver/create_webserver.hpp          |  7 +++--
 src/httpserver/deferred_response.hpp         |  6 ++++
 src/httpserver/details/http_endpoint.hpp     |  4 ---
 src/httpserver/details/modded_request.hpp    |  8 ++++++
 src/httpserver/digest_auth_fail_response.hpp |  4 +++
 src/httpserver/file_response.hpp             |  4 +++
 src/httpserver/http_request.hpp              | 13 ++-------
 src/httpserver/http_resource.hpp             |  5 ++--
 src/httpserver/http_response.hpp             |  7 +----
 src/httpserver/http_utils.hpp                |  5 +++-
 src/httpserver/string_response.hpp           |  4 +++
 src/httpserver/webserver.hpp                 | 29 ++++++++------------
 src/string_response.cpp                      |  3 ++
 src/string_utilities.cpp                     |  2 --
 src/webserver.cpp                            | 19 ++++++-------
 test/integ/deferred.cpp                      |  1 +
 test/integ/ws_start_stop.cpp                 |  1 -
 test/unit/http_endpoint_test.cpp             |  3 ++
 test/unit/http_utils_test.cpp                |  5 ++++
 test/unit/string_utilities_test.cpp          |  2 +-
 48 files changed, 164 insertions(+), 78 deletions(-)

diff --git a/examples/allowing_disallowing_methods.cpp b/examples/allowing_disallowing_methods.cpp
index 69295af4..c88c55e1 100644
--- a/examples/allowing_disallowing_methods.cpp
+++ b/examples/allowing_disallowing_methods.cpp
@@ -18,6 +18,9 @@
      USA
 */
 
+#include <memory>
+#include <utility>
+
 #include <httpserver.hpp>
 
 using namespace httpserver;
diff --git a/examples/basic_authentication.cpp b/examples/basic_authentication.cpp
index 84de823e..7e6864b4 100644
--- a/examples/basic_authentication.cpp
+++ b/examples/basic_authentication.cpp
@@ -20,6 +20,10 @@
 
 #include <httpserver.hpp>
 
+#include <memory>
+#include <string>
+#include <utility>
+
 using namespace httpserver;
 
 class user_pass_resource : public httpserver::http_resource
diff --git a/examples/benchmark_nodelay.cpp b/examples/benchmark_nodelay.cpp
index 418f9f1c..38f934e6 100755
--- a/examples/benchmark_nodelay.cpp
+++ b/examples/benchmark_nodelay.cpp
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <memory>
+#include <utility>
 
 #include <httpserver.hpp>
 
diff --git a/examples/benchmark_select.cpp b/examples/benchmark_select.cpp
index 62a18140..7c65f48c 100755
--- a/examples/benchmark_select.cpp
+++ b/examples/benchmark_select.cpp
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <memory>
+#include <utility>
 
 #include <httpserver.hpp>
 
diff --git a/examples/benchmark_threads.cpp b/examples/benchmark_threads.cpp
index 827b1c35..17519418 100755
--- a/examples/benchmark_threads.cpp
+++ b/examples/benchmark_threads.cpp
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <memory>
+#include <utility>
 
 #include <httpserver.hpp>
 
diff --git a/examples/custom_access_log.cpp b/examples/custom_access_log.cpp
index afbc1774..02d7a4ef 100644
--- a/examples/custom_access_log.cpp
+++ b/examples/custom_access_log.cpp
@@ -19,6 +19,9 @@
 */
 
 #include <iostream>
+#include <memory>
+#include <string>
+#include <utility>
 
 #include <httpserver.hpp>
 
diff --git a/examples/custom_error.cpp b/examples/custom_error.cpp
index 034f334c..f42ec6c3 100644
--- a/examples/custom_error.cpp
+++ b/examples/custom_error.cpp
@@ -18,6 +18,9 @@
      USA
 */
 
+#include <memory>
+#include <utility>
+
 #include <httpserver.hpp>
 
 using namespace httpserver;
diff --git a/examples/deferred_with_accumulator.cpp b/examples/deferred_with_accumulator.cpp
index 06578415..284270a4 100644
--- a/examples/deferred_with_accumulator.cpp
+++ b/examples/deferred_with_accumulator.cpp
@@ -18,8 +18,13 @@
      USA
 */
 
+#include <string.h>
+#include <sys/types.h>
+#include <algorithm>
 #include <atomic>
 #include <chrono>
+#include <memory>
+#include <string>
 #include <thread>
 
 #include <httpserver.hpp>
diff --git a/examples/digest_authentication.cpp b/examples/digest_authentication.cpp
index 55f119a0..1df0d242 100644
--- a/examples/digest_authentication.cpp
+++ b/examples/digest_authentication.cpp
@@ -18,6 +18,10 @@
      USA
 */
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <httpserver.hpp>
 
 #define MY_OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4"
diff --git a/examples/handlers.cpp b/examples/handlers.cpp
index 4ddad426..c8071af2 100644
--- a/examples/handlers.cpp
+++ b/examples/handlers.cpp
@@ -18,6 +18,9 @@
      USA
 */
 
+#include <memory>
+#include <utility>
+
 #include <httpserver.hpp>
 
 using namespace httpserver;
diff --git a/examples/hello_with_get_arg.cpp b/examples/hello_with_get_arg.cpp
index 07ae90c1..ac2e2740 100644
--- a/examples/hello_with_get_arg.cpp
+++ b/examples/hello_with_get_arg.cpp
@@ -18,6 +18,10 @@
      USA
 */
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <httpserver.hpp>
 
 using namespace httpserver;
diff --git a/examples/hello_world.cpp b/examples/hello_world.cpp
index 6f8b4aad..e65c236c 100755
--- a/examples/hello_world.cpp
+++ b/examples/hello_world.cpp
@@ -19,6 +19,9 @@
 */
 
 #include <iostream>
+#include <memory>
+#include <string>
+#include <utility>
 
 #include <httpserver.hpp>
 
diff --git a/examples/minimal_deferred.cpp b/examples/minimal_deferred.cpp
index a7a3e51d..9c350192 100644
--- a/examples/minimal_deferred.cpp
+++ b/examples/minimal_deferred.cpp
@@ -18,6 +18,12 @@
      USA
 */
 
+#include <string.h>
+#include <sys/types.h>
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <httpserver.hpp>
 
 using namespace httpserver;
diff --git a/examples/minimal_file_response.cpp b/examples/minimal_file_response.cpp
index b82d2929..9ae35253 100644
--- a/examples/minimal_file_response.cpp
+++ b/examples/minimal_file_response.cpp
@@ -18,6 +18,9 @@
      USA
 */
 
+#include <memory>
+#include <utility>
+
 #include <httpserver.hpp>
 
 using namespace httpserver;
diff --git a/examples/minimal_hello_world.cpp b/examples/minimal_hello_world.cpp
index 76489a0e..30e4cd8f 100644
--- a/examples/minimal_hello_world.cpp
+++ b/examples/minimal_hello_world.cpp
@@ -18,6 +18,9 @@
      USA
 */
 
+#include <memory>
+#include <utility>
+
 #include <httpserver.hpp>
 
 using namespace httpserver;
diff --git a/examples/minimal_https.cpp b/examples/minimal_https.cpp
index def0452a..47201612 100644
--- a/examples/minimal_https.cpp
+++ b/examples/minimal_https.cpp
@@ -18,6 +18,9 @@
      USA
 */
 
+#include <memory>
+#include <utility>
+
 #include <httpserver.hpp>
 
 using namespace httpserver;
diff --git a/examples/minimal_ip_ban.cpp b/examples/minimal_ip_ban.cpp
index ea0923e7..ea55bbd8 100644
--- a/examples/minimal_ip_ban.cpp
+++ b/examples/minimal_ip_ban.cpp
@@ -19,6 +19,8 @@
 */
 
 #include <httpserver.hpp>
+#include <memory>
+#include <utility>
 
 using namespace httpserver;
 
diff --git a/examples/service.cpp b/examples/service.cpp
index e20c9a11..302582c7 100644
--- a/examples/service.cpp
+++ b/examples/service.cpp
@@ -18,10 +18,12 @@
      USA
 */
 
+#include <stdint.h>
+#include <stdlib.h>
 #include <unistd.h>
-
 #include <cstdio>
 #include <iostream>
+#include <memory>
 
 #include <httpserver.hpp>
 
diff --git a/examples/setting_headers.cpp b/examples/setting_headers.cpp
index 0fb73c79..48d3c64e 100644
--- a/examples/setting_headers.cpp
+++ b/examples/setting_headers.cpp
@@ -19,6 +19,8 @@
 */
 
 #include <httpserver.hpp>
+#include <memory>
+#include <utility>
 
 using namespace httpserver;
 
diff --git a/examples/url_registration.cpp b/examples/url_registration.cpp
index 0f8da6ad..ac5e92c8 100644
--- a/examples/url_registration.cpp
+++ b/examples/url_registration.cpp
@@ -19,6 +19,9 @@
 */
 
 #include <httpserver.hpp>
+#include <memory>
+#include <string>
+#include <utility>
 
 using namespace httpserver;
 
diff --git a/src/details/http_endpoint.cpp b/src/details/http_endpoint.cpp
index 490788c2..ef41fcf5 100644
--- a/src/details/http_endpoint.cpp
+++ b/src/details/http_endpoint.cpp
@@ -20,8 +20,12 @@
 
 #include "httpserver/details/http_endpoint.hpp"
 
+#include <stddef.h>
+#include <cctype>
+#include <memory>
+#include <stdexcept>
+
 #include "httpserver/http_utils.hpp"
-#include "httpserver/string_utilities.hpp"
 
 using namespace std;
 
diff --git a/src/file_response.cpp b/src/file_response.cpp
index 1503e4bd..e96872bc 100644
--- a/src/file_response.cpp
+++ b/src/file_response.cpp
@@ -21,6 +21,9 @@
 #include "httpserver/file_response.hpp"
 
 #include <fcntl.h>
+#include <microhttpd.h>
+#include <stddef.h>
+#include <unistd.h>
 
 using namespace std;
 
diff --git a/src/http_request.cpp b/src/http_request.cpp
index 57036639..b930acf7 100644
--- a/src/http_request.cpp
+++ b/src/http_request.cpp
@@ -21,6 +21,9 @@
 
 #include "httpserver/http_request.hpp"
 
+#include <microhttpd.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <iostream>
 
 #include "httpserver/http_utils.hpp"
diff --git a/src/http_resource.cpp b/src/http_resource.cpp
index 0fc6402a..4d82ffb9 100644
--- a/src/http_resource.cpp
+++ b/src/http_resource.cpp
@@ -20,14 +20,11 @@
 
 #include "httpserver/http_resource.hpp"
 
-#include <stdlib.h>
+#include <microhttpd.h>
 
 #include "httpserver/http_request.hpp"
 #include "httpserver/http_response.hpp"
-#include "httpserver/http_utils.hpp"
 #include "httpserver/string_response.hpp"
-#include "httpserver/string_utilities.hpp"
-#include "httpserver/webserver.hpp"
 
 using namespace std;
 
diff --git a/src/http_response.cpp b/src/http_response.cpp
index c502f2ac..52cf0287 100644
--- a/src/http_response.cpp
+++ b/src/http_response.cpp
@@ -20,15 +20,11 @@
 
 #include "httpserver/http_response.hpp"
 
-#include <fcntl.h>
-#include <unistd.h>
-#include <cstdio>
-#include <functional>
+#include <microhttpd.h>
 #include <iostream>
-#include <sstream>
+#include <utility>
 
 #include "httpserver/http_utils.hpp"
-#include "httpserver/webserver.hpp"
 
 using namespace std;
 
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
index fe9f2ab4..f3f122af 100644
--- a/src/http_utils.cpp
+++ b/src/http_utils.cpp
@@ -21,22 +21,25 @@
 #include "httpserver/http_utils.hpp"
 
 #if defined(__MINGW32__) || defined(__CYGWIN32__)
+#include <ws2def.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #else
-#include <sys/socket.h>
-#include <netdb.h>
 #include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <iomanip>
 #include <fstream>
-#include <iostream>
+#include <iomanip>
+#include <memory>
 #include <sstream>
 #include <stdexcept>
+#include <utility>
 
 #include "httpserver/string_utilities.hpp"
 
@@ -404,7 +407,7 @@ ip_representation::ip_representation(const std::string& ip)
 
                 if (parts[i].size() < 4)
                 {
-                    stringstream ss;
+                    std::stringstream ss;
                     ss << setfill('0') << setw(4) << parts[i];
                     parts[i] = ss.str();
                 }
@@ -546,7 +549,7 @@ bool ip_representation::operator <(const ip_representation& b) const
 
 const std::string load_file (const std::string& filename)
 {
-    ifstream fp(filename.c_str(), ios::in | ios::binary | ios::ate);
+    std::ifstream fp(filename.c_str(), ios::in | ios::binary | ios::ate);
     if(fp.is_open())
     {
         std::string content;
diff --git a/src/httpserver.hpp b/src/httpserver.hpp
index 772554af..8f684b0b 100644
--- a/src/httpserver.hpp
+++ b/src/httpserver.hpp
@@ -23,7 +23,9 @@
 
 #define _HTTPSERVER_HPP_INSIDE_
 
+// IWYU pragma: begin_exports
 #include "httpserver/basic_auth_fail_response.hpp"
+#include "httpserver/create_webserver.hpp"
 #include "httpserver/deferred_response.hpp"
 #include "httpserver/digest_auth_fail_response.hpp"
 #include "httpserver/file_response.hpp"
@@ -33,5 +35,6 @@
 #include "httpserver/http_utils.hpp"
 #include "httpserver/string_response.hpp"
 #include "httpserver/webserver.hpp"
+// IWYU pragma: end_exports
 
 #endif
diff --git a/src/httpserver/basic_auth_fail_response.hpp b/src/httpserver/basic_auth_fail_response.hpp
index c7e2d476..fa4ae7d7 100644
--- a/src/httpserver/basic_auth_fail_response.hpp
+++ b/src/httpserver/basic_auth_fail_response.hpp
@@ -25,6 +25,10 @@
 #ifndef _BASIC_AUTH_FAIL_RESPONSE_HPP_
 #define _BASIC_AUTH_FAIL_RESPONSE_HPP_
 
+#include <microhttpd.h>
+#include <string>
+
+#include "httpserver/http_utils.hpp"
 #include "httpserver/string_response.hpp"
 
 namespace httpserver
diff --git a/src/httpserver/create_webserver.hpp b/src/httpserver/create_webserver.hpp
index e8d1a018..0d6e4a23 100644
--- a/src/httpserver/create_webserver.hpp
+++ b/src/httpserver/create_webserver.hpp
@@ -25,8 +25,12 @@
 #ifndef _CREATE_WEBSERVER_HPP_
 #define _CREATE_WEBSERVER_HPP_
 
+#include <stdint.h>
 #include <stdlib.h>
+#include <string>
+#include <memory>
 
+#include "httpserver/http_request.hpp"
 #include "httpserver/http_response.hpp"
 #include "httpserver/http_utils.hpp"
 
@@ -35,9 +39,6 @@
 
 namespace httpserver {
 
-class webserver;
-class http_request;
-
 typedef const std::shared_ptr<http_response>(*render_ptr)(const http_request&);
 typedef bool(*validator_ptr)(const std::string&);
 typedef void(*log_access_ptr)(const std::string&);
diff --git a/src/httpserver/deferred_response.hpp b/src/httpserver/deferred_response.hpp
index 170d5e82..bee3f108 100644
--- a/src/httpserver/deferred_response.hpp
+++ b/src/httpserver/deferred_response.hpp
@@ -25,9 +25,15 @@
 #ifndef _DEFERRED_RESPONSE_HPP_
 #define _DEFERRED_RESPONSE_HPP_
 
+#include <microhttpd.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/types.h>
 #include <memory>
+#include <string>
 
 #include "httpserver/string_response.hpp"
+#include "httpserver/http_utils.hpp"
 
 namespace httpserver
 {
diff --git a/src/httpserver/details/http_endpoint.hpp b/src/httpserver/details/http_endpoint.hpp
index 8264d6cc..716efd8c 100644
--- a/src/httpserver/details/http_endpoint.hpp
+++ b/src/httpserver/details/http_endpoint.hpp
@@ -26,9 +26,7 @@
 #define _HTTP_ENDPOINT_HPP_
 
 #include <regex.h>
-#include <stdexcept>
 #include <string>
-#include <utility>
 #include <vector>
 
 namespace httpserver
@@ -37,8 +35,6 @@ namespace httpserver
 namespace details
 {
 
-class http_resource;
-
 /**
  * Class representing an Http Endpoint. It is an abstraction used by the APIs.
 **/
diff --git a/src/httpserver/details/modded_request.hpp b/src/httpserver/details/modded_request.hpp
index 1ebe5b12..db8dac71 100644
--- a/src/httpserver/details/modded_request.hpp
+++ b/src/httpserver/details/modded_request.hpp
@@ -25,10 +25,18 @@
 #ifndef _MODDED_REQUEST_HPP_
 #define _MODDED_REQUEST_HPP_
 
+#include <microhttpd.h>
+#include <stddef.h>
+#include <memory>
+#include <string>
+
 #include "httpserver/http_request.hpp"
+#include "httpserver/http_resource.hpp"
+#include "httpserver/http_response.hpp"
 
 namespace httpserver
 {
+class webserver;  // Break cycle
 
 namespace details
 {
diff --git a/src/httpserver/digest_auth_fail_response.hpp b/src/httpserver/digest_auth_fail_response.hpp
index 292f477b..4fb29a3e 100644
--- a/src/httpserver/digest_auth_fail_response.hpp
+++ b/src/httpserver/digest_auth_fail_response.hpp
@@ -25,7 +25,11 @@
 #ifndef _DIGEST_AUTH_FAIL_RESPONSE_HPP_
 #define _DIGEST_AUTH_FAIL_RESPONSE_HPP_
 
+#include <microhttpd.h>
+#include <string>
+
 #include "httpserver/string_response.hpp"
+#include "httpserver/http_utils.hpp"
 
 namespace httpserver
 {
diff --git a/src/httpserver/file_response.hpp b/src/httpserver/file_response.hpp
index cb80c114..a65b9197 100644
--- a/src/httpserver/file_response.hpp
+++ b/src/httpserver/file_response.hpp
@@ -25,7 +25,11 @@
 #ifndef _FILE_RESPONSE_HPP_
 #define _FILE_RESPONSE_HPP_
 
+#include <microhttpd.h>
+#include <string>
+
 #include "httpserver/http_response.hpp"
+#include "httpserver/http_utils.hpp"
 
 namespace httpserver
 {
diff --git a/src/httpserver/http_request.hpp b/src/httpserver/http_request.hpp
index 139272be..1c8b4c5f 100644
--- a/src/httpserver/http_request.hpp
+++ b/src/httpserver/http_request.hpp
@@ -25,6 +25,9 @@
 #ifndef _HTTP_REQUEST_HPP_
 #define _HTTP_REQUEST_HPP_
 
+#include <microhttpd.h>
+#include <stddef.h>
+#include <algorithm>
 #include <iosfwd>
 #include <map>
 #include <string>
@@ -33,19 +36,9 @@
 
 #include "httpserver/http_utils.hpp"
 
-struct MHD_Connection;
-
 namespace httpserver
 {
 
-class webserver;
-
-namespace http
-{
-    class header_comparator;
-    class arg_comparator;
-};
-
 /**
  * Class representing an abstraction for an Http Request. It is used from classes using these apis to receive information through http protocol.
 **/
diff --git a/src/httpserver/http_resource.hpp b/src/httpserver/http_resource.hpp
index 7841b96b..cbd165ad 100644
--- a/src/httpserver/http_resource.hpp
+++ b/src/httpserver/http_resource.hpp
@@ -31,15 +31,14 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <utility>
 
+#include "httpserver/http_request.hpp"
 #include "httpserver/http_response.hpp"
 
 namespace httpserver
 {
 
-class webserver;
-class http_request;
-
 namespace details
 {
 
diff --git a/src/httpserver/http_response.hpp b/src/httpserver/http_response.hpp
index 33c1df42..ad2a3dd6 100644
--- a/src/httpserver/http_response.hpp
+++ b/src/httpserver/http_response.hpp
@@ -25,18 +25,13 @@
 #ifndef _HTTP_RESPONSE_HPP_
 #define _HTTP_RESPONSE_HPP_
 
+#include <microhttpd.h>
 #include <iosfwd>
 #include <map>
-#include <stdint.h>
 #include <string>
-#include <utility>
-#include <vector>
 
 #include "httpserver/http_utils.hpp"
 
-struct MHD_Connection;
-struct MHD_Response;
-
 namespace httpserver
 {
 
diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
index 9b22ea97..e1ac28ff 100644
--- a/src/httpserver/http_utils.hpp
+++ b/src/httpserver/http_utils.hpp
@@ -35,12 +35,15 @@
 #define _WINDOWS
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x600
+// DO NOT SUBMIT
+#elseif
+#include <sys/socket.h>
 #endif
 
 #include <microhttpd.h>
+#include <stddef.h>
 #include <algorithm>
 #include <cctype>
-#include <exception>
 #include <iosfwd>
 #include <map>
 #include <string>
diff --git a/src/httpserver/string_response.hpp b/src/httpserver/string_response.hpp
index 87f12c67..92c13648 100644
--- a/src/httpserver/string_response.hpp
+++ b/src/httpserver/string_response.hpp
@@ -25,7 +25,11 @@
 #ifndef _STRING_RESPONSE_HPP_
 #define _STRING_RESPONSE_HPP_
 
+#include <microhttpd.h>
+#include <string>
+
 #include "httpserver/http_response.hpp"
+#include "httpserver/http_utils.hpp"
 
 namespace httpserver
 {
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
index 8debfe7f..5f6162ae 100644
--- a/src/httpserver/webserver.hpp
+++ b/src/httpserver/webserver.hpp
@@ -30,36 +30,31 @@
 #define NOT_METHOD_ERROR "Method not Acceptable"
 #define GENERIC_ERROR "Internal Error"
 
+#if defined(__MINGW32__) || defined(__CYGWIN32__)
+#include <ws2tcpip.h>
+#else
+#include <sys/socket.h>
+#endif
+
+#include <microhttpd.h>
 #include <pthread.h>
+#include <stdarg.h>
+#include <stdint.h>
 #include <stdlib.h>
-#include <cstring>
-#include <deque>
 #include <map>
 #include <memory>
 #include <set>
-#include <stdexcept>
 #include <string>
-#include <utility>
-#include <vector>
 
 #include "httpserver/create_webserver.hpp"
 #include "httpserver/details/http_endpoint.hpp"
+#include "httpserver/details/modded_request.hpp"
+#include "httpserver/http_resource.hpp"
 #include "httpserver/http_response.hpp"
+#include "httpserver/http_utils.hpp"
 
 namespace httpserver {
 
-class http_resource;
-class create_webserver;
-
-namespace http {
-struct ip_representation;
-struct httpserver_ska;
-};
-
-namespace details {
-    struct modded_request;
-}
-
 /**
  * Class representing the webserver. Main class of the apis.
 **/
diff --git a/src/string_response.cpp b/src/string_response.cpp
index 7720d61b..f05e27a0 100644
--- a/src/string_response.cpp
+++ b/src/string_response.cpp
@@ -20,6 +20,9 @@
 
 #include "httpserver/string_response.hpp"
 
+#include <microhttpd.h>
+#include <stddef.h>
+
 using namespace std;
 
 namespace httpserver
diff --git a/src/string_utilities.cpp b/src/string_utilities.cpp
index cbcbb40b..586a9b28 100644
--- a/src/string_utilities.cpp
+++ b/src/string_utilities.cpp
@@ -23,9 +23,7 @@
 #include <regex.h>
 #include <algorithm>
 #include <cctype>
-#include <cstdlib>
 #include <cstring>
-#include <istream>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/src/webserver.cpp b/src/webserver.cpp
index ca4da9fe..9883a7c5 100644
--- a/src/webserver.cpp
+++ b/src/webserver.cpp
@@ -25,25 +25,23 @@
 #include <ws2tcpip.h>
 #define _WINDOWS
 #else
-#include <netinet/ip.h>
+#include <netinet/in.h>
 #include <netinet/tcp.h>
 #endif
 
 #include <errno.h>
-#include <fcntl.h>
-#include <inttypes.h>
 #include <microhttpd.h>
 #include <signal.h>
-#include <stdexcept>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <algorithm>
-#include <iostream>
+#include <strings.h>
+#include <cstring>
+#include <exception>
+#include <memory>
+#include <stdexcept>
+#include <utility>
+#include <vector>
 
 #include "gettext.h"
 #include "httpserver/create_webserver.hpp"
@@ -54,7 +52,6 @@
 #include "httpserver/http_response.hpp"
 #include "httpserver/http_utils.hpp"
 #include "httpserver/string_response.hpp"
-#include "httpserver/string_utilities.hpp"
 
 #define _REENTRANT 1
 
diff --git a/test/integ/deferred.cpp b/test/integ/deferred.cpp
index 0f6cdb97..0898d48c 100644
--- a/test/integ/deferred.cpp
+++ b/test/integ/deferred.cpp
@@ -32,6 +32,7 @@
 
 #include <curl/curl.h>
 #include <signal.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "httpserver.hpp"
diff --git a/test/integ/ws_start_stop.cpp b/test/integ/ws_start_stop.cpp
index 739e9d16..27987b59 100644
--- a/test/integ/ws_start_stop.cpp
+++ b/test/integ/ws_start_stop.cpp
@@ -32,7 +32,6 @@
 
 #include <curl/curl.h>
 #include <pthread.h>
-#include <unistd.h>
 
 #include "httpserver.hpp"
 #include "littletest.hpp"
diff --git a/test/unit/http_endpoint_test.cpp b/test/unit/http_endpoint_test.cpp
index d174f5e6..a67b8c96 100644
--- a/test/unit/http_endpoint_test.cpp
+++ b/test/unit/http_endpoint_test.cpp
@@ -20,6 +20,9 @@
 
 #include "httpserver/details/http_endpoint.hpp"
 
+#include <exception>
+#include <iostream>
+
 #include "littletest.hpp"
 
 using namespace httpserver;
diff --git a/test/unit/http_utils_test.cpp b/test/unit/http_utils_test.cpp
index 96c0a9cd..a53a1f4e 100644
--- a/test/unit/http_utils_test.cpp
+++ b/test/unit/http_utils_test.cpp
@@ -28,9 +28,14 @@
 #include <ws2tcpip.h>
 #else
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #endif
 
+#include <stdlib.h>
 #include <cstdio>
+#include <exception>
+#include <iostream>
+#include <sstream>
 
 #include "littletest.hpp"
 
diff --git a/test/unit/string_utilities_test.cpp b/test/unit/string_utilities_test.cpp
index 8d3ac6c7..57905b4d 100644
--- a/test/unit/string_utilities_test.cpp
+++ b/test/unit/string_utilities_test.cpp
@@ -20,7 +20,7 @@
 
 #include "httpserver/string_utilities.hpp"
 
-#include <cstdio>
+#include <exception>
 
 #include "littletest.hpp"
 

From 93b74b13000c7a20544d8a15f6525b79d73e8cb4 Mon Sep 17 00:00:00 2001
From: bcsgh <33939446+bcsgh@users.noreply.github.com>
Date: Mon, 9 Mar 2020 22:44:44 -0700
Subject: [PATCH 2/3] Correct web-socket include for windows.

---
 src/httpserver/http_utils.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
index e1ac28ff..600d7e39 100644
--- a/src/httpserver/http_utils.hpp
+++ b/src/httpserver/http_utils.hpp
@@ -35,8 +35,8 @@
 #define _WINDOWS
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x600
-// DO NOT SUBMIT
-#elseif
+#include <ws2tcpip.h>
+#else
 #include <sys/socket.h>
 #endif
 

From b22b69845b0c560815f19e1e9588ff3f2923148b Mon Sep 17 00:00:00 2001
From: bcsgh <33939446+bcsgh@users.noreply.github.com>
Date: Tue, 10 Mar 2020 07:46:48 -0700
Subject: [PATCH 3/3] Correct unistd include for windows.

---
 test/integ/ws_start_stop.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integ/ws_start_stop.cpp b/test/integ/ws_start_stop.cpp
index 27987b59..739e9d16 100644
--- a/test/integ/ws_start_stop.cpp
+++ b/test/integ/ws_start_stop.cpp
@@ -32,6 +32,7 @@
 
 #include <curl/curl.h>
 #include <pthread.h>
+#include <unistd.h>
 
 #include "httpserver.hpp"
 #include "littletest.hpp"