diff --git a/desktop/hotlist.h b/desktop/hotlist.h
index 2733d589f..c0f4dec66 100644
--- a/desktop/hotlist.h
+++ b/desktop/hotlist.h
@@ -22,14 +22,13 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "desktop/core_window.h"
-#include "desktop/textinput.h"
 #include "utils/errors.h"
+#include "netsurf/mouse.h"
 
+struct core_window_callback_table;
 struct redraw_context;
 struct nsurl;
-
-enum browser_mouse_state;
+struct rect;
 
 /**
  * Initialise the hotlist.
diff --git a/frontends/gtk/hotlist.c b/frontends/gtk/hotlist.c
index 06fd5cd69..82ea3e338 100644
--- a/frontends/gtk/hotlist.c
+++ b/frontends/gtk/hotlist.c
@@ -23,6 +23,7 @@
 #include "utils/nsoption.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/riscos/hotlist.c b/frontends/riscos/hotlist.c
index 6041658c4..f3daad088 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -40,6 +40,7 @@
 #include "netsurf/window.h"
 #include "desktop/hotlist.h"
 #include "desktop/tree.h"
+#include "desktop/textinput.h"
 
 #include "riscos/gui.h"
 #include "riscos/dialog.h"