6 files changed, 15 insertions, 11 deletions
diff --git a/frontends/gtk/cookies.c b/frontends/gtk/cookies.c
index f8f989347..514c8260a 100644
--- a/frontends/gtk/cookies.c
+++ b/frontends/gtk/cookies.c
@@ -21,12 +21,13 @@
  */
 
 #include <gtk/gtk.h>
+#include <stdint.h>
 
 #include "utils/log.h"
+#include "netsurf/keypress.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/plot_style.h"
 #include "desktop/tree.h"
-#include "desktop/textinput.h"
 
 #include "gtk/cookies.h"
 #include "gtk/plotters.h"
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index d358b43db..e0044b54b 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -38,18 +38,18 @@
 #include "utils/utils.h"
 #include "utils/file.h"
 #include "utils/nsoption.h"
-#include "content/fetch.h"
+#include "netsurf/keypress.h"
 #include "netsurf/url_db.h"
 #include "netsurf/cookie_db.h"
-#include "content/backing_store.h"
 #include "netsurf/browser_window.h"
+#include "netsurf/misc.h"
+#include "netsurf/netsurf.h"
+#include "content/fetch.h"
+#include "content/backing_store.h"
 #include "desktop/save_complete.h"
 #include "desktop/save_pdf.h"
 #include "desktop/searchweb.h"
-#include "desktop/textinput.h"
 #include "desktop/tree.h"
-#include "netsurf/misc.h"
-#include "netsurf/netsurf.h"
 
 #include "gtk/compat.h"
 #include "gtk/warn.h"
diff --git a/frontends/gtk/history.c b/frontends/gtk/history.c
index 9c5c0b5e4..fb805d6be 100644
--- a/frontends/gtk/history.c
+++ b/frontends/gtk/history.c
@@ -18,13 +18,14 @@
  */
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <gtk/gtk.h>
 
 #include "utils/log.h"
+#include "netsurf/keypress.h"
 #include "desktop/global_history.h"
 #include "desktop/plot_style.h"
 #include "desktop/tree.h"
-#include "desktop/textinput.h"
 
 #include "gtk/plotters.h"
 #include "gtk/scaffolding.h"
diff --git a/frontends/gtk/hotlist.c b/frontends/gtk/hotlist.c
index 82ea3e338..fa899560c 100644
--- a/frontends/gtk/hotlist.c
+++ b/frontends/gtk/hotlist.c
@@ -21,9 +21,9 @@
 
 #include "utils/log.h"
 #include "utils/nsoption.h"
+#include "netsurf/keypress.h"
 #include "desktop/hotlist.h"
 #include "desktop/tree.h"
-#include "desktop/textinput.h"
 
 #include "gtk/plotters.h"
 #include "gtk/scaffolding.h"
diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index dc0595a37..cd3779e1e 100644
--- a/frontends/gtk/scaffolding.c
+++ b/frontends/gtk/scaffolding.c
@@ -36,10 +36,11 @@
 #include "utils/file.h"
 #include "utils/nsurl.h"
 #include "netsurf/content.h"
-#include "desktop/browser_history.h"
+#include "netsurf/keypress.h"
 #include "netsurf/browser_window.h"
-#include "desktop/hotlist.h"
 #include "netsurf/plotters.h"
+#include "desktop/browser_history.h"
+#include "desktop/hotlist.h"
 #include "desktop/print.h"
 #include "desktop/save_complete.h"
 #ifdef WITH_PDF_EXPORT
@@ -48,7 +49,6 @@
 #endif
 #include "desktop/save_text.h"
 #include "desktop/searchweb.h"
-#include "desktop/textinput.h"
 #include "desktop/search.h"
 
 #include "gtk/compat.h"
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index b4af64821..ce2644e8e 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -42,6 +42,8 @@
 #include "netsurf/window.h"
 #include "netsurf/plotters.h"
 #include "netsurf/form.h"
+#include "netsurf/keypress.h"
+#include "desktop/textarea.h"
 #include "desktop/searchweb.h"
 #include "desktop/textinput.h"