16 files changed, 33 insertions, 8 deletions
diff --git a/content/handlers/css/css.c b/content/handlers/css/css.c
index af2a9bc88..6bdc124e2 100644
--- a/content/handlers/css/css.c
+++ b/content/handlers/css/css.c
@@ -20,15 +20,17 @@
 #include <libwapcaplet/libwapcaplet.h>
 #include <dom/dom.h>
 
-#include "content/content_protected.h"
-#include "content/fetch.h"
-#include "content/hlcache.h"
-#include "desktop/system_colour.h"
+#include "utils/errors.h"
 #include "utils/corestrings.h"
 #include "utils/utils.h"
 #include "utils/http.h"
 #include "utils/log.h"
 #include "utils/messages.h"
+#include "content/content_protected.h"
+#include "content/content_factory.h"
+#include "content/fetch.h"
+#include "content/hlcache.h"
+#include "desktop/system_colour.h"
 
 #include "css/css.h"
 #include "css/hints.h"
diff --git a/content/handlers/html/box_special.c b/content/handlers/html/box_special.c
index a369ec8ce..23cfeec0b 100644
--- a/content/handlers/html/box_special.c
+++ b/content/handlers/html/box_special.c
@@ -40,6 +40,7 @@
 #include "netsurf/plot_style.h"
 #include "css/hints.h"
 #include "desktop/frame_types.h"
+#include "content/content_factory.h"
 
 #include "html/html.h"
 #include "html/private.h"
diff --git a/content/handlers/html/dom_event.c b/content/handlers/html/dom_event.c
index 08a1e45f2..b702cb304 100644
--- a/content/handlers/html/dom_event.c
+++ b/content/handlers/html/dom_event.c
@@ -22,12 +22,14 @@
  * Implementation of HTML content DOM event handling.
  */
 
+#include "utils/config.h"
 #include "utils/corestrings.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/ascii.h"
 #include "utils/string.h"
 #include "utils/nsurl.h"
+#include "content/content.h"
 #include "javascript/js.h"
 
 #include "html/private.h"
diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c
index 0e13b9407..af06431bf 100644
--- a/content/handlers/html/html.c
+++ b/content/handlers/html/html.c
@@ -48,6 +48,7 @@
 #include "netsurf/layout.h"
 #include "netsurf/misc.h"
 #include "content/hlcache.h"
+#include "content/content_factory.h"
 #include "desktop/selection.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
diff --git a/content/handlers/html/layout.c b/content/handlers/html/layout.c
index b87fd16c4..ddf1d1632 100644
--- a/content/handlers/html/layout.c
+++ b/content/handlers/html/layout.c
@@ -52,6 +52,7 @@
 #include "netsurf/content.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/layout.h"
+#include "content/content.h"
 #include "content/content_protected.h"
 #include "css/utils.h"
 #include "desktop/scrollbar.h"
diff --git a/content/handlers/html/redraw.c b/content/handlers/html/redraw.c
index fa4cd954d..936c1b333 100644
--- a/content/handlers/html/redraw.c
+++ b/content/handlers/html/redraw.c
@@ -45,6 +45,7 @@
 #include "netsurf/plotters.h"
 #include "netsurf/bitmap.h"
 #include "netsurf/layout.h"
+#include "content/content.h"
 #include "content/content_protected.h"
 #include "css/utils.h"
 #include "desktop/selection.h"
diff --git a/content/handlers/html/script.c b/content/handlers/html/script.c
index faab08ba6..962386d68 100644
--- a/content/handlers/html/script.c
+++ b/content/handlers/html/script.c
@@ -36,6 +36,7 @@
 #include "netsurf/content.h"
 #include "javascript/js.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "content/fetch.h"
 #include "content/hlcache.h"
 
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index 448728ede..a1a6ce686 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -33,6 +33,7 @@
 #include "netsurf/content.h"
 #include "content/llcache.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
 
 #include "image/bmp.h"
@@ -87,10 +88,14 @@ static nserror nsbmp_create_bmp_data(nsbmp_content *bmp)
 	return NSERROR_OK;
 }
 
-static nserror nsbmp_create(const content_handler *handler,
-		lwc_string *imime_type, const struct http_parameter *params,
-		llcache_handle *llcache, const char *fallback_charset,
-		bool quirks, struct content **c)
+static nserror
+nsbmp_create(const struct content_handler *handler,
+	     lwc_string *imime_type,
+	     const struct http_parameter *params,
+	     llcache_handle *llcache,
+	     const char *fallback_charset,
+	     bool quirks,
+	     struct content **c)
 {
 	nsbmp_content *bmp;
 	nserror error;
diff --git a/content/handlers/image/gif.c b/content/handlers/image/gif.c
index fa09f401c..6ef4fa7e7 100644
--- a/content/handlers/image/gif.c
+++ b/content/handlers/image/gif.c
@@ -43,7 +43,9 @@
 #include "netsurf/bitmap.h"
 #include "netsurf/content.h"
 #include "content/llcache.h"
+#include "content/content.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
 
 #include "image/image.h"
diff --git a/content/handlers/image/ico.c b/content/handlers/image/ico.c
index fdaff829a..312127869 100644
--- a/content/handlers/image/ico.c
+++ b/content/handlers/image/ico.c
@@ -32,6 +32,7 @@
 #include "netsurf/content.h"
 #include "content/llcache.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
 
 #include "image/image.h"
diff --git a/content/handlers/image/jpeg.c b/content/handlers/image/jpeg.c
index 9df084b74..09e68fd29 100644
--- a/content/handlers/image/jpeg.c
+++ b/content/handlers/image/jpeg.c
@@ -33,7 +33,9 @@
 #include "utils/messages.h"
 #include "netsurf/bitmap.h"
 #include "content/llcache.h"
+#include "content/content.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
 
 #include "image/image_cache.h"
diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c
index cf8e780d6..1fa707d35 100644
--- a/content/handlers/image/png.c
+++ b/content/handlers/image/png.c
@@ -29,6 +29,7 @@
 #include "netsurf/bitmap.h"
 #include "content/llcache.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
 
 #include "image/image_cache.h"
diff --git a/content/handlers/image/rsvg.c b/content/handlers/image/rsvg.c
index c7cb6257e..5cf900dac 100644
--- a/content/handlers/image/rsvg.c
+++ b/content/handlers/image/rsvg.c
@@ -49,6 +49,7 @@
 #include "netsurf/content.h"
 #include "content/llcache.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
 
 #include "image/rsvg.h"
diff --git a/content/handlers/image/svg.c b/content/handlers/image/svg.c
index 6194389bf..895d799df 100644
--- a/content/handlers/image/svg.c
+++ b/content/handlers/image/svg.c
@@ -34,6 +34,7 @@
 #include "netsurf/plotters.h"
 #include "netsurf/content.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 
 #include "image/svg.h"
 
diff --git a/content/handlers/javascript/content.c b/content/handlers/javascript/content.c
index 2cb5ecd6f..9f37e126c 100644
--- a/content/handlers/javascript/content.c
+++ b/content/handlers/javascript/content.c
@@ -26,8 +26,10 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include "utils/errors.h"
 #include "utils/config.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "content/hlcache.h"
 #include "utils/log.h"
 #include "utils/messages.h"
diff --git a/content/handlers/text/textplain.c b/content/handlers/text/textplain.c
index 86122ff73..e9037f9ba 100644
--- a/content/handlers/text/textplain.c
+++ b/content/handlers/text/textplain.c
@@ -45,6 +45,7 @@
 #include "netsurf/plotters.h"
 #include "netsurf/layout.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "content/hlcache.h"
 #include "css/utils.h"
 #include "utils/nsoption.h"