17 files changed, 117 insertions, 117 deletions

diff --git a/render/box.c b/render/box.c
index 1fc637eb1..c6f263205 100644
--- a/render/box.c
+++ b/render/box.c
@@ -14,12 +14,12 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <string.h>
-#include "netsurf/content/content.h"
-#include "netsurf/css/css.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/form.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/talloc.h"
+#include "content/content.h"
+#include "css/css.h"
+#include "render/box.h"
+#include "render/form.h"
+#include "utils/log.h"
+#include "utils/talloc.h"
 
 
 static bool box_contains_point(struct box *box, int x, int y);
diff --git a/render/box.h b/render/box.h
index 76a3a24e8..84abe71ef 100644
--- a/render/box.h
+++ b/render/box.h
@@ -77,7 +77,7 @@
 
 #include <limits.h>
 #include <stdbool.h>
-#include "libxml/HTMLparser.h"
+#include <libxml/HTMLparser.h>
 
 
 struct box;
diff --git a/render/box_construct.c b/render/box_construct.c
index 9006e9ecc..d62ad92bb 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -20,25 +20,25 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include "libxml/HTMLparser.h"
-#include "libxml/parserInternals.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/css/css.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/form.h"
-#include "netsurf/render/html.h"
+#include <libxml/HTMLparser.h>
+#include <libxml/parserInternals.h>
+#include "utils/config.h"
+#include "content/content.h"
+#include "css/css.h"
+#include "desktop/browser.h"
+#include "desktop/options.h"
+#include "render/box.h"
+#include "render/form.h"
+#include "render/html.h"
 #ifdef riscos
-#include "netsurf/desktop/gui.h"
+#include "desktop/gui.h"
 #endif
 //#define NDEBUG
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/talloc.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/talloc.h"
+#include "utils/url.h"
+#include "utils/utils.h"
 
 
 static const content_type image_types[] = {
diff --git a/render/box_normalise.c b/render/box_normalise.c
index 6f1b92dca..76766f25f 100644
--- a/render/box_normalise.c
+++ b/render/box_normalise.c
@@ -14,15 +14,15 @@
 
 #include <assert.h>
 #include <stdbool.h>
-#include "netsurf/css/css.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/table.h"
+#include "css/css.h"
+#include "render/box.h"
+#include "render/table.h"
 #ifdef riscos
-#include "netsurf/desktop/gui.h"
+#include "desktop/gui.h"
 #endif
 #define NDEBUG
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/talloc.h"
+#include "utils/log.h"
+#include "utils/talloc.h"
 
 
 struct span_info {
diff --git a/render/directory.c b/render/directory.c
index e4b5b800d..48cb146d1 100644
--- a/render/directory.c
+++ b/render/directory.c
@@ -16,12 +16,12 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <time.h>
-#include "libxml/HTMLparser.h"
-#include "netsurf/content/content.h"
-#include "netsurf/render/directory.h"
-#include "netsurf/render/html.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
+#include <libxml/HTMLparser.h>
+#include "content/content.h"
+#include "render/directory.h"
+#include "render/html.h"
+#include "utils/messages.h"
+#include "utils/url.h"
 
 #define MAX_LENGTH 2048
 
diff --git a/render/directory.h b/render/directory.h
index 67fb5c1c0..a50fc5024 100644
--- a/render/directory.h
+++ b/render/directory.h
@@ -15,7 +15,7 @@
 #define _NETSURF_RENDER_DIRECTORY_H_
 
 #include <stdbool.h>
-#include "netsurf/content/content_type.h"
+#include "content/content_type.h"
 
 
 bool directory_create(struct content *c, const char *params[]);
diff --git a/render/form.c b/render/form.c
index 28b428eb7..4db45a4db 100644
--- a/render/form.c
+++ b/render/form.c
@@ -18,12 +18,12 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include "netsurf/render/box.h"
-#include "netsurf/render/form.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "render/box.h"
+#include "render/form.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
 
 
 static char *form_textarea_value(struct form_control *textarea);
diff --git a/render/form.h b/render/form.h
index edc7fb68f..7e8cee961 100644
--- a/render/form.h
+++ b/render/form.h
@@ -14,7 +14,7 @@
 #define _NETSURF_RENDER_FORM_H_
 
 #include <stdbool.h>
-#include "netsurf/utils/config.h"
+#include "utils/config.h"
 
 struct box;
 struct form_control;
diff --git a/render/html.c b/render/html.c
index 9fe76455a..88da92208 100644
--- a/render/html.c
+++ b/render/html.c
@@ -15,24 +15,24 @@
 #include <string.h>
 #include <strings.h>
 #include <stdlib.h>
-#include "libxml/parserInternals.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/content/fetchcache.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/font.h"
-#include "netsurf/render/html.h"
-#include "netsurf/render/imagemap.h"
-#include "netsurf/render/layout.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/talloc.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include <libxml/parserInternals.h>
+#include "utils/config.h"
+#include "content/content.h"
+#include "content/fetch.h"
+#include "content/fetchcache.h"
+#include "desktop/browser.h"
+#include "desktop/gui.h"
+#include "desktop/options.h"
+#include "render/box.h"
+#include "render/font.h"
+#include "render/html.h"
+#include "render/imagemap.h"
+#include "render/layout.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/talloc.h"
+#include "utils/url.h"
+#include "utils/utils.h"
 
 #define CHUNK 4096
 
diff --git a/render/html.h b/render/html.h
index a9fa574d1..ca5b6b983 100644
--- a/render/html.h
+++ b/render/html.h
@@ -15,9 +15,9 @@
 #define _NETSURF_RENDER_HTML_H_
 
 #include <stdbool.h>
-#include "libxml/HTMLparser.h"
-#include "netsurf/content/content_type.h"
-#include "netsurf/css/css.h"
+#include <libxml/HTMLparser.h>
+#include "content/content_type.h"
+#include "css/css.h"
 
 struct box;
 struct rect;
diff --git a/render/html_redraw.c b/render/html_redraw.c
index f3a1e6d18..61ae332dc 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -12,22 +12,22 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <string.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/css/css.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/desktop/knockout.h"
-#include "netsurf/desktop/selection.h"
-#include "netsurf/desktop/textinput.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/font.h"
-#include "netsurf/render/form.h"
-#include "netsurf/render/layout.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "utils/config.h"
+#include "content/content.h"
+#include "css/css.h"
+#include "desktop/gui.h"
+#include "desktop/plotters.h"
+#include "desktop/knockout.h"
+#include "desktop/selection.h"
+#include "desktop/textinput.h"
+#include "desktop/options.h"
+#include "render/box.h"
+#include "render/font.h"
+#include "render/form.h"
+#include "render/layout.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
 
 
 static bool html_redraw_box(struct box *box,
diff --git a/render/imagemap.c b/render/imagemap.c
index e004c01a8..898753eb1 100644
--- a/render/imagemap.c
+++ b/render/imagemap.c
@@ -10,11 +10,11 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <string.h>
-#include "netsurf/content/content.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/imagemap.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "content/content.h"
+#include "render/box.h"
+#include "render/imagemap.h"
+#include "utils/log.h"
+#include "utils/utils.h"
 
 #define HASH_SIZE 31 /* fixed size hash table */
 
diff --git a/render/imagemap.h b/render/imagemap.h
index 95d740023..ba8ce462d 100644
--- a/render/imagemap.h
+++ b/render/imagemap.h
@@ -8,7 +8,7 @@
 #ifndef _NETSURF_RENDER_IMAGEMAP_H_
 #define _NETSURF_RENDER_IMAGEMAP_H_
 
-#include "libxml/HTMLtree.h"
+#include <libxml/HTMLtree.h>
 
 struct content;
 
diff --git a/render/layout.c b/render/layout.c
index 2789a58c2..4dd68889f 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -27,19 +27,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "netsurf/css/css.h"
-#include "netsurf/content/content.h"
+#include "css/css.h"
+#include "content/content.h"
 #ifdef riscos
-#include "netsurf/desktop/gui.h"
+#include "desktop/gui.h"
 #endif
-#include "netsurf/desktop/options.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/font.h"
-#include "netsurf/render/layout.h"
+#include "desktop/options.h"
+#include "render/box.h"
+#include "render/font.h"
+#include "render/layout.h"
 #define NDEBUG
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/talloc.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/talloc.h"
+#include "utils/utils.h"
 
 
 #define AUTO INT_MIN
diff --git a/render/list.c b/render/list.c
index dd42e291c..b79c308c0 100644
--- a/render/list.c
+++ b/render/list.c
@@ -12,9 +12,9 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include "netsurf/css/css.h"
-#include "netsurf/render/list.h"
-#include "netsurf/utils/log.h"
+#include "css/css.h"
+#include "render/list.h"
+#include "utils/log.h"
 
 
 struct list_counter {
diff --git a/render/table.c b/render/table.c
index 1fba74565..86c738300 100644
--- a/render/table.c
+++ b/render/table.c
@@ -11,12 +11,12 @@
  */
 
 #include <assert.h>
-#include "netsurf/css/css.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/table.h"
+#include "css/css.h"
+#include "render/box.h"
+#include "render/table.h"
 #define NDEBUG
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/talloc.h"
+#include "utils/log.h"
+#include "utils/talloc.h"
 
 
 static void table_collapse_borders_h(struct box *parent, struct box *child,
diff --git a/render/textplain.c b/render/textplain.c
index cb9bc644f..5ce1b4eae 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -14,19 +14,19 @@
 #include <errno.h>
 #include <stddef.h>
 #include <iconv.h>
-#include "netsurf/content/content.h"
-#include "netsurf/css/css.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/desktop/selection.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/font.h"
-#include "netsurf/render/textplain.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/talloc.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/utils/utf8.h"
+#include "content/content.h"
+#include "css/css.h"
+#include "desktop/gui.h"
+#include "desktop/plotters.h"
+#include "desktop/selection.h"
+#include "render/box.h"
+#include "render/font.h"
+#include "render/textplain.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/talloc.h"
+#include "utils/utils.h"
+#include "utils/utf8.h"
 
 
 #define CHUNK 20480