diff --git a/Makefile b/Makefile
index 58506af..b73aad4 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,6 @@ clean:
 	$(RM) -r $(OBJ_DIR)
 
 fclean: clean
-	rm -f tools/transformer
 	$(RM) -r $(BIN_DIR)
 
 re: fclean all
diff --git a/include/config/Config.hpp b/include/config/Config.hpp
index 9dd1ef7..841b2a5 100644
--- a/include/config/Config.hpp
+++ b/include/config/Config.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "Context.hpp"
+class Context;
 
 // ----------------------- CONFIG STRUCTURE ------------------------
 typedef struct token_s {
diff --git a/include/config/Init.hpp b/include/config/Init.hpp
index 624f85e..8aa6bee 100644
--- a/include/config/Init.hpp
+++ b/include/config/Init.hpp
@@ -1,7 +1,7 @@
 #ifndef INIT_HPP
 #define INIT_HPP
 
-#include "Context.hpp"
+class Context;
 
 class Init {
  private:
diff --git a/include/http/Http.hpp b/include/http/Http.hpp
index 17ec408..45d45db 100644
--- a/include/http/Http.hpp
+++ b/include/http/Http.hpp
@@ -4,10 +4,12 @@
 #include <fstream>
 
 #include "AConnection.hpp"
-#include "File.hpp"
 #include "Request.hpp"
 #include "Response.hpp"
-#include "VirtualHost.hpp"
+
+class VirtualHost;
+class Context;
+class File;
 
 // WEBSERV_CONFIG ----------- HTTP VALUES --------------------------
 #define PROTOCOL "HTTP"
diff --git a/include/output/Log.hpp b/include/output/Log.hpp
index ece2055..2b4e407 100644
--- a/include/output/Log.hpp
+++ b/include/output/Log.hpp
@@ -2,7 +2,6 @@
 #define LOG_HPP
 
 #include <fstream>
-#include <iostream>
 #include <ostream>
 #include <string>
 
diff --git a/include/poll/AConnection.hpp b/include/poll/AConnection.hpp
index 002f02f..9269eb6 100644
--- a/include/poll/AConnection.hpp
+++ b/include/poll/AConnection.hpp
@@ -1,16 +1,16 @@
 #ifndef ACONNECTION_HPP
 #define ACONNECTION_HPP
 
-#include <fcntl.h>
+#include <sys/time.h>
 
-#include <istream>
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "Address.hpp"
-#include "CallbackPointer.hpp"
-#include "timeval.hpp"
+#include "IFileDescriptor.hpp"
+
+class CallbackPointer;
 
 // WEBSERV_CONFIG ----------- ACONNECTION VALUES -------------------
 /**
diff --git a/include/poll/Address.hpp b/include/poll/Address.hpp
index 51c25ce..dccf460 100644
--- a/include/poll/Address.hpp
+++ b/include/poll/Address.hpp
@@ -1,13 +1,8 @@
 #ifndef ADDRESS_HPP
 #define ADDRESS_HPP
 
-#include <netdb.h>
 #include <netinet/in.h>
-#include <sys/socket.h>
 
-#include <cerrno>
-#include <cstdlib>
-#include <cstring>
 #include <ostream>
 #include <set>
 #include <string>
diff --git a/include/poll/CallbackPointer.hpp b/include/poll/CallbackPointer.hpp
index 87e8465..ed1dd73 100644
--- a/include/poll/CallbackPointer.hpp
+++ b/include/poll/CallbackPointer.hpp
@@ -1,7 +1,7 @@
 #ifndef CALLBACKPOINTER_HPP
 #define CALLBACKPOINTER_HPP
 
-#include "IFileDescriptor.hpp"
+class IFileDescriptor;
 
 class CallbackPointer {
  public:
diff --git a/include/poll/IFileDescriptor.hpp b/include/poll/IFileDescriptor.hpp
index 9b37e05..f0d2f82 100644
--- a/include/poll/IFileDescriptor.hpp
+++ b/include/poll/IFileDescriptor.hpp
@@ -1,8 +1,7 @@
 #ifndef IFILEDESCRIPTOR_HPP
 #define IFILEDESCRIPTOR_HPP
 
-#include <poll.h>
-
+struct pollfd;
 class CallbackPointer;
 
 #define POLLINACTIVE POLLERR
diff --git a/include/poll/ListenSocket.hpp b/include/poll/ListenSocket.hpp
index 6ce5cba..0c7b8f3 100644
--- a/include/poll/ListenSocket.hpp
+++ b/include/poll/ListenSocket.hpp
@@ -3,7 +3,9 @@
 #define LISTENSOCKET_HPP
 
 #include "Address.hpp"
-#include "CallbackPointer.hpp"
+#include "IFileDescriptor.hpp"
+
+class CallbackPointer;
 
 class ListenSocket : public IFileDescriptor {
  public:
diff --git a/include/poll/Poll.hpp b/include/poll/Poll.hpp
index e5f4048..c46f6a3 100644
--- a/include/poll/Poll.hpp
+++ b/include/poll/Poll.hpp
@@ -4,7 +4,8 @@
 #include <csignal>
 #include <vector>
 
-#include "CallbackPointer.hpp"
+class CallbackPointer;
+class IFileDescriptor;
 
 class Poll {
  public:
diff --git a/include/poll/timeval.hpp b/include/poll/timeval.hpp
index bef3e86..886d05a 100644
--- a/include/poll/timeval.hpp
+++ b/include/poll/timeval.hpp
@@ -1,7 +1,7 @@
 #ifndef TIMEVAL_HPP
 #define TIMEVAL_HPP
 
-#include <sys/time.h>
+struct timeval;
 
 timeval operator-(timeval const &lhs, timeval const &rhs);
 
diff --git a/src/config/Config.cpp b/src/config/Config.cpp
index c06f9ab..2139a1c 100644
--- a/src/config/Config.cpp
+++ b/src/config/Config.cpp
@@ -1,5 +1,7 @@
 #include "Config.hpp"
 
+#include "Context.hpp"
+#include "File.hpp"
 #include "Http.hpp"
 #include "global.hpp"
 #include "utils.hpp"
diff --git a/src/global.cpp b/src/global.cpp
index 60e1edc..9220f11 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -1,5 +1,7 @@
 #include "global.hpp"
 
+#include <iostream>
+
 Log accessLog_g(LOG_TERMINAL);
 Log errorLog_g(LOG_ERROR_TERMINAL);
 std::string cwd_g;
diff --git a/src/http/Http.cpp b/src/http/Http.cpp
index a8191f1..9c02603 100644
--- a/src/http/Http.cpp
+++ b/src/http/Http.cpp
@@ -2,9 +2,10 @@
 
 #include <algorithm>
 
+#include "File.hpp"
+#include "VirtualHost.hpp"
 #include "global.hpp"
 #include "utils.hpp"
-#include "webserv.hpp"
 
 Http::Http(Address const &client, Address const &host)
     : AConnection(host, client) {
diff --git a/src/main.cpp b/src/main.cpp
index 298966e..b2edd71 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,7 @@
 #include <csignal>
 
 #include "Config.hpp"
+#include "Context.hpp"
 #include "Init.hpp"
 #include "Poll.hpp"
 #include "argument.hpp"
diff --git a/src/output/Log.cpp b/src/output/Log.cpp
index df29b02..b4789fe 100644
--- a/src/output/Log.cpp
+++ b/src/output/Log.cpp
@@ -1,5 +1,6 @@
 #include "Log.hpp"
 
+#include <iostream>
 #include <map>
 
 #include "File.hpp"
diff --git a/src/poll/AConnection.cpp b/src/poll/AConnection.cpp
index 1b208a6..b3c57a4 100644
--- a/src/poll/AConnection.cpp
+++ b/src/poll/AConnection.cpp
@@ -1,11 +1,15 @@
 #include "AConnection.hpp"
 
 #include <fcntl.h>
+#include <poll.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include <cstdlib>
 #include <iostream>
 
+#include "CallbackPointer.hpp"
 #include "File.hpp"
 #include "Poll.hpp"
 #include "global.hpp"
diff --git a/src/poll/Address.cpp b/src/poll/Address.cpp
index d828097..59da1b4 100644
--- a/src/poll/Address.cpp
+++ b/src/poll/Address.cpp
@@ -1,5 +1,10 @@
 #include "Address.hpp"
 
+#include <netdb.h>
+
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
 #include <iomanip>
 #include <sstream>
 
diff --git a/src/poll/ListenSocket.cpp b/src/poll/ListenSocket.cpp
index 417223b..6f03f57 100644
--- a/src/poll/ListenSocket.cpp
+++ b/src/poll/ListenSocket.cpp
@@ -1,7 +1,9 @@
 #include "ListenSocket.hpp"
 
 #include <fcntl.h>
+#include <poll.h>
 
+#include "CallbackPointer.hpp"
 #include "Http.hpp"
 #include "Poll.hpp"
 #include "global.hpp"
diff --git a/src/poll/Poll.cpp b/src/poll/Poll.cpp
index 17ecaa3..0aa4fae 100644
--- a/src/poll/Poll.cpp
+++ b/src/poll/Poll.cpp
@@ -1,5 +1,6 @@
 #include "Poll.hpp"
 
+#include <poll.h>
 #include <unistd.h>
 
 #include <cerrno>
@@ -7,6 +8,8 @@
 #include <iostream>
 #include <stdexcept>
 
+#include "CallbackPointer.hpp"
+#include "IFileDescriptor.hpp"
 #include "global.hpp"
 
 /**
diff --git a/src/poll/timeval.cpp b/src/poll/timeval.cpp
index 9f33393..65957f9 100644
--- a/src/poll/timeval.cpp
+++ b/src/poll/timeval.cpp
@@ -1,5 +1,7 @@
 #include "timeval.hpp"
 
+#include <sys/time.h>
+
 timeval operator-(timeval const &lhs, timeval const &rhs) {
   timeval result;
   result.tv_sec = lhs.tv_sec - rhs.tv_sec;