diff --git a/atari/about.c b/atari/about.c
index 9cd64d227..46772a91b 100644
--- a/atari/about.c
+++ b/atari/about.c
@@ -23,6 +23,15 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "testament.h"
+#include "utils/useragent.h"
+#include "utils/nsurl.h"
+#include "utils/messages.h"
+#include "desktop/version.h"
+#include "desktop/browser.h"
+
+#include "curl/curlver.h"
+
 #include "cflib.h"
 #include "atari/misc.h"
 #include "atari/plot/plot.h"
@@ -30,21 +39,11 @@
 #include "atari/res/netsurf.rsh"
 #include "atari/about.h"
 
-#include "testament.h"
-#include "utils/useragent.h"
-#include "desktop/version.h"
-#include "utils/nsurl.h"
-#include "utils/messages.h"
-
-#include "curl/curlver.h"
-
-
 static OBJECT * about_form = NULL;
 static char * infocontent;
 static char version[32];
 VdiHdl vdihandle;
 
-
 static short __CDECL about_userdraw(PARMBLK *parmblock)
 {
 	short pxy[8];
diff --git a/atari/bitmap.c b/atari/bitmap.c
index 6d986fb5b..ff0d50873 100755
--- a/atari/bitmap.c
+++ b/atari/bitmap.c
@@ -19,14 +19,15 @@
 #include <inttypes.h>
 #include <sys/types.h>
 #include <string.h>
-
-
 #include "assert.h"
+
 #include "utils/nsoption.h"
+#include "utils/log.h"
 #include "image/bitmap.h"
+#include "desktop/mouse.h"
+
 #include "atari/bitmap.h"
 #include "atari/plot/plot.h"
-#include "utils/log.h"
 
 
 /*
diff --git a/atari/certview.c b/atari/certview.c
index e9ad941db..15d57c236 100644
--- a/atari/certview.c
+++ b/atari/certview.c
@@ -27,7 +27,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "desktop/browser.h"
 #include "content/urldb.h"
 #include "content/hlcache.h"
 #include "desktop/sslcert_viewer.h"
diff --git a/atari/cookies.c b/atari/cookies.c
index ec7b93628..579c23d05 100644
--- a/atari/cookies.c
+++ b/atari/cookies.c
@@ -26,11 +26,10 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "desktop/browser.h"
+#include "utils/nsoption.h"
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
-#include "utils/nsoption.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/tree.h"
 #include "desktop/core_window.h"
diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c
index 93035bfc1..e21876c35 100644
--- a/atari/ctxmenu.c
+++ b/atari/ctxmenu.c
@@ -31,7 +31,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "desktop/browser.h"
 #include "desktop/browser_private.h"
 #include "desktop/mouse.h"
 #include "desktop/textinput.h"
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 96b2d02ce..24f4caaed 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -21,10 +21,10 @@
 
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "desktop/browser.h"
-#include "desktop/browser_private.h"
 #include "utils/nsoption.h"
+#include "desktop/browser_private.h"
 #include "desktop/save_complete.h"
+
 #include "atari/res/netsurf.rsh"
 #include "atari/gemtk/gemtk.h"
 #include "atari/deskmenu.h"
@@ -33,13 +33,11 @@
 #include "atari/cookies.h"
 #include "atari/toolbar.h"
 #include "atari/settings.h"
-#include "atari/search.h"
 #include "atari/misc.h"
 #include "atari/gui.h"
 #include "atari/findfile.h"
 #include "atari/about.h"
 #include "atari/plot/plot.h"
-
 #include "atari/rootwin.h"
 
 typedef void __CDECL (*menu_evnt_func)(short item, short title, void * data);
diff --git a/atari/findfile.c b/atari/findfile.c
index 356a9333f..c8ac7cc10 100755
--- a/atari/findfile.c
+++ b/atari/findfile.c
@@ -29,7 +29,6 @@
 #include "utils/url.h"
 #include "atari/gemtk/gemtk.h"
 #include "atari/findfile.h"
-#include "atari/gui.h"
 #include "atari/misc.h"
 #include "atari/osspec.h"
 
diff --git a/atari/gui.h b/atari/gui.h
index 10736c5f8..3265759ec 100755
--- a/atari/gui.h
+++ b/atari/gui.h
@@ -22,7 +22,6 @@
 #include <stdbool.h>
 #include <mt_gem.h>
 
-#include "atari/search.h"
 #include "atari/redrawslots.h"
 #include "atari/gemtk/gemtk.h"
 
diff --git a/atari/history.c b/atari/history.c
index 26d571826..329328a29 100644
--- a/atari/history.c
+++ b/atari/history.c
@@ -29,7 +29,6 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/nsoption.h"
-#include "desktop/browser.h"
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
diff --git a/atari/hotlist.c b/atari/hotlist.c
index c2209e448..0324c3bf5 100644
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -27,7 +27,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "desktop/browser.h"
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
diff --git a/atari/login.c b/atari/login.c
index 4beae6ebb..66e021751 100755
--- a/atari/login.c
+++ b/atari/login.c
@@ -30,8 +30,6 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
-#include "desktop/browser.h"
-#include "content/urldb.h"
 #include "content/fetch.h"
 
 #include "atari/misc.h"
diff --git a/atari/plot/font_freetype.c b/atari/plot/font_freetype.c
index 13250d4e1..b88505d19 100755
--- a/atari/plot/font_freetype.c
+++ b/atari/plot/font_freetype.c
@@ -1,30 +1,31 @@
-/*
- * Copyright 2005 James Bursa <bursa@users.sourceforge.net>
- *           2008 Vincent Sanders <vince@simtec.co.uk>
- *			 2011 Ole Loots <ole@monochrom.net>
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef WITH_FREETYPE_FONT_DRIVER
+/*
+ * Copyright 2005 James Bursa <bursa@users.sourceforge.net>
+ *           2008 Vincent Sanders <vince@simtec.co.uk>
+ *           2011 Ole Loots <ole@monochrom.net>
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include <ft2build.h>
-#include FT_CACHE_H
-
-#include "utils/nsoption.h"
-#include "css/css.h"
-#include "atari/plot/plot.h"
+#ifdef WITH_FREETYPE_FONT_DRIVER
+
+#include <ft2build.h>
+#include FT_CACHE_H
+
+#include "utils/nsoption.h"
+#include "desktop/mouse.h"
+
+#include "atari/plot/plot.h"
 #include "atari/plot/font_freetype.h"
 #include "atari/findfile.h"
 
diff --git a/atari/plot/font_internal.c b/atari/plot/font_internal.c
index e3c806cfe..0a8619f38 100644
--- a/atari/plot/font_internal.c
+++ b/atari/plot/font_internal.c
@@ -19,12 +19,16 @@
 
 #ifdef WITH_INTERNAL_FONT_DRIVER
 
+#include <unistd.h>
+
+#include "utils/utf8.h"
+#include "utils/log.h"
+#include "desktop/mouse.h"
+
 #include "atari/plot/plot.h"
 #include "atari/plot/fontplot.h"
 #include "atari/plot/font_internal.h"
 
-#include "utils/utf8.h"
-#include "utils/log.h"
 
 extern unsigned long atari_plot_flags;
 extern int atari_plot_vdi_handle;
diff --git a/atari/plot/fontplot.c b/atari/plot/fontplot.c
index a33dd1f9a..3d5526bd4 100644
--- a/atari/plot/fontplot.c
+++ b/atari/plot/fontplot.c
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "desktop/mouse.h"
+
 #include "atari/plot/fontplot.h"
 
 const struct s_font_driver_table_entry font_driver_table[] =
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index feeb5f9f7..a0b99e5ae 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -30,9 +30,9 @@
 #include "utils/utf8.h"
 #include "utils/utils.h"
 #include "desktop/plotters.h"
+#include "desktop/mouse.h"
 
 #include "atari/bitmap.h"
-#include "atari/gui.h"
 #include "utils/nsoption.h"
 #include "atari/plot/plot.h"
 
diff --git a/atari/rootwin.c b/atari/rootwin.c
index 0258bc2d2..544bb8a65 100755
--- a/atari/rootwin.c
+++ b/atari/rootwin.c
@@ -37,7 +37,6 @@
 #include <mt_gem.h>
 
 #include "utils/log.h"
-#include "desktop/browser.h"
 #include "desktop/browser_private.h"
 #include "desktop/mouse.h"
 #include "desktop/plotters.h"
diff --git a/atari/search.c b/atari/search.c
index 072ba1d49..cb2770e88 100644
--- a/atari/search.c
+++ b/atari/search.c
@@ -27,7 +27,6 @@
 
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "desktop/browser.h"
 #include "desktop/browser_private.h"
 #include "desktop/search.h"
 #include "desktop/gui_search.h"
diff --git a/atari/search.h b/atari/search.h
index 984fd3704..0f427d62c 100644
--- a/atari/search.h
+++ b/atari/search.h
@@ -1,52 +1,43 @@
-/*
- * Copyright 2013 Ole Loots <ole@monochrom.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Module Description:
- *
- *
- *
- */
+/*
+ * Copyright 2013 Ole Loots <ole@monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
-#include "desktop/browser.h"
-#include "desktop/search.h"
+#ifndef NS_ATARI_SEARCH_H
+#define NS_ATARI_SEARCH_H
 
-#ifndef NS_ATARI_SEARCH_H
-#define NS_ATARI_SEARCH_H
-
 #define SEARCH_MAX_SLEN 24
 
 struct gui_window;
-struct browser_window;
-
-struct s_search_form_state
-{
-	char text[32];
+struct browser_window;
+
+struct s_search_form_state {
+	char text[32];
 	uint32_t flags;
-	bool back_avail;
-};
-
-struct s_search_form_session {
-	struct browser_window * bw;
-	struct s_search_form_state state;
-};
-
-
-typedef struct s_search_form_session * SEARCH_FORM_SESSION;
-
+	bool back_avail;
+};
+
+struct s_search_form_session {
+	struct browser_window *bw;
+	struct s_search_form_state state;
+};
+
+typedef struct s_search_form_session * SEARCH_FORM_SESSION;
+
 struct s_search_form_session * nsatari_search_session_create(OBJECT * obj,
 		struct browser_window *bw);
 
@@ -56,5 +47,5 @@ void nsatari_search_session_destroy(struct s_search_form_session *s);
 void nsatari_search_perform(struct s_search_form_session *s, OBJECT *obj,
 		search_flags_t f);
 void nsatari_search_restore_form( struct s_search_form_session *s, OBJECT *obj);
-
+
 #endif
diff --git a/atari/statusbar.c b/atari/statusbar.c
index 0730b7ef2..b10a95a0e 100755
--- a/atari/statusbar.c
+++ b/atari/statusbar.c
@@ -28,7 +28,6 @@
 #include <math.h>
 
 #include "utils/log.h"
-#include "desktop/browser.h"
 #include "desktop/mouse.h"
 #include "desktop/plotters.h"
 
@@ -36,7 +35,6 @@
 #include "atari/statusbar.h"
 #include "atari/rootwin.h"
 #include "atari/misc.h"
-
 #include "atari/res/netsurf.rsh"
 #include "atari/plot/plot.h"
 #include "atari/osspec.h"
diff --git a/atari/toolbar.c b/atari/toolbar.c
index e939be81c..9ce7d4b42 100644
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -28,7 +28,9 @@
 #include <math.h>
 
 #include "utils/log.h"
-#include "desktop/browser.h"
+#include "utils/nsoption.h"
+#include "utils/nsurl.h"
+#include "utils/utf8.h"
 #include "desktop/browser_history.h"
 #include "desktop/browser_private.h"
 #include "desktop/mouse.h"
@@ -36,24 +38,20 @@
 #include "desktop/plotters.h"
 #include "desktop/tree.h"
 #include "desktop/hotlist.h"
+#include "desktop/textarea.h"
+#include "desktop/textinput.h"
+#include "content/hlcache.h"
 
-#include "utils/nsoption.h"
-#include "utils/nsurl.h"
-#include "utils/utf8.h"
 #include "atari/clipboard.h"
 #include "atari/gui.h"
+#include "atari/search.h"
 #include "atari/toolbar.h"
 #include "atari/rootwin.h"
-
 #include "atari/clipboard.h"
 #include "atari/misc.h"
 #include "atari/plot/plot.h"
 #include "cflib.h"
 #include "atari/res/netsurf.rsh"
-
-#include "desktop/textarea.h"
-#include "desktop/textinput.h"
-#include "content/hlcache.h"
 #include "atari/encoding.h"
 
 
diff --git a/atari/toolbar.h b/atari/toolbar.h
index 284376fcb..19063f906 100644
--- a/atari/toolbar.h
+++ b/atari/toolbar.h
@@ -22,9 +22,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "desktop/textarea.h"
-#include "desktop/browser.h"
-
 struct s_toolbar;
 struct nsurl;
 
diff --git a/atari/treeview.c b/atari/treeview.c
index ce0112d67..2f99cbc8a 100644
--- a/atari/treeview.c
+++ b/atari/treeview.c
@@ -20,19 +20,18 @@
 #include <sys/types.h>
 #include <string.h>
 
-
 #include "assert.h"
 #include "cflib.h"
 
 #include "utils/nsoption.h"
-#include "content/urldb.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
-#include "desktop/mouse.h"
-#include "desktop/treeview.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
+#include "content/urldb.h"
+#include "desktop/plotters.h"
+#include "desktop/mouse.h"
+#include "desktop/treeview.h"
+
 #include "atari/gui.h"
 #include "atari/plot/plot.h"
 #include "atari/misc.h"