diff --git a/frontends/gtk/completion.c b/frontends/gtk/completion.c
index 6dde728b3..8444c8333 100644
--- a/frontends/gtk/completion.c
+++ b/frontends/gtk/completion.c
@@ -31,6 +31,7 @@
 #include "desktop/browser.h"
 
 #include "gtk/warn.h"
+#include "gtk/scaffolding.h"
 #include "gtk/window.h"
 #include "gtk/completion.h"
 
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 60c8e792a..6430f9dc6 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -62,6 +62,7 @@
 #include "gtk/hotlist.h"
 #include "gtk/throbber.h"
 #include "gtk/treeview.h"
+#include "gtk/scaffolding.h"
 #include "gtk/window.h"
 #include "gtk/schedule.h"
 #include "gtk/selection.h"
diff --git a/frontends/gtk/tabs.c b/frontends/gtk/tabs.c
index 67a410d20..e8be7eea1 100644
--- a/frontends/gtk/tabs.c
+++ b/frontends/gtk/tabs.c
@@ -26,6 +26,7 @@
 #include "desktop/search.h"
 
 #include "gtk/compat.h"
+#include "gtk/scaffolding.h"
 #include "gtk/window.h"
 #include "gtk/search.h"
 #include "gtk/tabs.h"
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c
index 1def9dcaa..b7bf07f88 100644
--- a/frontends/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
@@ -32,6 +32,7 @@
 #include "gtk/warn.h"
 #include "gtk/search.h"
 #include "gtk/throbber.h"
+#include "gtk/scaffolding.h"
 #include "gtk/window.h"
 #include "gtk/compat.h"
 #include "gtk/resources.h"
diff --git a/frontends/gtk/toolbar.h b/frontends/gtk/toolbar.h
index 0453109ca..4286fe3f0 100644
--- a/frontends/gtk/toolbar.h
+++ b/frontends/gtk/toolbar.h
@@ -19,10 +19,6 @@
 #ifndef _NETSURF_GTK_TOOLBAR_H_
 #define _NETSURF_GTK_TOOLBAR_H_
 
-#include <gtk/gtk.h>
-
-#include "gtk/scaffolding.h"
-
 /**
  * sets up the images for scaffolding.
  */
diff --git a/frontends/gtk/window.h b/frontends/gtk/window.h
index c604bf3f7..7e46a7c60 100644
--- a/frontends/gtk/window.h
+++ b/frontends/gtk/window.h
@@ -19,8 +19,6 @@
 #ifndef NETSURF_GTK_WINDOW_H
 #define NETSURF_GTK_WINDOW_H 1
 
-#include "gtk/scaffolding.h"
-
 extern struct gui_window_table *nsgtk_window_table;
 
 typedef enum nsgtk_window_signals {