diff --git a/gtk/a11y/gtkflowboxaccessible.h b/gtk/a11y/gtkflowboxaccessible.h
index f22ea0663b..3447315f50 100644
--- a/gtk/a11y/gtkflowboxaccessible.h
+++ b/gtk/a11y/gtkflowboxaccessible.h
@@ -22,7 +22,6 @@
 #error "Only <gtk/gtk-a11y.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
 #include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkflowboxchildaccessible.h b/gtk/a11y/gtkflowboxchildaccessible.h
index 5da596a236..1e11b355c2 100644
--- a/gtk/a11y/gtkflowboxchildaccessible.h
+++ b/gtk/a11y/gtkflowboxchildaccessible.h
@@ -22,7 +22,6 @@
 #error "Only <gtk/gtk-a11y.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
 #include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
index 8afc448456..d95aaff98e 100644
--- a/gtk/gtkflowbox.c
+++ b/gtk/gtkflowbox.c
@@ -76,14 +76,25 @@
 #include <config.h>
 
 #include "gtkflowbox.h"
+
+#include "gtkadjustment.h"
+#include "gtkbindings.h"
+#include "gtkcontainerprivate.h"
+#include "gtkcssnodeprivate.h"
+#include "gtkgesturedrag.h"
+#include "gtkgesturemultipress.h"
+#include "gtkintl.h"
+#include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkorientableprivate.h"
-#include "gtkintl.h"
-#include "gtkcssnodeprivate.h"
-#include "gtkwidgetprivate.h"
+#include "gtkrender.h"
+#include "gtksizerequest.h"
+#include "gtksnapshot.h"
 #include "gtkstylecontextprivate.h"
-#include "gtkcontainerprivate.h"
+#include "gtktypebuiltins.h"
+#include "gtkviewport.h"
+#include "gtkwidgetprivate.h"
 
 #include "a11y/gtkflowboxaccessibleprivate.h"
 #include "a11y/gtkflowboxchildaccessible.h"