diff --git a/include/ALabel.hpp b/include/ALabel.hpp
index 139bef58..17b3ebdc 100644
--- a/include/ALabel.hpp
+++ b/include/ALabel.hpp
@@ -2,6 +2,9 @@
 
 #include <json/json.h>
 #include "IModule.hpp"
+#include <glibmm/markup.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/label.h>
 
 namespace waybar {
 
diff --git a/include/IModule.hpp b/include/IModule.hpp
index 4b3aafef..e278a1dc 100644
--- a/include/IModule.hpp
+++ b/include/IModule.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
-#include <gtkmm.h>
+#include <glibmm/dispatcher.h>
+#include <gtkmm/box.h>
+#include <gtkmm/widget.h>
 
 namespace waybar {
 
diff --git a/include/bar.hpp b/include/bar.hpp
index a948eaca..e7d9c6d8 100644
--- a/include/bar.hpp
+++ b/include/bar.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
 #include <json/json.h>
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <gtkmm/main.h>
+#include <gtkmm/cssprovider.h>
+#include <gtkmm/window.h>
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 #include "xdg-output-unstable-v1-client-protocol.h"
 #include "IModule.hpp"
diff --git a/include/modules/sni/host.hpp b/include/modules/sni/host.hpp
index 6c6618e9..232d48cc 100644
--- a/include/modules/sni/host.hpp
+++ b/include/modules/sni/host.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <giomm.h>
 #include <json/json.h>
 #include <tuple>
 #include <dbus-status-notifier-watcher.h>
diff --git a/include/modules/sni/item.hpp b/include/modules/sni/item.hpp
index 447647c4..fee53b53 100644
--- a/include/modules/sni/item.hpp
+++ b/include/modules/sni/item.hpp
@@ -1,7 +1,11 @@
 #pragma once
 
 #include <dbus-status-notifier-item.h>
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/image.h>
+#include <gtkmm/icontheme.h>
+#include <gtkmm/menu.h>
 #include <json/json.h>
 #include <libdbusmenu-gtk/dbusmenu-gtk.h>
 #ifdef FILESYSTEM_EXPERIMENTAL
diff --git a/include/modules/sni/watcher.hpp b/include/modules/sni/watcher.hpp
index 79f5cbfa..3ae41d97 100644
--- a/include/modules/sni/watcher.hpp
+++ b/include/modules/sni/watcher.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <gtkmm.h>
+#include <giomm.h>
+#include <glibmm/refptr.h>
 #include <dbus-status-notifier-watcher.h>
 
 namespace waybar::modules::SNI {
diff --git a/include/modules/sway/workspaces.hpp b/include/modules/sway/workspaces.hpp
index c00ea7d5..25cf8679 100644
--- a/include/modules/sway/workspaces.hpp
+++ b/include/modules/sway/workspaces.hpp
@@ -7,6 +7,7 @@
 #include "util/json.hpp"
 #include "IModule.hpp"
 #include "modules/sway/ipc/client.hpp"
+#include <gtkmm/button.h>
 
 namespace waybar::modules::sway {
 
diff --git a/include/util/chrono.hpp b/include/util/chrono.hpp
index f2940abe..c06373e3 100644
--- a/include/util/chrono.hpp
+++ b/include/util/chrono.hpp
@@ -5,7 +5,6 @@
 #include <functional>
 #include <condition_variable>
 #include <thread>
-#include <gtkmm.h>
 
 namespace waybar::chrono {
 
diff --git a/include/util/command.hpp b/include/util/command.hpp
index 5d3692e7..fd37e511 100644
--- a/include/util/command.hpp
+++ b/include/util/command.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <sys/wait.h>
+#include <giomm.h>
 
 namespace waybar::util::command {