Update content to split public and internal API

12 files changed, 34 insertions, 26 deletions

diff --git a/render/box.c b/render/box.c
index 81c22ed19..fa3e52d3a 100644
--- a/render/box.c
+++ b/render/box.c
@@ -33,12 +33,12 @@
 #include "utils/log.h"
 #include "utils/talloc.h"
 #include "utils/utils.h"
-#include "content/content_protected.h"
-#include "content/hlcache.h"
+#include "netsurf/misc.h"
+#include "netsurf/content.h"
+#include "netsurf/mouse.h"
 #include "content/handlers/css/utils.h"
 #include "content/handlers/css/dump.h"
 #include "desktop/scrollbar.h"
-#include "netsurf/misc.h"
 #include "desktop/gui_internal.h"
 
 #include "render/box.h"
diff --git a/render/box_textarea.c b/render/box_textarea.c
index 7f0765430..79ace8dea 100644
--- a/render/box_textarea.c
+++ b/render/box_textarea.c
@@ -22,9 +22,10 @@
 
 #include <dom/dom.h>
 
+#include "utils/config.h"
+#include "utils/log.h"
 #include "desktop/textarea.h"
 #include "desktop/textinput.h"
-#include "utils/log.h"
 
 #include "render/box_textarea.h"
 #include "render/font.h"
diff --git a/render/html.c b/render/html.c
index 7e2f27143..96251eabb 100644
--- a/render/html.c
+++ b/render/html.c
@@ -40,18 +40,17 @@
 #include "utils/utf8.h"
 #include "utils/nsoption.h"
 #include "utils/string.h"
-#include "content/content_protected.h"
-#include "content/fetch.h"
+#include "netsurf/content.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/utf8.h"
+#include "netsurf/layout.h"
+#include "netsurf/misc.h"
 #include "content/hlcache.h"
 #include "desktop/selection.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
 #include "netsurf/bitmap.h"
 #include "javascript/js.h"
-#include "netsurf/browser_window.h"
-#include "netsurf/utf8.h"
-#include "netsurf/layout.h"
-#include "netsurf/misc.h"
 #include "desktop/gui_internal.h"
 
 #include "render/box.h"
diff --git a/render/html.h b/render/html.h
index 5d2e45906..1052cb26e 100644
--- a/render/html.h
+++ b/render/html.h
@@ -30,7 +30,7 @@
 #include <dom/dom.h>
 #include <dom/bindings/hubbub/parser.h>
 
-#include "content/content_type.h"
+#include "netsurf/content_type.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
 #include "desktop/plot_style.h"
diff --git a/render/html_css.c b/render/html_css.c
index a3973bf87..ae0e8f696 100644
--- a/render/html_css.c
+++ b/render/html_css.c
@@ -27,13 +27,14 @@
 #include <strings.h>
 #include <stdlib.h>
 
-#include "content/hlcache.h"
-#include "content/handlers/css/css.h"
 #include "utils/nsoption.h"
 #include "utils/corestrings.h"
 #include "utils/config.h"
 #include "utils/log.h"
 #include "netsurf/misc.h"
+#include "netsurf/content.h"
+#include "content/hlcache.h"
+#include "content/handlers/css/css.h"
 #include "desktop/gui_internal.h"
 
 #include "render/html_internal.h"
diff --git a/render/html_forms.c b/render/html_forms.c
index 0d56e1c75..39bc690d9 100644
--- a/render/html_forms.c
+++ b/render/html_forms.c
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "utils/config.h"
 #include "utils/corestrings.h"
 #include "utils/log.h"
 
diff --git a/render/html_interaction.c b/render/html_interaction.c
index 3a548250a..f0b50f8d3 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -33,19 +33,19 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/log.h"
-#include "content/content.h"
-#include "content/hlcache.h"
+#include "utils/nsoption.h"
+#include "netsurf/content.h"
 #include "netsurf/browser_window.h"
-#include "desktop/frames.h"
 #include "netsurf/mouse.h"
-#include "utils/nsoption.h"
+#include "netsurf/misc.h"
+#include "netsurf/layout.h"
+#include "content/hlcache.h"
+#include "desktop/frames.h"
 #include "desktop/scrollbar.h"
 #include "desktop/selection.h"
 #include "desktop/textarea.h"
 #include "desktop/textinput.h"
 #include "javascript/js.h"
-#include "netsurf/misc.h"
-#include "netsurf/layout.h"
 #include "desktop/gui_internal.h"
 
 #include "render/box.h"
diff --git a/render/html_object.c b/render/html_object.c
index baa01e598..51c18e263 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -32,10 +32,11 @@
 #include "utils/config.h"
 #include "utils/log.h"
 #include "utils/nsoption.h"
+#include "netsurf/content.h"
+#include "netsurf/misc.h"
 #include "content/hlcache.h"
 #include "content/handlers/css/utils.h"
 #include "desktop/scrollbar.h"
-#include "netsurf/misc.h"
 #include "desktop/gui_internal.h"
 
 #include "render/box.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 01e7246c6..bc0f462b4 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -40,16 +40,17 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/nsoption.h"
-#include "content/content_protected.h"
-#include "content/handlers/css/utils.h"
+#include "netsurf/content.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/plotters.h"
+#include "netsurf/bitmap.h"
+#include "netsurf/layout.h"
+#include "content/content_protected.h"
+#include "content/handlers/css/utils.h"
 #include "desktop/selection.h"
 #include "desktop/print.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
-#include "netsurf/bitmap.h"
-#include "netsurf/layout.h"
 #include "desktop/gui_internal.h"
 
 #include "render/box.h"
diff --git a/render/html_script.c b/render/html_script.c
index fe3455d9f..37b0564d7 100644
--- a/render/html_script.c
+++ b/render/html_script.c
@@ -32,10 +32,12 @@
 #include "utils/corestrings.h"
 #include "utils/log.h"
 #include "utils/messages.h"
+#include "netsurf/content.h"
 #include "javascript/js.h"
 #include "content/content_protected.h"
 #include "content/fetch.h"
 #include "content/hlcache.h"
+
 #include "render/html_internal.h"
 
 typedef bool (script_handler_t)(struct jscontext *jscontext, const char *data, size_t size) ;
diff --git a/render/layout.c b/render/layout.c
index 48c8677d7..0cf829ad6 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -47,12 +47,13 @@
 #include "utils/talloc.h"
 #include "utils/utils.h"
 #include "utils/nsoption.h"
+#include "netsurf/content.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/layout.h"
 #include "content/content_protected.h"
 #include "content/handlers/css/utils.h"
-#include "netsurf/browser_window.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
-#include "netsurf/layout.h"
 
 #include "render/box.h"
 #include "render/font.h"
diff --git a/render/textplain.c b/render/textplain.c
index 80828e738..5f37d400d 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -37,6 +37,7 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/utf8.h"
+#include "netsurf/content.h"
 #include "content/content_protected.h"
 #include "content/hlcache.h"
 #include "content/handlers/css/utils.h"