confine the gui table acessor to the gui factory header

7 files changed, 14 insertions, 7 deletions

diff --git a/desktop/browser.c b/desktop/browser.c
index 30aeead0c..3ae613d08 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -47,6 +47,7 @@
 #include "desktop/frames.h"
 #include "desktop/global_history.h"
 #include "desktop/gui.h"
+#include "desktop/gui_factory.h"
 #include "desktop/hotlist.h"
 #include "desktop/knockout.h"
 #include "desktop/local_history.h"
diff --git a/desktop/download.c b/desktop/download.c
index 98c6b6dd0..14390c78a 100644
--- a/desktop/download.c
+++ b/desktop/download.c
@@ -27,6 +27,7 @@
 #include "content/llcache.h"
 #include "desktop/download.h"
 #include "desktop/gui.h"
+#include "desktop/gui_factory.h"
 #include "utils/http.h"
 #include "utils/url.h"
 #include "utils/utils.h"
diff --git a/desktop/gui.h b/desktop/gui.h
index 50e8c67d9..2780325f5 100644
--- a/desktop/gui.h
+++ b/desktop/gui.h
@@ -64,6 +64,13 @@ struct gui_window;
 struct gui_download_window;
 struct browser_window;
 struct form_control;
+struct ssl_cert_info;
+
+typedef struct nsnsclipboard_styles {
+	size_t start;			/**< Start of run */
+
+	plot_font_style_t style;	/**< Style to give text run */
+} nsclipboard_styles;
 
 /** Graphical user interface window function table
  *
@@ -294,7 +301,6 @@ struct gui_table {
 	void (*set_search_ico)(hlcache_handle *ico);
 };
 
-extern struct gui_table *guit; /* the gui vtable */
 
 
 
@@ -325,11 +331,6 @@ void gui_create_form_select_menu(struct browser_window *bw,
  */
 void gui_get_clipboard(char **buffer, size_t *length);
 
-typedef struct nsnsclipboard_styles {
-	size_t start;			/**< Start of run */
-
-	plot_font_style_t style;	/**< Style to give text run */
-} nsclipboard_styles;
 
 /**
  * Core tells front end to put given text in clipboard
@@ -344,7 +345,6 @@ void gui_set_clipboard(const char *buffer, size_t length,
 
 
 
-struct ssl_cert_info;
 
 void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
 		unsigned long num, nserror (*cb)(bool proceed, void *pw),
diff --git a/desktop/gui_factory.h b/desktop/gui_factory.h
index 66303eac1..c70ca8f37 100644
--- a/desktop/gui_factory.h
+++ b/desktop/gui_factory.h
@@ -25,6 +25,8 @@
 
 struct gui_table;
 
+extern struct gui_table *guit; /* the gui vtable */
+
 nserror gui_factory_register(struct gui_table *gt);
 
 #endif
diff --git a/desktop/searchweb.c b/desktop/searchweb.c
index 321edd0b6..63e17ee90 100644
--- a/desktop/searchweb.c
+++ b/desktop/searchweb.c
@@ -27,6 +27,7 @@
 #include "content/hlcache.h"
 #include "desktop/browser.h"
 #include "desktop/gui.h"
+#include "desktop/gui_factory.h"
 #include "utils/nsoption.h"
 #include "desktop/searchweb.h"
 #include "utils/config.h"
diff --git a/desktop/selection.c b/desktop/selection.c
index ca383c179..fc91f1dbb 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -30,6 +30,7 @@
 
 #include "desktop/browser_private.h"
 #include "desktop/gui.h"
+#include "desktop/gui_factory.h"
 #include "desktop/mouse.h"
 #include "desktop/plotters.h"
 #include "desktop/save_text.h"
diff --git a/desktop/textinput.c b/desktop/textinput.c
index 95c321eaa..c61b838fe 100644
--- a/desktop/textinput.c
+++ b/desktop/textinput.c
@@ -31,6 +31,7 @@
 
 #include "desktop/browser_private.h"
 #include "desktop/gui.h"
+#include "desktop/gui_factory.h"
 #include "desktop/mouse.h"
 #include "desktop/scrollbar.h"
 #include "desktop/selection.h"