diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index a662612b47..dd16a1104b 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -61,6 +61,7 @@
 #include "gtkeventcontrollermotion.h"
 #include "gtkeventcontrollerkey.h"
 #include "gtkgestureclick.h"
+#include "gtkstylecontext.h"
 
 
 /**
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index 55d85d6778..2f98e44295 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -22,10 +22,8 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdk.h>
-#include <gtk/gtkstylecontext.h>
-#include <gsk/gsk.h>
+#include <gtk/gtkenums.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 82c6ddad83..57883784aa 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -66,6 +66,7 @@
 #include "gtkdragicon.h"
 #include "gtkwidgetpaintable.h"
 #include "gtkselectionprivate.h"
+#include "gtkstylecontext.h"
 
 /*< private >
  * SECTION:gtkplacessidebar
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 8cc681cf8f..ed36b1878d 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -29,6 +29,7 @@
 #include "gtkicontheme.h"
 #include "gtkactionable.h"
 #include "gtkprivate.h"
+#include "gtkstylecontext.h"
 
 #include <string.h>