reduce uncesessary inclusion of browser.h and browser_private.h

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"

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;
 

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"
 

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"
 

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"
 

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)