remove all unecessary desktop/browser.h includes

4 files changed, 37 insertions, 30 deletions

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

-
-#include <ft2build.h>

-#include FT_CACHE_H

-

-#include "utils/nsoption.h"

-#include "css/css.h"
-#include "atari/plot/plot.h"

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