remove content include from urldb header

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,

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,

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,

desktop/global_history.c

@@ -18,6 +18,7 @@
 
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "utils/messages.h"
 #include "utils/utils.h"

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>

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);
 }
 

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:

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"

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"

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"

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 {