diff --git a/include/IModule.hpp b/include/IModule.hpp
index e0b4dc24..856af147 100644
--- a/include/IModule.hpp
+++ b/include/IModule.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <gtkmm.h>
+
 namespace waybar {
   class IModule {
 	  public:
diff --git a/include/client.hpp b/include/client.hpp
index 6dbb62e8..2c982f88 100644
--- a/include/client.hpp
+++ b/include/client.hpp
@@ -3,16 +3,11 @@
 #include <unistd.h>
 #include <wordexp.h>
 
-#include <iostream>
-
 #include <fmt/format.h>
 
 #include <gdk/gdk.h>
-#include <gtkmm.h>
 #include <wayland-client.h>
 
-#include "wlr-layer-shell-unstable-v1-client-protocol.h"
-
 #include <gdk/gdkwayland.h>
 
 #include "bar.hpp"
diff --git a/include/modules/battery.hpp b/include/modules/battery.hpp
index f1439002..5200037c 100644
--- a/include/modules/battery.hpp
+++ b/include/modules/battery.hpp
@@ -3,7 +3,6 @@
 #include <json/json.h>
 #include <filesystem>
 #include <fstream>
-#include <gtkmm.h>
 #include <iostream>
 #include <fmt/format.h>
 #include "util/chrono.hpp"
diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp
index 3f673c12..ca6fd8ad 100644
--- a/include/modules/clock.hpp
+++ b/include/modules/clock.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <json/json.h>
-#include <gtkmm.h>
 #include <fmt/format.h>
 #include "util/chrono.hpp"
 #include "IModule.hpp"
diff --git a/include/modules/cpu.hpp b/include/modules/cpu.hpp
index 86f00867..b6c9248c 100644
--- a/include/modules/cpu.hpp
+++ b/include/modules/cpu.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <json/json.h>
-#include <gtkmm.h>
 #include <fmt/format.h>
 #include <sys/sysinfo.h>
 #include "util/chrono.hpp"
diff --git a/include/modules/custom.hpp b/include/modules/custom.hpp
index c152fe64..7140d96c 100644
--- a/include/modules/custom.hpp
+++ b/include/modules/custom.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <json/json.h>
-#include <gtkmm.h>
 #include <fmt/format.h>
 #include "util/chrono.hpp"
 #include "IModule.hpp"
diff --git a/include/modules/memory.hpp b/include/modules/memory.hpp
index aec5e0df..6fc46375 100644
--- a/include/modules/memory.hpp
+++ b/include/modules/memory.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <json/json.h>
-#include <gtkmm.h>
 #include <fmt/format.h>
 #include <sys/sysinfo.h>
 #include "util/chrono.hpp"
diff --git a/include/modules/network.hpp b/include/modules/network.hpp
index 27a0f669..2b4c3b9e 100644
--- a/include/modules/network.hpp
+++ b/include/modules/network.hpp
@@ -5,9 +5,7 @@
 #include <netlink/genl/genl.h>
 #include <netlink/genl/ctrl.h>
 #include <linux/nl80211.h>
-#include <iwlib.h> // TODO
 #include <json/json.h>
-#include <gtkmm.h>
 #include <fmt/format.h>
 #include "util/chrono.hpp"
 #include "IModule.hpp"
diff --git a/include/modules/pulseaudio.hpp b/include/modules/pulseaudio.hpp
index b87660f3..b5b7e098 100644
--- a/include/modules/pulseaudio.hpp
+++ b/include/modules/pulseaudio.hpp
@@ -2,7 +2,6 @@
 
 #include <pulse/pulseaudio.h>
 #include <json/json.h>
-#include <gtkmm.h>
 #include <fmt/format.h>
 #include "IModule.hpp"
 
diff --git a/src/bar.cpp b/src/bar.cpp
index b489617c..51456315 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -1,7 +1,3 @@
-#include <condition_variable>
-#include <gdk/gdkwayland.h>
-#include <thread>
-#include <fstream>
 #include "bar.hpp"
 #include "client.hpp"
 #include "factory.hpp"
diff --git a/src/main.cpp b/src/main.cpp
index a480f20a..915b205b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,5 @@
-#include <gtkmm.h>
-#include <wayland-client.hpp>
-#include <gdk/gdkwayland.h>
 #include <csignal>
+#include <iostream>
 #include "client.hpp"
 
 namespace waybar {