4 files changed, 22 insertions, 48 deletions
diff --git a/gtk/compat.h b/gtk/compat.h
index b8c91d914..ee2ebb293 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -23,6 +23,8 @@
 #ifndef NETSURF_GTK_COMPAT_H_
 #define NETSURF_GTK_COMPAT_H_
 
+#include <stdint.h>
+
 #include <gtk/gtk.h>
 
 void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus);
diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c
index a32bce675..8d74d20c1 100644
--- a/gtk/dialogs/source.c
+++ b/gtk/dialogs/source.c
@@ -16,35 +16,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <gtk/gtk.h>
 
-#include "desktop/browser_private.h"
-#include "desktop/netsurf.h"
-#include "desktop/print.h"
+#include "utils/log.h"
 #include "utils/nsoption.h"
+#include "utils/utf8.h"
 #include "utils/messages.h"
 #include "utils/url.h"
-#include "utils/utils.h"
-#include "utils/utf8.h"
+#include "desktop/netsurf.h"
+#include "desktop/browser_private.h"
 #include "render/html.h"
-#include "render/font.h"
-#include "content/content.h"
-#include "content/content_type.h"
-#include "utils/log.h"
 
-#include "gtk/compat.h"
-#include "gtk/dialogs/source.h"
 #include "gtk/dialogs/about.h"
-#include "gtk/window.h"
-#include "gtk/gui.h"
-#include "gtk/print.h"
-#include "gtk/selection.h"
 #include "gtk/fetch.h"
+#include "gtk/compat.h"
+#include "gtk/gui.h"
+#include "gtk/dialogs/source.h"
 
 struct nsgtk_source_window {
 	gchar *url;
diff --git a/gtk/font_pango.c b/gtk/font_pango.c
index 6c7f1592f..b6569ced6 100644
--- a/gtk/font_pango.c
+++ b/gtk/font_pango.c
@@ -27,8 +27,6 @@
 #include <stdio.h>
 #include <gtk/gtk.h>
 
-#include "css/css.h"
-#include "css/utils.h"
 #include "gtk/font_pango.h"
 #include "gtk/plotters.h"
 #include "render/font.h"
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 098d5e121..7a9f9fa4a 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -18,26 +18,22 @@
  */
 
 #include <assert.h>
-#include <dirent.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
-#include <unistd.h>
+#include <stdlib.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "gtk/scaffolding.h"
-#include "content/content.h"
-#include "content/hlcache.h"
-#include "css/utils.h"
+#include "utils/messages.h"
+#include "utils/schedule.h"
+#include "utils/url.h"
+#include "utils/log.h"
+#include "utils/nsoption.h"
 #include "desktop/browser_private.h"
 #include "desktop/local_history.h"
 #include "desktop/hotlist.h"
-#include "desktop/gui.h"
 #include "desktop/netsurf.h"
-#include "utils/nsoption.h"
 #include "desktop/plotters.h"
 #include "desktop/print.h"
 #include "desktop/save_complete.h"
@@ -46,43 +42,33 @@
 #include "desktop/save_pdf/pdf_plotters.h"
 #endif
 #include "desktop/save_text.h"
-#include "desktop/search.h"
 #include "desktop/searchweb.h"
 #include "desktop/textinput.h"
-#include "desktop/tree.h"
+#include "render/font.h"
+#include "render/html.h"
+
+#include "gtk/compat.h"
 #include "gtk/cookies.h"
 #include "gtk/completion.h"
 #include "gtk/dialogs/preferences.h"
 #include "gtk/dialogs/about.h"
 #include "gtk/dialogs/source.h"
 #include "gtk/bitmap.h"
-#include "gtk/download.h"
 #include "gtk/gui.h"
 #include "gtk/history.h"
 #include "gtk/hotlist.h"
+#include "gtk/download.h"
 #include "gtk/menu.h"
 #include "gtk/plotters.h"
 #include "gtk/print.h"
-#include "gtk/schedule.h"
 #include "gtk/search.h"
-#include "gtk/tabs.h"
 #include "gtk/theme.h"
 #include "gtk/throbber.h"
 #include "gtk/toolbar.h"
-#include "gtk/treeview.h"
 #include "gtk/window.h"
-#include "gtk/compat.h"
 #include "gtk/gdk.h"
-#include "image/ico.h"
-#include "render/font.h"
-#include "render/form.h"
-#include "render/html.h"
-#include "utils/messages.h"
-#include "utils/schedule.h"
-#include "utils/utils.h"
-#include "utils/url.h"
-
-#include "utils/log.h"
+#include "gtk/scaffolding.h"
+#include "gtk/tabs.h"