From 7a6faf41994e1bd9a31112e7349221331e3fdc05 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Fri, 17 Oct 2014 09:27:58 +0100
Subject: reduce uncesessary inclusion of browser.h and browser_private.h

---
 monkey/browser.c   | 4 +++-
 monkey/browser.h   | 3 ---
 monkey/download.c  | 2 ++
 monkey/main.c      | 1 +
 monkey/poll.c      | 7 ++++---
 monkey/thumbnail.c | 6 +++++-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/monkey/browser.c b/monkey/browser.c
index f69a2e810..06517e023 100644
--- a/monkey/browser.c
+++ b/monkey/browser.c
@@ -23,8 +23,10 @@
 #include "utils/ring.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "desktop/browser_private.h"
+#include "desktop/mouse.h"
 #include "desktop/gui_window.h"
+#include "desktop/browser.h"
+#include "content/hlcache.h"
 
 #include "monkey/browser.h"
 #include "monkey/plot.h"
diff --git a/monkey/browser.h b/monkey/browser.h
index 959c6a1e6..7fe7c5390 100644
--- a/monkey/browser.h
+++ b/monkey/browser.h
@@ -19,9 +19,6 @@
 #ifndef NETSURF_MONKEY_BROWSER_H
 #define NETSURF_MONKEY_BROWSER_H
 
-#include "desktop/browser.h"
-#include "content/hlcache.h"
-
 extern struct gui_window_table *monkey_window_table;
 extern struct gui_download_table *monkey_download_table;
 
diff --git a/monkey/download.c b/monkey/download.c
index 6276972c2..bc820744c 100644
--- a/monkey/download.c
+++ b/monkey/download.c
@@ -17,11 +17,13 @@
  */
 
 #include <stdio.h>
+#include <stdint.h>
 
 #include "utils/errors.h"
 #include "utils/ring.h"
 #include "desktop/gui_download.h"
 #include "desktop/download.h"
+#include "content/hlcache.h"
 
 #include "monkey/browser.h"
 
diff --git a/monkey/main.c b/monkey/main.c
index 3d67e113e..77ef831b1 100644
--- a/monkey/main.c
+++ b/monkey/main.c
@@ -25,6 +25,7 @@
 #include "utils/nsoption.h"
 #include "content/urldb.h"
 #include "content/fetchers/resource.h"
+#include "content/hlcache.h"
 #include "desktop/gui_misc.h"
 #include "desktop/netsurf.h"
 
diff --git a/monkey/poll.c b/monkey/poll.c
index 187849b2a..6e96919a1 100644
--- a/monkey/poll.c
+++ b/monkey/poll.c
@@ -17,11 +17,12 @@
  */
 
 #include <assert.h>
+#include <stdlib.h>
 
-#include "desktop/browser.h"
-#include "monkey/schedule.h"
-#include "monkey/browser.h"
+#include "content/hlcache.h"
 #include "content/fetchers.h"
+
+#include "monkey/schedule.h"
 #include "monkey/dispatch.h"
 #include "monkey/poll.h"
 
diff --git a/monkey/thumbnail.c b/monkey/thumbnail.c
index bc78aca2d..61f5ee611 100644
--- a/monkey/thumbnail.c
+++ b/monkey/thumbnail.c
@@ -16,8 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "monkey/browser.h"
+#include <stdint.h>
+
 #include "desktop/thumbnail.h"
+#include "content/hlcache.h"
+
+#include "monkey/browser.h"
 
 bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
 		nsurl *url)
-- 
cgit v1.2.3