remove all unecessary desktop/browser.h includes

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];

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"
 
 
 /*

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"

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"

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"

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);

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"
 

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"
 

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"

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"

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"

atari/plot/font_freetype.c

@@ -23,7 +23,8 @@
 #include FT_CACHE_H
 
 #include "utils/nsoption.h"
-#include "css/css.h"
+#include "desktop/mouse.h"
+
 #include "atari/plot/plot.h"
 #include "atari/plot/font_freetype.h"
 #include "atari/findfile.h"

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;

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[] =

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"
 

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"

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"

atari/search.h

@@ -15,15 +15,8 @@
  * 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:
- *
- *
- *
  */
 
-#include "desktop/browser.h"
-#include "desktop/search.h"
-
 #ifndef NS_ATARI_SEARCH_H
 #define NS_ATARI_SEARCH_H
 
@@ -32,19 +25,17 @@
 struct gui_window;
 struct browser_window;
 
-struct s_search_form_state
-{
+struct s_search_form_state {
 	char text[32];
 	uint32_t flags;
 	bool back_avail;
 };
 
 struct s_search_form_session {
-	struct browser_window * bw;
+	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,

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"

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"
 
 

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;
 

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"