From db0163734370a39676fe45b27105b454fa391ce7 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Thu, 17 Jul 2014 00:18:44 +0100
Subject: remove content include from urldb header

---
 content/content_type.h   | 3 ---
 content/urldb.h          | 3 +--
 desktop/cookie_manager.c | 8 +++++---
 desktop/global_history.c | 1 +
 desktop/hotlist.c        | 1 +
 desktop/sslcert_viewer.c | 3 +++
 desktop/tree.c           | 2 --
 desktop/treeview.h       | 1 +
 framebuffer/gui.c        | 1 +
 framebuffer/thumbnail.c  | 2 ++
 image/image_cache.h      | 2 ++
 11 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/content/content_type.h b/content/content_type.h
index 6488692fe..9f8c2f307 100644
--- a/content/content_type.h
+++ b/content/content_type.h
@@ -25,9 +25,6 @@
 #ifndef _NETSURF_DESKTOP_CONTENT_TYPE_H_
 #define _NETSURF_DESKTOP_CONTENT_TYPE_H_
 
-#include "utils/config.h"
-
-
 /** The type of a content. */
 typedef enum {
 	CONTENT_NONE		= 0x00,
diff --git a/content/urldb.h b/content/urldb.h
index 6a2946515..d60043089 100644
--- a/content/urldb.h
+++ b/content/urldb.h
@@ -25,9 +25,8 @@
 
 #include <stdbool.h>
 #include <time.h>
-#include "content/content.h"
-#include "content/content_type.h"
 #include "utils/nsurl.h"
+#include "content/content_type.h"
 
 typedef enum {
 	COOKIE_NETSCAPE = 0,
diff --git a/desktop/cookie_manager.c b/desktop/cookie_manager.c
index 800e97ddf..c0ca16128 100644
--- a/desktop/cookie_manager.c
+++ b/desktop/cookie_manager.c
@@ -22,13 +22,15 @@
 
 
 #include <stdlib.h>
+#include <string.h>
 
-#include "content/urldb.h"
-#include "desktop/cookie_manager.h"
-#include "desktop/treeview.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/log.h"
+#include "content/urldb.h"
+
+#include "desktop/cookie_manager.h"
+#include "desktop/treeview.h"
 
 enum cookie_manager_field {
 	COOKIE_M_NAME,
diff --git a/desktop/global_history.c b/desktop/global_history.c
index ebccfc6b6..7d679e5a2 100644
--- a/desktop/global_history.c
+++ b/desktop/global_history.c
@@ -18,6 +18,7 @@
 
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "utils/messages.h"
 #include "utils/utils.h"
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index aa4370e96..f0eda841b 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -19,6 +19,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <dom/dom.h>
 #include <dom/bindings/hubbub/parser.h>
diff --git a/desktop/sslcert_viewer.c b/desktop/sslcert_viewer.c
index d465af8d6..20b90bf6c 100644
--- a/desktop/sslcert_viewer.c
+++ b/desktop/sslcert_viewer.c
@@ -486,6 +486,9 @@ void sslcert_viewer_redraw(struct sslcert_session_data *ssl_d,
 		int x, int y, struct rect *clip,
 		const struct redraw_context *ctx)
 {
+	assert(ssl_d != NULL &&
+	       "sslcert_viewer_redraw() given bad session data");
+
 	treeview_redraw(ssl_d->tree, x, y, clip, ctx);
 }
 
diff --git a/desktop/tree.c b/desktop/tree.c
index a17230bc5..15118c3d2 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -212,8 +212,6 @@ static bool treeview_test_redraw(struct tree *tree, int x, int y,
 
 	switch (tree->flags) {
 	case TREE_SSLCERT:
-		assert(ssl_current_session != NULL &&
-			"Can't use sslcert window after sslcert_viewer_fini()");
 		sslcert_viewer_redraw(ssl_current_session, x, y, &clip, ctx);
 		return true;
 	case TREE_COOKIES:
diff --git a/desktop/treeview.h b/desktop/treeview.h
index b5de3e713..0b5bbbbd9 100644
--- a/desktop/treeview.h
+++ b/desktop/treeview.h
@@ -26,6 +26,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "desktop/mouse.h"
 #include "desktop/core_window.h"
 #include "desktop/textinput.h"
 #include "utils/types.h"
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index 2a691f7f6..f77edc46e 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -36,6 +36,7 @@
 #include "desktop/mouse.h"
 #include "desktop/plotters.h"
 #include "desktop/netsurf.h"
+#include "utils/utils.h"
 #include "utils/nsoption.h"
 #include "utils/filepath.h"
 #include "utils/log.h"
diff --git a/framebuffer/thumbnail.c b/framebuffer/thumbnail.c
index 53ff33609..0573e0758 100644
--- a/framebuffer/thumbnail.c
+++ b/framebuffer/thumbnail.c
@@ -22,8 +22,10 @@
 #include <libnsfb_plot.h>
 
 #include "utils/log.h"
+#include "utils/utils.h"
 #include "desktop/thumbnail.h"
 #include "content/urldb.h"
+#include "content/content.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"
diff --git a/image/image_cache.h b/image/image_cache.h
index 8a9fb896d..c0a3076b0 100644
--- a/image/image_cache.h
+++ b/image/image_cache.h
@@ -41,6 +41,8 @@
 #include "desktop/plotters.h"
 #include "image/bitmap.h"
 
+struct content_redraw_data;
+
 typedef struct bitmap * (image_cache_convert_fn) (struct content *content);
 
 struct image_cache_parameters {
-- 
cgit v1.2.3