diff --git a/src/browser/app.hxx b/src/browser/app.hxx
index ccdd58a..8495d49 100644
--- a/src/browser/app.hxx
+++ b/src/browser/app.hxx
@@ -1,7 +1,6 @@
 #ifndef _BOLT_APP_HXX_
 #define _BOLT_APP_HXX_
 
-#include "include/base/cef_macros.h"
 #include "include/cef_app.h"
 #include "include/cef_base.h"
 #include "include/cef_browser_process_handler.h"
diff --git a/src/browser/client.cxx b/src/browser/client.cxx
index 32cd2fb..2e2a0d7 100644
--- a/src/browser/client.cxx
+++ b/src/browser/client.cxx
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <fcntl.h>
 #include <fmt/core.h>
-#include <fstream>
 
 #if defined(CEF_X11)
 #include <xcb/xcb.h>
diff --git a/src/browser/client.hxx b/src/browser/client.hxx
index 5b3ee74..b680c93 100644
--- a/src/browser/client.hxx
+++ b/src/browser/client.hxx
@@ -7,9 +7,7 @@
 #include "../browser.hxx"
 
 #include <filesystem>
-#include <map>
 #include <mutex>
-#include <string>
 #include <vector>
 
 #if defined(CEF_X11)
diff --git a/src/browser/common.hxx b/src/browser/common.hxx
index 88e5886..8c251d8 100644
--- a/src/browser/common.hxx
+++ b/src/browser/common.hxx
@@ -1,10 +1,9 @@
 #ifndef _BOLT_COMMON_HXX_
 #define _BOLT_COMMON_HXX_
 
-#include "include/cef_base.h"
+#include "include/internal/cef_string.h"
 
 #include <fstream>
-#include <string>
 #include <vector>
 
 namespace Browser {
diff --git a/src/browser/resource_handler.hxx b/src/browser/resource_handler.hxx
index 1809eba..158b733 100644
--- a/src/browser/resource_handler.hxx
+++ b/src/browser/resource_handler.hxx
@@ -4,7 +4,7 @@
 #include "../file_manager.hxx"
 
 #include "include/cef_base.h"
-#include "include/cef_request_handler.h"
+#include "include/cef_resource_request_handler.h"
 
 namespace Browser {
 	/// Struct for sending some bytes from memory as an HTTP response. Store individual instances on the heap.
diff --git a/src/browser/window_launcher.cxx b/src/browser/window_launcher.cxx
index d700780..4404956 100644
--- a/src/browser/window_launcher.cxx
+++ b/src/browser/window_launcher.cxx
@@ -5,8 +5,6 @@
 
 #include "include/cef_parser.h"
 
-#include <algorithm>
-#include <condition_variable>
 #include <fcntl.h>
 #include <fmt/core.h>
 #include <fstream>
diff --git a/src/browser/window_launcher.hxx b/src/browser/window_launcher.hxx
index 60dd47e..90baa93 100644
--- a/src/browser/window_launcher.hxx
+++ b/src/browser/window_launcher.hxx
@@ -4,8 +4,6 @@
 #include "../browser.hxx"
 #include "../file_manager.hxx"
 
-#include "include/cef_resource_handler.h"
-
 #include <filesystem>
 
 namespace Browser {
diff --git a/src/file_manager.hxx b/src/file_manager.hxx
index 1de762f..5713eff 100644
--- a/src/file_manager.hxx
+++ b/src/file_manager.hxx
@@ -1,7 +1,6 @@
 #ifndef _BOLT_FILE_MANAGER_HXX_
 #define _BOLT_FILE_MANAGER_HXX_
 #include "include/cef_base.h"
-#include "include/internal/cef_string.h"
 
 #include <string_view>
 
diff --git a/src/main.cxx b/src/main.cxx
index 3970cfd..031dd97 100644
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -12,10 +12,8 @@
 
 #if defined(__linux__)
 #include <fcntl.h>
-#include <functional>
 #include <sys/file.h>
 #include <sys/stat.h>
-#include <thread>
 #endif
 
 #if defined(CEF_X11)
diff --git a/src/mime.cxx b/src/mime.cxx
index 3143311..3cf4585 100644
--- a/src/mime.cxx
+++ b/src/mime.cxx
@@ -1,6 +1,5 @@
 #include "mime.hxx"
 
-#include <algorithm>
 #include <map>
 #include <string>