From 1097cc40b489c3cb1ae97fc93430df685323c70d Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Fri, 17 Oct 2014 12:21:06 +0100
Subject: remove unecessary browser.h include from core headers

---
 render/form.c        | 1 +
 render/form.h        | 8 ++++----
 render/html.c        | 1 +
 render/html_forms.c  | 7 ++++---
 render/html_redraw.c | 5 +++--
 render/layout.c      | 1 +
 6 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'render')

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"
-- 
cgit v1.2.3