From 9c8d60792f42b5dd6b56e38bfc10467d1a5d22a7 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Mon, 6 Jun 2016 15:14:29 +0100
Subject: reduce usage of content headers by monkey frontend

---
 frontends/monkey/browser.c  | 5 +++--
 frontends/monkey/browser.h  | 4 +++-
 frontends/monkey/download.c | 1 -
 frontends/monkey/filetype.c | 1 -
 frontends/monkey/main.c     | 8 ++++----
 5 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'frontends/monkey')

diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index bfabd0f88..3bf0dd036 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -20,16 +20,17 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "utils/utils.h"
 #include "utils/ring.h"
 #include "utils/log.h"
 #include "utils/messages.h"
+#include "utils/nsurl.h"
 #include "netsurf/mouse.h"
 #include "netsurf/window.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/plotters.h"
-#include "content/hlcache.h"
 
 #include "monkey/browser.h"
 #include "monkey/plot.h"
@@ -140,7 +141,7 @@ gui_window_new_content(struct gui_window *g)
 }
 
 static void
-gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
+gui_window_set_icon(struct gui_window *g, struct hlcache_handle *icon)
 {
   fprintf(stdout, "WINDOW NEW_ICON WIN %u\n", g->win_num);
 }
diff --git a/frontends/monkey/browser.h b/frontends/monkey/browser.h
index 32572742a..2b0340211 100644
--- a/frontends/monkey/browser.h
+++ b/frontends/monkey/browser.h
@@ -19,6 +19,8 @@
 #ifndef NETSURF_MONKEY_BROWSER_H
 #define NETSURF_MONKEY_BROWSER_H
 
+struct hlcache_handle;
+
 extern struct gui_window_table *monkey_window_table;
 extern struct gui_download_table *monkey_download_table;
 
@@ -37,7 +39,7 @@ struct gui_window {
 };
 
 struct gui_window *monkey_find_window_by_num(uint32_t win_num);
-struct gui_window *monkey_find_window_by_content(hlcache_handle *content);
+struct gui_window *monkey_find_window_by_content(struct hlcache_handle *content);
 void monkey_window_process_reformats(void);
 
 void monkey_window_handle_command(int argc, char **argv);
diff --git a/frontends/monkey/download.c b/frontends/monkey/download.c
index 32241059a..f2e1cbfbf 100644
--- a/frontends/monkey/download.c
+++ b/frontends/monkey/download.c
@@ -24,7 +24,6 @@
 #include "utils/ring.h"
 #include "netsurf/download.h"
 #include "desktop/download.h"
-#include "content/hlcache.h"
 
 #include "monkey/browser.h"
 
diff --git a/frontends/monkey/filetype.c b/frontends/monkey/filetype.c
index d5517bf06..297252361 100644
--- a/frontends/monkey/filetype.c
+++ b/frontends/monkey/filetype.c
@@ -27,7 +27,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "content/fetch.h"
 #include "utils/log.h"
 #include "utils/hashtable.h"
 
diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c
index 756eadba9..c9bb8ab52 100644
--- a/frontends/monkey/main.c
+++ b/frontends/monkey/main.c
@@ -22,6 +22,7 @@
 #include <sys/select.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <string.h>
 
 #include "utils/config.h"
 #include "utils/sys_time.h"
@@ -29,12 +30,11 @@
 #include "utils/messages.h"
 #include "utils/filepath.h"
 #include "utils/nsoption.h"
-#include "content/urldb.h"
-#include "content/fetchers.h"
-#include "content/fetchers/resource.h"
-#include "content/hlcache.h"
+#include "utils/nsurl.h"
 #include "netsurf/misc.h"
 #include "netsurf/netsurf.h"
+#include "content/urldb.h"
+#include "content/fetchers.h"
 
 #include "monkey/dispatch.h"
 #include "monkey/browser.h"
-- 
cgit v1.2.3