clean up gtk gui header usage and includes

gtk/about.c

@@ -27,11 +27,11 @@
 #include "utils/utils.h"
 #include "utils/messages.h"
 #include "utils/nsoption.h"
+#include "utils/nsurl.h"
 #include "desktop/browser.h"
 #include "desktop/version.h"
 
 #include "gtk/compat.h"
-#include "gtk/gui.h"
 #include "gtk/about.h"
 
 #define ABOUT_RESPONSE_ID_LICENCE 1

gtk/cookies.c

@@ -20,13 +20,14 @@
  * Cookies (implementation).
  */
 
+#include <gtk/gtk.h>
 
+#include "utils/log.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/plotters.h"
 #include "desktop/tree.h"
 #include "desktop/textinput.h"
-#include "utils/log.h"
-#include "gtk/gui.h"
+
 #include "gtk/cookies.h"
 #include "gtk/plotters.h"
 #include "gtk/scaffolding.h"

gtk/download.c

@@ -31,7 +31,6 @@
 #include "desktop/download.h"
 #include "desktop/gui_download.h"
 
-#include "gtk/gui.h"
 #include "gtk/scaffolding.h"
 #include "gtk/download.h"
 #include "gtk/window.h"

gtk/fetch.c

@@ -24,11 +24,13 @@
 #include <ctype.h>
 #include <string.h>
 #include <strings.h>
+#include <gtk/gtk.h>
 
 #include "utils/hashtable.h"
 #include "utils/log.h"
 #include "utils/filepath.h"
 #include "utils/file.h"
+#include "utils/nsurl.h"
 #include "desktop/gui_fetch.h"
 
 #include "gtk/gui.h"

gtk/gui.h

@@ -19,11 +19,7 @@
 #ifndef GTK_GUI_H
 #define GTK_GUI_H
 
-#include <inttypes.h>
-#include <stdbool.h>
-#include <gtk/gtk.h>
-
-#include "utils/nsurl.h"
+struct nsurl;
 
 /** glade file paths. */
 struct glade_file_location_s {
@@ -70,7 +66,7 @@ extern char **respaths;
 uint32_t gtk_gui_gdkkey_to_nskey(GdkEventKey *eventkey);
 
 /** login window request. */
-extern void gui_401login_open(nsurl *url, const char *realm, nserror (*cb)(bool proceed, void *pw), void *cbpw);
+extern void gui_401login_open(struct nsurl *url, const char *realm, nserror (*cb)(bool proceed, void *pw), void *cbpw);
 
 /** set when no windows remain open. */
 extern bool nsgtk_complete;

gtk/history.c

@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <gtk/gtk.h>
 
 #include "utils/log.h"
 #include "utils/utils.h"
@@ -25,7 +26,6 @@
 #include "desktop/tree.h"
 #include "desktop/textinput.h"
 
-#include "gtk/gui.h"
 #include "gtk/history.h"
 #include "gtk/plotters.h"
 #include "gtk/scaffolding.h"

gtk/hotlist.c

@@ -17,6 +17,7 @@
  */
 
 #include <stdlib.h>
+#include <gtk/gtk.h>
 
 #include "utils/log.h"
 #include "utils/nsoption.h"
@@ -24,7 +25,6 @@
 #include "desktop/plotters.h"
 #include "desktop/tree.h"
 
-#include "gtk/gui.h"
 #include "gtk/hotlist.h"
 #include "gtk/plotters.h"
 #include "gtk/scaffolding.h"

gtk/preferences.c

@@ -25,6 +25,7 @@
 #include "utils/nsoption.h"
 #include "utils/file.h"
 #include "utils/log.h"
+#include "utils/nsurl.h"
 #include "desktop/browser.h"
 #include "desktop/searchweb.h"
 

gtk/tabs.c

@@ -28,7 +28,6 @@
 
 #include "gtk/compat.h"
 #include "gtk/window.h"
-#include "gtk/gui.h"
 #include "gtk/search.h"
 #include "gtk/tabs.h"