diff --git a/desktop/frames.h b/desktop/frames.h
index d5aca073e..15efb7d67 100644
--- a/desktop/frames.h
+++ b/desktop/frames.h
@@ -23,8 +23,6 @@
 #ifndef _NETSURF_DESKTOP_FRAMES_H_
 #define _NETSURF_DESKTOP_FRAMES_H_
 
-#include "desktop/browser.h"
-
 struct scrollbar_msg_data;
 
 void browser_window_create_iframes(struct browser_window *bw,
diff --git a/desktop/gui_window.h b/desktop/gui_window.h
index e38923dbb..f5240a6b4 100644
--- a/desktop/gui_window.h
+++ b/desktop/gui_window.h
@@ -60,6 +60,7 @@ struct browser_window;
 struct form_control;
 struct rect;
 struct hlcache_handle;
+enum gui_pointer_shape;
 
 /**
  * Graphical user interface window function table.
@@ -204,7 +205,7 @@ struct gui_window_table {
 	/**
 	 * Change mouse pointer shape
 	 */
-	void (*set_pointer)(struct gui_window *g, gui_pointer_shape shape);
+	void (*set_pointer)(struct gui_window *g, enum gui_pointer_shape shape);
 
 	/**
 	 * Place the caret in a browser window.
diff --git a/desktop/scrollbar.c b/desktop/scrollbar.c
index c4da77cc0..bbf9ebfab 100644
--- a/desktop/scrollbar.c
+++ b/desktop/scrollbar.c
@@ -25,15 +25,17 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "desktop/system_colour.h"
-#include "desktop/mouse.h"
-#include "desktop/scrollbar.h"
-#include "utils/nsoption.h"
-#include "desktop/plotters.h"
-#include "desktop/plot_style.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
+#include "utils/nsoption.h"
+
+#include "desktop/browser.h"
+#include "desktop/system_colour.h"
+#include "desktop/mouse.h"
+#include "desktop/scrollbar.h"
+#include "desktop/plotters.h"
+#include "desktop/plot_style.h"
 
 
 struct scrollbar {
diff --git a/desktop/scrollbar.h b/desktop/scrollbar.h
index fb1773761..bfe90d9b5 100644
--- a/desktop/scrollbar.h
+++ b/desktop/scrollbar.h
@@ -26,8 +26,6 @@
 #include <stdbool.h>
 #include <limits.h>
 
-#include "desktop/browser.h"
-
 #define SCROLLBAR_WIDTH 16
 
 /* Region dependent values for scrollbar_scroll function */
diff --git a/desktop/selection.c b/desktop/selection.c
index 8ed850a59..0f395a7a2 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -37,8 +37,8 @@
 #include "render/font.h"
 #include "render/textplain.h"
 
-#include "desktop/browser_private.h"
 #include "desktop/mouse.h"
+#include "desktop/browser_private.h"
 #include "desktop/plotters.h"
 #include "desktop/save_text.h"
 #include "desktop/selection.h"
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 625a58f9c..8d4fd137d 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -31,6 +31,7 @@
 #include "utils/utf8.h"
 #include "utils/utils.h"
 
+#include "desktop/browser.h"
 #include "desktop/mouse.h"
 #include "desktop/textarea.h"
 #include "desktop/textinput.h"
diff --git a/desktop/textarea.h b/desktop/textarea.h
index 1c24dd1cc..0927f4bbb 100644
--- a/desktop/textarea.h
+++ b/desktop/textarea.h
@@ -26,9 +26,6 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "desktop/browser.h"
-#include "desktop/plot_style.h"
-
 
 struct textarea;
 
diff --git a/desktop/textinput.c b/desktop/textinput.c
index 852fb3fc8..31cf9e071 100644
--- a/desktop/textinput.c
+++ b/desktop/textinput.c
@@ -38,6 +38,7 @@
 #include "render/html_internal.h"
 #include "render/layout.h"
 
+#include "desktop/mouse.h"
 #include "desktop/browser_private.h"
 #include "desktop/textinput.h"
 #include "desktop/gui_window.h"
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index db884ec13..992b19255 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -37,10 +37,9 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/types.h"
+#include "desktop/browser.h"
 #include "desktop/textinput.h"
-#include "render/form.h"
 #include "desktop/browser_history.h"
-#include "desktop/mouse.h"
 #include "desktop/plotters.h"
 #include "desktop/gui_window.h"
 #include "desktop/gui_misc.h"
diff --git a/render/form.c b/render/form.c
index 3dd3a6cdd..b8656bca9 100644
--- a/render/form.c
+++ b/render/form.c
@@ -44,6 +44,7 @@
 #include "content/hlcache.h"
 #include "css/css.h"
 #include "css/utils.h"
+#include "desktop/browser.h"
 #include "desktop/mouse.h"
 #include "desktop/knockout.h"
 #include "desktop/plot_style.h"
diff --git a/render/form.h b/render/form.h
index 7715b9ad3..31efb7c43 100644
--- a/render/form.h
+++ b/render/form.h
@@ -26,8 +26,6 @@
 #define _NETSURF_RENDER_FORM_H_
 
 #include <stdbool.h>
-#include "desktop/browser.h"
-#include "utils/config.h"
 
 struct box;
 struct form_control;
@@ -37,6 +35,8 @@ struct html_content;
 struct dom_string;
 struct content;
 struct nsurl;
+struct fetch_multipart_data;
+enum browser_mouse_state;
 
 /** Form submit method. */
 typedef enum {
@@ -183,9 +183,9 @@ bool form_redraw_select_menu(struct form_control *control, int x, int y,
 bool form_clip_inside_select_menu(struct form_control *control, float scale,
 		const struct rect *clip);
 const char *form_select_mouse_action(struct form_control *control,
-		browser_mouse_state mouse, int x, int y);
+		enum browser_mouse_state mouse, int x, int y);
 void form_select_mouse_drag_end(struct form_control *control,
-		browser_mouse_state mouse, int x, int y);
+		enum browser_mouse_state mouse, int x, int y);
 void form_select_get_dimensions(struct form_control *control,
 		int *width, int *height);
 void form_select_process_selection(struct form_control *control, int item);
diff --git a/render/html.c b/render/html.c
index ece083dad..9e025fd3b 100644
--- a/render/html.c
+++ b/render/html.c
@@ -46,6 +46,7 @@
 #include "desktop/textarea.h"
 #include "image/bitmap.h"
 #include "javascript/js.h"
+#include "desktop/browser.h"
 #include "desktop/font.h"
 #include "desktop/gui_utf8.h"
 #include "desktop/gui_internal.h"
diff --git a/render/html_forms.c b/render/html_forms.c
index c80edc6bb..97a861bf7 100644
--- a/render/html_forms.c
+++ b/render/html_forms.c
@@ -16,12 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "utils/corestrings.h"
+#include "utils/log.h"
+
+#include "desktop/browser.h"
 
 #include "render/form.h"
 #include "render/html_internal.h"
-#include "utils/corestrings.h"
-
-#include "utils/log.h"
 
 /** 
  * process form element from dom
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 12ed1d3d4..f61a0076e 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -28,6 +28,7 @@
  * Redrawing CONTENT_HTML implementation.
  */
 
+#include "utils/config.h"
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -35,16 +36,16 @@
 #include <math.h>
 #include <dom/dom.h>
 
-#include "utils/config.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
+#include "utils/nsoption.h"
 #include "content/content_protected.h"
 #include "css/css.h"
 #include "css/utils.h"
+#include "desktop/browser.h"
 #include "desktop/plotters.h"
 #include "desktop/selection.h"
-#include "utils/nsoption.h"
 #include "desktop/print.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
diff --git a/render/layout.c b/render/layout.c
index 79961094f..19a6ca5f7 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -49,6 +49,7 @@
 #include "css/utils.h"
 #include "content/content_protected.h"
 #include "utils/nsoption.h"
+#include "desktop/browser.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
 #include "desktop/font.h"
diff --git a/riscos/save.c b/riscos/save.c
index cd9706635..1974d9c16 100644
--- a/riscos/save.c
+++ b/riscos/save.c
@@ -44,6 +44,7 @@
 #include "utils/utils.h"
 #include "content/content.h"
 #include "content/hlcache.h"
+#include "desktop/browser.h"
 #include "desktop/hotlist.h"
 #include "desktop/global_history.h"
 #include "desktop/version.h"