diff --git a/webserv/client/Client.cpp b/webserv/client/Client.cpp
index 080e53d..a598f86 100644
--- a/webserv/client/Client.cpp
+++ b/webserv/client/Client.cpp
@@ -1,15 +1,15 @@
 #include <webserv/client/Client.hpp>
-#include <webserv/http/HttpHeaders.hpp> // for HttpHeaders
-#include <webserv/log/Log.hpp>          // for Log
-#include <webserv/server/Server.hpp>    // for Server
-#include <webserv/socket/Socket.hpp>    // for Socket
+#include <webserv/http/HttpHeaders.hpp>  // for HttpHeaders
+#include <webserv/log/Log.hpp>           // for Log, LOCATION
+#include <webserv/server/Server.hpp>     // for Server
+#include <webserv/socket/Socket.hpp>     // for Socket
+#include <sys/types.h>                   // for ssize_t
+#include <cstdint>                       // for uint8_t
+#include <functional>                    // for reference_wrapper, cref, ref
+#include <map>                           // for map
+#include <utility>                       // for pair, move
 
-#include <cstdint>    // for uint8_t
-#include <functional> // for reference_wrapper, cref, ref
-#include <map>        // for map
-#include <utility>    // for pair, move
-
-#include <sys/types.h> // for ssize_t
+class ServerConfig;
 
 Client::Client(std::unique_ptr<Socket> socket, Server &server, const ServerConfig &server_config)
     : client_socket_(std::move(socket)), server_(std::ref(server)), server_config_(std::cref(server_config)),
diff --git a/webserv/client/Client.hpp b/webserv/client/Client.hpp
index 2ca27a3..32723c6 100644
--- a/webserv/client/Client.hpp
+++ b/webserv/client/Client.hpp
@@ -1,16 +1,16 @@
 #pragma once
 
 #include <webserv/config/ServerConfig.hpp> // for ServerConfig
-#include <webserv/http/HttpRequest.hpp>    // for HttpRequest
+#include <webserv/http/HttpRequest.hpp>  // for HttpRequest
 #include <webserv/server/Server.hpp>
 #include <webserv/socket/Socket.hpp>
-
-#include <cstddef> // for size_t
-#include <memory>  // for unique_ptr
-#include <string>  // for string
+#include <cstddef>                       // for size_t
+#include <memory>                        // for unique_ptr
+#include <string>                        // for string
 
 class Server;
 class Socket;
+class ServerConfig;
 
 class Client
 {
diff --git a/webserv/config/AConfig.cpp b/webserv/config/AConfig.cpp
index 34b6dd1..6235328 100644
--- a/webserv/config/AConfig.cpp
+++ b/webserv/config/AConfig.cpp
@@ -1,8 +1,10 @@
 #include <webserv/config/AConfig.hpp>                    // for AConfig
-#include <webserv/config/directive/ADirective.hpp>       // for ADirective
-#include <webserv/config/directive/DirectiveFactory.hpp> // for DirectiveFactory
-#include <webserv/config/utils.hpp>                      // for trim
-#include <webserv/log/Log.hpp>                           // for Log, LOCATION
+#include <webserv/config/directive/ADirective.hpp>        // for ADirective
+#include <webserv/config/directive/DirectiveFactory.hpp>  // for DirectiveFactory
+#include <webserv/config/utils.hpp>                       // for trim
+#include <webserv/log/Log.hpp>                            // for Log, LOCATION
+#include <sstream>                                        // for basic_stringstream, stringstream
+#include <utility>                                        // for move, pair
 
 AConfig::AConfig(const AConfig *parent) : parent_(parent) {}
 
diff --git a/webserv/config/AConfig.hpp b/webserv/config/AConfig.hpp
index bad0a55..f6df4ec 100644
--- a/webserv/config/AConfig.hpp
+++ b/webserv/config/AConfig.hpp
@@ -1,13 +1,12 @@
 #pragma once
 
+#include <webserv/config/directive/ADirective.hpp>  // for ADirective
+#include <map>                                      // for map
+#include <memory>                                   // for unique_ptr
+#include <string>                                   // for basic_string, string
+
 #include "webserv/config/directive/DirectiveValue.hpp"
 
-#include <webserv/config/directive/ADirective.hpp> // for ADirective
-
-#include <map>
-#include <memory>
-#include <string>
-
 class AConfig
 {
   public:
diff --git a/webserv/config/ConfigManager.cpp b/webserv/config/ConfigManager.cpp
index 8b929c3..055eb17 100644
--- a/webserv/config/ConfigManager.cpp
+++ b/webserv/config/ConfigManager.cpp
@@ -1,13 +1,12 @@
 #include <webserv/config/ConfigManager.hpp>
-#include <webserv/config/ServerConfig.hpp>               // for ServerConfig
-#include <webserv/config/directive/DirectiveFactory.hpp> // for DirectiveFactory
-#include <webserv/config/utils.hpp>                      // for trim, findCorrespondingClosingBrace, trimSemi
-#include <webserv/log/Log.hpp>                           // for Log, LOCATION
+#include <webserv/config/utils.hpp>         // for removeComments
+#include <webserv/log/Log.hpp>              // for Log
+#include <fstream>                          // for basic_ifstream, basic_filebuf, basic_ostream::operator<<, ifstream, stringstream
+#include <sstream>                          // for basic_stringstream
+#include <stdexcept>                        // for runtime_error
+#include <string>                           // for char_traits, operator+, basic_string, string
 
-#include <fstream> // for basic_ifstream, basic_istream, basic_filebuf, basic_ostream::operator<<, stringstream, ifstream, istringstream
-#include <sstream>   // for basic_stringstream, basic_istringstream
-#include <stdexcept> // for runtime_error
-#include <string>    // for basic_string, char_traits, string, operator+, to_string, getline, operator<=>
+#include "webserv/config/GlobalConfig.hpp"  // for GlobalConfig
 
 ConfigManager::ConfigManager() : initialized_(false) {}
 
diff --git a/webserv/config/ConfigManager.hpp b/webserv/config/ConfigManager.hpp
index 671a473..3c0935a 100644
--- a/webserv/config/ConfigManager.hpp
+++ b/webserv/config/ConfigManager.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <webserv/config/GlobalConfig.hpp>
-#include <webserv/config/ServerConfig.hpp> // for ServerConfig
-
-#include <memory> // for unique_ptr
-#include <string> // for string
-#include <vector> // for vector
+#include <webserv/config/ServerConfig.hpp>  // for ServerConfig
+#include <memory>                           // for unique_ptr
+#include <string>                           // for string
+#include <vector>                           // for vector
 
 class ADirective;
+class GlobalConfig;
 
 class ConfigManager
 {
diff --git a/webserv/config/GlobalConfig.cpp b/webserv/config/GlobalConfig.cpp
index 6bb802c..3d2066a 100644
--- a/webserv/config/GlobalConfig.cpp
+++ b/webserv/config/GlobalConfig.cpp
@@ -1,8 +1,9 @@
 #include <webserv/config/GlobalConfig.hpp>
-#include <webserv/config/utils.hpp>
-#include <webserv/log/Log.hpp> // for Log, LOCATION
-
-#include <vector>
+#include <webserv/config/utils.hpp>  // for findCorrespondingClosingBrace
+#include <webserv/log/Log.hpp>       // for Log
+#include <stddef.h>                  // for size_t
+#include <vector>                    // for vector
+#include <stdexcept>                 // for runtime_error
 
 GlobalConfig::GlobalConfig(const std::string &block)
 {
diff --git a/webserv/config/GlobalConfig.hpp b/webserv/config/GlobalConfig.hpp
index 4609945..464916b 100644
--- a/webserv/config/GlobalConfig.hpp
+++ b/webserv/config/GlobalConfig.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
-#include <webserv/config/AConfig.hpp> // for AConfig
-#include <webserv/config/ServerConfig.hpp>
+#include <webserv/config/AConfig.hpp>       // for AConfig
+#include <webserv/config/ServerConfig.hpp>  // for ServerConfig
+#include <memory>                           // for unique_ptr
+#include <string>                           // for string
+#include <vector>                           // for vector
 
 class GlobalConfig : public AConfig
 {
diff --git a/webserv/config/LocationConfig.hpp b/webserv/config/LocationConfig.hpp
index 44a3b46..d4d28ca 100644
--- a/webserv/config/LocationConfig.hpp
+++ b/webserv/config/LocationConfig.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <webserv/config/AConfig.hpp> // for AConfig
+#include <webserv/config/AConfig.hpp>  // for AConfig
+#include <string>                      // for string
 
 class LocationConfig : public AConfig
 {
diff --git a/webserv/config/ServerConfig.cpp b/webserv/config/ServerConfig.cpp
index 10f6d3b..5d5da7a 100644
--- a/webserv/config/ServerConfig.cpp
+++ b/webserv/config/ServerConfig.cpp
@@ -1,7 +1,12 @@
-#include <webserv/config/LocationConfig.hpp>
+#include <webserv/config/LocationConfig.hpp>  // for LocationConfig
 #include <webserv/config/ServerConfig.hpp>
-#include <webserv/config/utils.hpp>
-#include <webserv/log/Log.hpp> // for Log, LOCATION
+#include <webserv/config/utils.hpp>           // for findCorrespondingClosingBrace, trim
+#include <webserv/log/Log.hpp>                // for Log, LOCATION
+#include <stddef.h>                           // for size_t
+#include <stdexcept>                          // for runtime_error
+#include <utility>                            // for pair
+
+#include "webserv/config/AConfig.hpp"         // for AConfig
 
 ServerConfig::ServerConfig(const std::string &block, const AConfig *parent) : AConfig(parent)
 {
diff --git a/webserv/config/ServerConfig.hpp b/webserv/config/ServerConfig.hpp
index 4116ce9..490f03f 100644
--- a/webserv/config/ServerConfig.hpp
+++ b/webserv/config/ServerConfig.hpp
@@ -1,7 +1,11 @@
 #pragma once
 
-#include <webserv/config/AConfig.hpp>        // for AConfig
-#include <webserv/config/LocationConfig.hpp> // for LocationConfig
+#include <webserv/config/AConfig.hpp>         // for AConfig
+#include <webserv/config/LocationConfig.hpp>  // for LocationConfig
+#include <map>                                // for map
+#include <memory>                             // for unique_ptr
+#include <string>                             // for basic_string, string
+#include <vector>                             // for vector
 
 class ServerConfig : public AConfig
 {
diff --git a/webserv/config/directive/ADirective.hpp b/webserv/config/directive/ADirective.hpp
index a6ee2e5..89917bf 100644
--- a/webserv/config/directive/ADirective.hpp
+++ b/webserv/config/directive/ADirective.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <webserv/config/directive/DirectiveValue.hpp> // for DirectiveValue, DirectiveValueType
-
 #include <iostream> // for ostream
 #include <string>   // for string, basic_string
 #include <utility>  // for move
diff --git a/webserv/config/directive/BoolDirective.cpp b/webserv/config/directive/BoolDirective.cpp
index dacc044..d03a47d 100644
--- a/webserv/config/directive/BoolDirective.cpp
+++ b/webserv/config/directive/BoolDirective.cpp
@@ -1,9 +1,11 @@
 #include <webserv/config/directive/BoolDirective.hpp> // for IntDirective
-#include <webserv/config/utils.hpp>                   // for trim
+#include <webserv/config/utils.hpp>                     // for trim
+#include <algorithm>                                    // for __transform_fn, transform
+#include <cctype>                                       // for tolower
+#include <stdexcept>                                    // for invalid_argument
 
-#include <algorithm> // for __transform_fn, transform
-#include <cctype>    // for tolower
-#include <stdexcept> // for invalid_argument
+#include "webserv/config/directive/ADirective.hpp"      // for ADirective
+#include "webserv/config/directive/DirectiveValue.hpp"  // for DirectiveValueType
 
 BoolDirective::BoolDirective(const std::string &name, const std::string &value)
     : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters)
diff --git a/webserv/config/directive/BoolDirective.hpp b/webserv/config/directive/BoolDirective.hpp
index ff3bbc8..508d969 100644
--- a/webserv/config/directive/BoolDirective.hpp
+++ b/webserv/config/directive/BoolDirective.hpp
@@ -2,7 +2,6 @@
 
 #include <webserv/config/directive/ADirective.hpp>     // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp> // for DirectiveValueType
-
 #include <string> // for string, basic_string
 
 class BoolDirective : public ADirective
diff --git a/webserv/config/directive/DirectiveFactory.cpp b/webserv/config/directive/DirectiveFactory.cpp
index 51d1e27..7ecc26c 100644
--- a/webserv/config/directive/DirectiveFactory.cpp
+++ b/webserv/config/directive/DirectiveFactory.cpp
@@ -1,16 +1,16 @@
-#include "webserv/log/Log.hpp"
-
-#include <webserv/config/directive/BoolDirective.hpp>      // for BoolDirective
+#include <webserv/config/directive/BoolDirective.hpp>       // for BoolDirective
 #include <webserv/config/directive/DirectiveFactory.hpp>   // for DirectiveFactory
-#include <webserv/config/directive/IntDirective.hpp>       // for IntDirective
-#include <webserv/config/directive/IntStringDirective.hpp> // for IntStringDirective
-#include <webserv/config/directive/SizeDirective.hpp>      // for SizeDirective
-#include <webserv/config/directive/StringDirective.hpp>    // for StringDirective
-#include <webserv/config/directive/VectorDirective.hpp>    // for VectorDirective
-#include <webserv/config/utils.hpp>                        // for trim, trimSemi
+#include <webserv/config/directive/IntDirective.hpp>        // for IntDirective
+#include <webserv/config/directive/IntStringDirective.hpp>  // for IntStringDirective
+#include <webserv/config/directive/SizeDirective.hpp>       // for SizeDirective
+#include <webserv/config/directive/StringDirective.hpp>     // for StringDirective
+#include <webserv/config/directive/VectorDirective.hpp>     // for VectorDirective
+#include <webserv/config/utils.hpp>                         // for trim, trimSemi
+#include <sstream>                                          // for basic_stringstream, stringstream
+#include <stdexcept>                                        // for invalid_argument
+#include <utility>                                          // for pair
 
-#include <sstream>   // for basic_stringstream, stringstream
-#include <stdexcept> // for invalid_argument
+#include "webserv/log/Log.hpp"                              // for LOCATION, Log
 
 class ADirective;
 
diff --git a/webserv/config/directive/DirectiveFactory.hpp b/webserv/config/directive/DirectiveFactory.hpp
index b8df032..8e6a558 100644
--- a/webserv/config/directive/DirectiveFactory.hpp
+++ b/webserv/config/directive/DirectiveFactory.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include <webserv/config/directive/ADirective.hpp> // for ADirective
-
 #include <array>         // for array
 #include <functional>    // for function
 #include <memory>        // for unique_ptr
diff --git a/webserv/config/directive/DirectiveValue.cpp b/webserv/config/directive/DirectiveValue.cpp
index d7b7a94..4ad7ce4 100644
--- a/webserv/config/directive/DirectiveValue.cpp
+++ b/webserv/config/directive/DirectiveValue.cpp
@@ -1,11 +1,9 @@
-#include <webserv/config/directive/ADirective.hpp> // for ADirective, operator<<
 #include <webserv/config/directive/DirectiveValue.hpp>
-
-#include <cstddef> // for size_t
-#include <string>  // for string, basic_string, allocator, char_traits, operator+, to_string, operator<<
-#include <utility> // for pair
-#include <variant> // for visit
-#include <vector>  // for vector
+#include <cstddef>  // for size_t
+#include <string>   // for string, basic_string, allocator, operator+, char_traits, to_string, operator<<
+#include <utility>  // for pair
+#include <variant>  // for visit
+#include <vector>   // for vector
 
 //
 
diff --git a/webserv/config/directive/IntDirective.cpp b/webserv/config/directive/IntDirective.cpp
index f4f1e5c..5cb4fd4 100644
--- a/webserv/config/directive/IntDirective.cpp
+++ b/webserv/config/directive/IntDirective.cpp
@@ -1,5 +1,8 @@
 #include <webserv/config/directive/IntDirective.hpp> // for IntDirective
 
+#include "webserv/config/directive/ADirective.hpp"      // for ADirective
+#include "webserv/config/directive/DirectiveValue.hpp"  // for DirectiveValueType
+
 IntDirective::IntDirective(const std::string &name, const std::string &value)
     : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters)
 {
diff --git a/webserv/config/directive/IntDirective.hpp b/webserv/config/directive/IntDirective.hpp
index 1f83da8..972db46 100644
--- a/webserv/config/directive/IntDirective.hpp
+++ b/webserv/config/directive/IntDirective.hpp
@@ -2,7 +2,6 @@
 
 #include <webserv/config/directive/ADirective.hpp>     // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp> // for DirectiveValueType
-
 #include <string> // for string, basic_string
 
 class IntDirective : public ADirective
diff --git a/webserv/config/directive/IntStringDirective.cpp b/webserv/config/directive/IntStringDirective.cpp
index 005150a..d002df7 100644
--- a/webserv/config/directive/IntStringDirective.cpp
+++ b/webserv/config/directive/IntStringDirective.cpp
@@ -1,7 +1,9 @@
 #include <webserv/config/directive/IntStringDirective.hpp> // for IntDirective
-#include <webserv/config/utils.hpp>                        // for trim
+#include <webserv/config/utils.hpp>                     // for trim
+#include <sstream>                                      // for basic_istringstream, basic_istream::operator>>, istringstream
 
-#include <sstream> // for basic_istringstream, basic_istream::operator>>, istringstream
+#include "webserv/config/directive/ADirective.hpp"      // for ADirective
+#include "webserv/config/directive/DirectiveValue.hpp"  // for DirectiveValueType
 
 IntStringDirective::IntStringDirective(const std::string &name, const std::string &value)
     : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters)
diff --git a/webserv/config/directive/IntStringDirective.hpp b/webserv/config/directive/IntStringDirective.hpp
index a0f5280..c085631 100644
--- a/webserv/config/directive/IntStringDirective.hpp
+++ b/webserv/config/directive/IntStringDirective.hpp
@@ -1,7 +1,6 @@
 #pragma once
 #include <webserv/config/directive/ADirective.hpp>     // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp> // for DirectiveValueType
-
 #include <string>  // for basic_string, string
 #include <utility> // for pair
 
diff --git a/webserv/config/directive/SizeDirective.cpp b/webserv/config/directive/SizeDirective.cpp
index f6180b6..f590070 100644
--- a/webserv/config/directive/SizeDirective.cpp
+++ b/webserv/config/directive/SizeDirective.cpp
@@ -1,9 +1,11 @@
 #include <webserv/config/directive/SizeDirective.hpp> // for SizeDirective
-#include <webserv/config/utils.hpp>                   // for trim
+#include <webserv/config/utils.hpp>                     // for trim
+#include <algorithm>                                    // for __transform_fn, transform
+#include <cctype>                                       // for tolower
+#include <stdexcept>                                    // for invalid_argument
 
-#include <algorithm> // for __transform_fn, transform
-#include <cctype>    // for tolower
-#include <stdexcept> // for invalid_argument
+#include "webserv/config/directive/ADirective.hpp"      // for ADirective
+#include "webserv/config/directive/DirectiveValue.hpp"  // for DirectiveValueType
 
 SizeDirective::SizeDirective(const std::string &name, const std::string &value)
     : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters)
diff --git a/webserv/config/directive/SizeDirective.hpp b/webserv/config/directive/SizeDirective.hpp
index 5cd0baf..329c653 100644
--- a/webserv/config/directive/SizeDirective.hpp
+++ b/webserv/config/directive/SizeDirective.hpp
@@ -2,7 +2,6 @@
 
 #include <webserv/config/directive/ADirective.hpp>     // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp> // for DirectiveValueType
-
 #include <cstddef> // for size_t
 #include <string>  // for string, basic_string
 
diff --git a/webserv/config/directive/StringDirective.cpp b/webserv/config/directive/StringDirective.cpp
index d519b90..e0049c1 100644
--- a/webserv/config/directive/StringDirective.cpp
+++ b/webserv/config/directive/StringDirective.cpp
@@ -1,5 +1,8 @@
 #include <webserv/config/directive/StringDirective.hpp> // for IntDirective
 
+#include "webserv/config/directive/ADirective.hpp"      // for ADirective
+#include "webserv/config/directive/DirectiveValue.hpp"  // for DirectiveValueType
+
 StringDirective::StringDirective(const std::string &name, const std::string &value)
     : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters)
 {
diff --git a/webserv/config/directive/StringDirective.hpp b/webserv/config/directive/StringDirective.hpp
index f0befbd..517a6ab 100644
--- a/webserv/config/directive/StringDirective.hpp
+++ b/webserv/config/directive/StringDirective.hpp
@@ -2,7 +2,6 @@
 
 #include <webserv/config/directive/ADirective.hpp>     // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp> // for DirectiveValueType
-
 #include <string> // for string, basic_string
 
 class StringDirective : public ADirective
diff --git a/webserv/config/directive/VectorDirective.cpp b/webserv/config/directive/VectorDirective.cpp
index 6cad90c..0efe756 100644
--- a/webserv/config/directive/VectorDirective.cpp
+++ b/webserv/config/directive/VectorDirective.cpp
@@ -1,6 +1,8 @@
 #include <webserv/config/directive/VectorDirective.hpp> // for IntDirective
+#include <sstream>                                      // for basic_stringstream, stringstream
 
-#include <sstream> // for basic_stringstream, stringstream
+#include "webserv/config/directive/ADirective.hpp"      // for ADirective
+#include "webserv/config/directive/DirectiveValue.hpp"  // for DirectiveValueType
 
 VectorDirective::VectorDirective(const std::string &name, const std::string &value)
     : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters)
diff --git a/webserv/config/directive/VectorDirective.hpp b/webserv/config/directive/VectorDirective.hpp
index 379cf6a..5cb5829 100644
--- a/webserv/config/directive/VectorDirective.hpp
+++ b/webserv/config/directive/VectorDirective.hpp
@@ -2,7 +2,6 @@
 
 #include <webserv/config/directive/ADirective.hpp>     // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp> // for DirectiveValueType
-
 #include <string> // for basic_string, string
 #include <vector> // for vector
 
diff --git a/webserv/config/utils.cpp b/webserv/config/utils.cpp
index 94f927e..1dd3132 100644
--- a/webserv/config/utils.cpp
+++ b/webserv/config/utils.cpp
@@ -1,6 +1,5 @@
 
 #include <webserv/config/utils.hpp>
-
 #include <sstream>
 #include <stdexcept>
 #include <string>
diff --git a/webserv/http/HttpHeaders.cpp b/webserv/http/HttpHeaders.cpp
index 6a75d38..3073e42 100644
--- a/webserv/http/HttpHeaders.cpp
+++ b/webserv/http/HttpHeaders.cpp
@@ -2,7 +2,6 @@
 #include <webserv/http/HttpConstants.hpp> // for CRLF
 #include <webserv/http/HttpHeaders.hpp>   // for HttpHeaders
 #include <webserv/log/Log.hpp>
-
 #include <algorithm> // for __transform_fn, transform
 #include <cctype>    // for tolower
 #include <utility>   // for pair
diff --git a/webserv/http/HttpRequest.cpp b/webserv/http/HttpRequest.cpp
index bd98191..4a3285c 100644
--- a/webserv/http/HttpRequest.cpp
+++ b/webserv/http/HttpRequest.cpp
@@ -1,15 +1,14 @@
-#include "webserv/config/utils.hpp" // for stoul
-
 #include <webserv/http/HttpConstants.hpp> // for CRLF, DOUBLE_CRLF
 #include <webserv/http/HttpRequest.hpp>
 #include <webserv/log/Log.hpp> // for Log, LOCATION
-
 #include <map>      // for map
 #include <optional> // for optional
 #include <sstream>  // for basic_stringstream, basic_istream, stringstream
 #include <utility>  // for pair
 #include <vector>   // for vector
 
+#include "webserv/config/utils.hpp" // for stoul
+
 class ServerConfig;
 
 HttpRequest::HttpRequest(const ServerConfig *serverConfig, const Client *client)
diff --git a/webserv/http/HttpRequest.hpp b/webserv/http/HttpRequest.hpp
index c4d04af..966f482 100644
--- a/webserv/http/HttpRequest.hpp
+++ b/webserv/http/HttpRequest.hpp
@@ -1,11 +1,10 @@
 #pragma once
 
 #include <webserv/config/ServerConfig.hpp>
-#include <webserv/http/HttpHeaders.hpp> // for HttpHeaders
-
-#include <cstddef> // for size_t
-#include <cstdint> // for uint8_t
-#include <string>  // for string, basic_string
+#include <webserv/http/HttpHeaders.hpp>  // for HttpHeaders
+#include <cstddef>                       // for size_t
+#include <cstdint>                       // for uint8_t
+#include <string>                        // for string, basic_string
 
 class Client;
 class ServerConfig;
diff --git a/webserv/log/Channel.cpp b/webserv/log/Channel.cpp
index 9c89028..043f3ab 100644
--- a/webserv/log/Channel.cpp
+++ b/webserv/log/Channel.cpp
@@ -1,5 +1,4 @@
 #include <webserv/log/Channel.hpp>
-
 #include <iomanip> // for operator<<, setfill, setw
 #include <sstream> // for basic_ostream, operator<<, basic_stringstream, basic_istream, basic_istringstream, right, istringstream, stringstream
 #include <utility> // for get
diff --git a/webserv/log/Channel.hpp b/webserv/log/Channel.hpp
index 490de56..91e7e0c 100644
--- a/webserv/log/Channel.hpp
+++ b/webserv/log/Channel.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <webserv/log/Log.hpp>
-
 #include <map>
 #include <string>
 
diff --git a/webserv/log/FileChannel.cpp b/webserv/log/FileChannel.cpp
index 40b85b9..e531770 100644
--- a/webserv/log/FileChannel.cpp
+++ b/webserv/log/FileChannel.cpp
@@ -1,6 +1,5 @@
 #include <webserv/log/FileChannel.hpp>
 #include <webserv/log/Log.hpp> // for Log
-
 #include <chrono>   // for system_clock
 #include <ctime>    // for localtime, tm
 #include <iomanip>  // for operator<<, put_time
diff --git a/webserv/log/FileChannel.hpp b/webserv/log/FileChannel.hpp
index 9490817..09bb50e 100644
--- a/webserv/log/FileChannel.hpp
+++ b/webserv/log/FileChannel.hpp
@@ -2,7 +2,6 @@
 
 #include <webserv/log/Channel.hpp> // for Channel
 #include <webserv/log/Log.hpp>     // for Log
-
 #include <fstream> // for basic_ofstream, ios_base, ofstream
 #include <map>     // for map
 #include <string>  // for string, basic_string
diff --git a/webserv/log/Log.cpp b/webserv/log/Log.cpp
index 8a66ef3..0b6df4e 100644
--- a/webserv/log/Log.cpp
+++ b/webserv/log/Log.cpp
@@ -2,7 +2,6 @@
 #include <webserv/log/FileChannel.hpp> // for FileChannel
 #include <webserv/log/Log.hpp>
 #include <webserv/log/StdoutChannel.hpp> // for StdoutChannel
-
 #include <chrono>    // for duration_cast, operator-, steady_clock, duration, seconds
 #include <exception> // for exception
 #include <iostream>  // for basic_ostream, operator<<, cerr
diff --git a/webserv/log/StdoutChannel.cpp b/webserv/log/StdoutChannel.cpp
index a2cad0b..7d22650 100644
--- a/webserv/log/StdoutChannel.cpp
+++ b/webserv/log/StdoutChannel.cpp
@@ -1,6 +1,5 @@
 #include <webserv/log/Log.hpp> // for Log
 #include <webserv/log/StdoutChannel.hpp>
-
 #include <iomanip>  // for operator<<, setfill, setw
 #include <iostream> // for basic_ostream, operator<<, basic_ostream::operator<<, cerr, cout, flush, ostream
 
diff --git a/webserv/log/StdoutChannel.hpp b/webserv/log/StdoutChannel.hpp
index e88dcd7..cdd30dc 100644
--- a/webserv/log/StdoutChannel.hpp
+++ b/webserv/log/StdoutChannel.hpp
@@ -2,7 +2,6 @@
 
 #include <webserv/log/Channel.hpp> // for Channel
 #include <webserv/log/Log.hpp>     // for Log
-
 #include <map>    // for map
 #include <string> // for string, basic_string
 
diff --git a/webserv/main.cpp b/webserv/main.cpp
index 1f28768..eab5a18 100644
--- a/webserv/main.cpp
+++ b/webserv/main.cpp
@@ -1,7 +1,6 @@
 #include <webserv/config/ConfigManager.hpp> // for ConfigManager
 #include <webserv/log/Log.hpp>              // for Log, LOCATION
 #include <webserv/server/Server.hpp>        // for Server
-
 #include <iostream> // for basic_ostream, operator<<, cerr, ios_base
 #include <map>      // for map
 #include <string>   // for basic_string, char_traits, allocator, operator+, operator<=>
diff --git a/webserv/server/Server.cpp b/webserv/server/Server.cpp
index 630d139..dc8956c 100644
--- a/webserv/server/Server.cpp
+++ b/webserv/server/Server.cpp
@@ -1,22 +1,21 @@
-#include <webserv/client/Client.hpp>        // for Client
-#include <webserv/config/ConfigManager.hpp> // for ConfigManager
-#include <webserv/log/Log.hpp>              // for Log
+#include <webserv/client/Client.hpp>         // for Client
+#include <webserv/config/ConfigManager.hpp>  // for ConfigManager
+#include <webserv/log/Log.hpp>               // for Log
 #include <webserv/server/Server.hpp>
-#include <webserv/socket/Socket.hpp> // for Socket
-
-#include <cerrno>    // for errno
-#include <cstring>   // for strerror, strlen
-#include <exception> // for exception
-#include <memory>    // for unique_ptr, allocator, make_unique
-#include <stdexcept> // for runtime_error
-#include <string>    // for basic_string, operator+, to_string, char_traits, string
-#include <utility>   // for move, pair
-#include <vector>    // for vector
-
-#include <sys/epoll.h> // for epoll_event, epoll_ctl, EPOLLIN, EPOLLOUT, epoll_create1, epoll_wait, EPOLLERR, EPOLLHUP, EPOLL_CTL_ADD, EPOLL_CTL_DEL, EPOLL_CTL_MOD
-#include <sys/socket.h> // for send, SOMAXCONN
-#include <sys/types.h>  // for ssize_t
-#include <unistd.h>     // for close
+#include <webserv/socket/Socket.hpp>         // for Socket
+#include <sys/epoll.h>                       // for epoll_event, epoll_ctl, EPOLLIN, EPOLLOUT, epoll_create1, epoll_wait, EPOLLERR, EPOLLHUP, EPOLL_CTL_ADD, EPOLL_CTL_DEL, EPOLL_CTL_MOD
+#include <sys/socket.h>                      // for send, SOMAXCONN
+#include <sys/types.h>                       // for ssize_t
+#include <unistd.h>                          // for close
+#include <webserv/config/ServerConfig.hpp>   // for ServerConfig
+#include <cerrno>                            // for errno
+#include <cstring>                           // for strerror, strlen
+#include <exception>                         // for exception
+#include <memory>                            // for unique_ptr, allocator, make_unique
+#include <stdexcept>                         // for runtime_error
+#include <string>                            // for basic_string, operator+, to_string, char_traits, string
+#include <utility>                           // for move, pair
+#include <vector>                            // for vector
 
 Server::Server(const ConfigManager &configManager) : epoll_fd_(epoll_create1(0)), configManager_(configManager)
 {
diff --git a/webserv/server/Server.hpp b/webserv/server/Server.hpp
index 0bf42f5..e92a5b0 100644
--- a/webserv/server/Server.hpp
+++ b/webserv/server/Server.hpp
@@ -3,16 +3,16 @@
 #include <webserv/client/Client.hpp>
 #include <webserv/config/ConfigManager.hpp>
 #include <webserv/config/ServerConfig.hpp> // for ServerConfig
-#include <webserv/socket/Socket.hpp>       // for Socket
-
-#include <cstdint>       // for uint32_t
-#include <functional>    // for reference_wrapper
-#include <memory>        // for unique_ptr
-#include <unordered_map> // for unordered_map
-#include <vector>        // for vector
+#include <webserv/socket/Socket.hpp>  // for Socket
+#include <cstdint>                    // for uint32_t
+#include <functional>                 // for reference_wrapper
+#include <memory>                     // for unique_ptr
+#include <unordered_map>              // for unordered_map
+#include <vector>                     // for vector
 
 class Client;
 class ConfigManager;
+class ServerConfig;
 
 class Server
 {
diff --git a/webserv/socket/Socket.cpp b/webserv/socket/Socket.cpp
index 60a584a..a9b27d0 100644
--- a/webserv/socket/Socket.cpp
+++ b/webserv/socket/Socket.cpp
@@ -1,14 +1,12 @@
 #include <webserv/log/Log.hpp>
 #include <webserv/socket/Socket.hpp>
-
-#include <memory>
-#include <stdexcept>
-
 #include <arpa/inet.h>  // For inet_addr
 #include <fcntl.h>      // For fcntl()"
 #include <netinet/in.h> // For sockaddr_in
 #include <sys/socket.h>
 #include <unistd.h> // For close()
+#include <memory>
+#include <stdexcept>
 
 Socket::Socket() : fd_(socket(AF_INET, SOCK_STREAM, 0))
 {
diff --git a/webserv/socket/Socket.hpp b/webserv/socket/Socket.hpp
index 11b0eba..5d99cd7 100644
--- a/webserv/socket/Socket.hpp
+++ b/webserv/socket/Socket.hpp
@@ -1,11 +1,10 @@
 #pragma once
 
+#include <sys/types.h> // for ssize_t
 #include <cstddef> // for size_t
 #include <memory>  // for unique_ptr
 #include <string>  // for string
 
-#include <sys/types.h> // for ssize_t
-
 class Socket
 {
   public: