summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2007-05-30 22:39:54 +0000
committerDaniel Silverstone <dsilvers@netsurf-browser.org>2007-05-30 22:39:54 +0000
commit6807b4208a27d9037229b16f31cc409d15a992f5 (patch)
tree1e62c423a96b7c92db82d6cc7dfc18c2177912a8
parent25e22eb1f5046fdf9ef1d470b86faf640375de08 (diff)
downloadnetsurf-6807b4208a27d9037229b16f31cc409d15a992f5.tar.gz
netsurf-6807b4208a27d9037229b16f31cc409d15a992f5.tar.bz2
Remove the netsurf/ from the include paths and rationalise use of <> vs "" in includes
NetSurf includes are now done with ""s and other system includes with <>s as C intended. The scandeps tool has been updated to only look for ""ed includes, and to verify that the files exist in the tree before adding them to the dependency lines. The depend rule has therefore been augmented to make sure the autogenerated files are built before it is run. This is untested under self-hosted RISC OS builds. All else tested and works. svn path=/trunk/netsurf/; revision=3307
-rw-r--r--content/content.c46
-rw-r--r--content/content.h28
-rw-r--r--content/content_type.h2
-rw-r--r--content/fetch.c20
-rw-r--r--content/fetch.h2
-rw-r--r--content/fetchcache.c18
-rw-r--r--content/fetchcache.h2
-rw-r--r--content/urldb.c20
-rw-r--r--content/urldb.h4
-rw-r--r--css/css.c24
-rw-r--r--css/css.h4
-rw-r--r--css/parser.y4
-rw-r--r--css/ruleset.c12
-rw-r--r--css/scanner.l4
-rw-r--r--debug/debug_bitmap.c2
-rw-r--r--debug/filetyped.c6
-rw-r--r--debug/fontd.c4
-rw-r--r--debug/netsurfd.c36
-rw-r--r--desktop/401login.h6
-rw-r--r--desktop/browser.c52
-rw-r--r--desktop/browser.h2
-rw-r--r--desktop/frames.c18
-rw-r--r--desktop/frames.h4
-rw-r--r--desktop/gesture_core.c4
-rw-r--r--desktop/gui.h6
-rw-r--r--desktop/history_core.c22
-rw-r--r--desktop/knockout.c8
-rw-r--r--desktop/knockout.h2
-rw-r--r--desktop/netsurf.c24
-rw-r--r--desktop/options.c22
-rw-r--r--desktop/plotters.h2
-rw-r--r--desktop/save_text.c12
-rw-r--r--desktop/selection.c18
-rw-r--r--desktop/selection.h4
-rw-r--r--desktop/textinput.c24
-rw-r--r--desktop/tree.c12
-rw-r--r--gtk/font_pango.c14
-rw-r--r--gtk/gtk_bitmap.c10
-rw-r--r--gtk/gtk_bitmap.h2
-rw-r--r--gtk/gtk_completion.c8
-rw-r--r--gtk/gtk_filetype.c8
-rw-r--r--gtk/gtk_gui.c48
-rw-r--r--gtk/gtk_history.c10
-rw-r--r--gtk/gtk_login.c20
-rw-r--r--gtk/gtk_options.c14
-rw-r--r--gtk/gtk_plotters.c18
-rw-r--r--gtk/gtk_scaffolding.c50
-rw-r--r--gtk/gtk_scaffolding.h4
-rw-r--r--gtk/gtk_schedule.c2
-rw-r--r--gtk/gtk_throbber.c8
-rw-r--r--gtk/gtk_thumbnail.c20
-rw-r--r--gtk/gtk_treeview.c2
-rw-r--r--gtk/gtk_window.c18
-rw-r--r--gtk/gtk_window.h4
-rw-r--r--gtk/options.h2
-rw-r--r--image/bmp.c18
-rw-r--r--image/bmp.h2
-rw-r--r--image/bmpread.c6
-rw-r--r--image/bmpread.h2
-rw-r--r--image/gif.c22
-rw-r--r--image/gif.h2
-rw-r--r--image/gifread.c4
-rw-r--r--image/gifread.h2
-rw-r--r--image/ico.c18
-rw-r--r--image/ico.h2
-rw-r--r--image/jpeg.c16
-rw-r--r--image/mng.c22
-rw-r--r--image/mng.h2
-rw-r--r--makefile12
-rw-r--r--posix.mk2
-rw-r--r--render/box.c12
-rw-r--r--render/box.h2
-rw-r--r--render/box_construct.c32
-rw-r--r--render/box_normalise.c12
-rw-r--r--render/directory.c12
-rw-r--r--render/directory.h2
-rw-r--r--render/form.c12
-rw-r--r--render/form.h2
-rw-r--r--render/html.c36
-rw-r--r--render/html.h6
-rw-r--r--render/html_redraw.c32
-rw-r--r--render/imagemap.c10
-rw-r--r--render/imagemap.h2
-rw-r--r--render/layout.c20
-rw-r--r--render/list.c6
-rw-r--r--render/table.c10
-rw-r--r--render/textplain.c26
-rw-r--r--riscos.mk4
-rw-r--r--riscos/401login.c24
-rw-r--r--riscos/artworks.c16
-rw-r--r--riscos/bitmap.c24
-rw-r--r--riscos/bitmap.h4
-rw-r--r--riscos/buffer.c14
-rw-r--r--riscos/configure.c16
-rw-r--r--riscos/configure/con_cache.c22
-rw-r--r--riscos/configure/con_connect.c22
-rw-r--r--riscos/configure/con_content.c20
-rw-r--r--riscos/configure/con_fonts.c24
-rw-r--r--riscos/configure/con_home.c22
-rw-r--r--riscos/configure/con_image.c22
-rw-r--r--riscos/configure/con_inter.c14
-rw-r--r--riscos/configure/con_language.c24
-rw-r--r--riscos/configure/con_memory.c14
-rw-r--r--riscos/configure/con_secure.c20
-rw-r--r--riscos/configure/con_theme.c28
-rw-r--r--riscos/cookies.c30
-rw-r--r--riscos/debugwin.c12
-rw-r--r--riscos/dialog.c40
-rw-r--r--riscos/dialog.h4
-rw-r--r--riscos/download.c28
-rw-r--r--riscos/draw.c16
-rw-r--r--riscos/filetype.c12
-rw-r--r--riscos/font.c14
-rw-r--r--riscos/global_history.c30
-rw-r--r--riscos/gui.c76
-rw-r--r--riscos/gui.h6
-rw-r--r--riscos/gui/progress_bar.c16
-rw-r--r--riscos/gui/progress_bar.h2
-rw-r--r--riscos/gui/status_bar.c16
-rw-r--r--riscos/help.c24
-rw-r--r--riscos/history.c20
-rw-r--r--riscos/hotlist.c28
-rw-r--r--riscos/image.c16
-rw-r--r--riscos/image.h2
-rw-r--r--riscos/menus.c50
-rw-r--r--riscos/menus.h2
-rw-r--r--riscos/message.c6
-rw-r--r--riscos/options.h4
-rw-r--r--riscos/palettes.c2
-rw-r--r--riscos/plotters.c12
-rw-r--r--riscos/plugin.c32
-rw-r--r--riscos/plugin.h4
-rw-r--r--riscos/print.c30
-rw-r--r--riscos/query.c16
-rw-r--r--riscos/query.h2
-rw-r--r--riscos/save.c44
-rw-r--r--riscos/save.h2
-rw-r--r--riscos/save_complete.c24
-rw-r--r--riscos/save_draw.c14
-rw-r--r--riscos/schedule.c4
-rw-r--r--riscos/search.c28
-rw-r--r--riscos/sprite.c20
-rw-r--r--riscos/sprite.h2
-rw-r--r--riscos/sslcert.c28
-rw-r--r--riscos/textarea.c14
-rw-r--r--riscos/textselection.c22
-rw-r--r--riscos/textselection.h2
-rw-r--r--riscos/theme.c24
-rw-r--r--riscos/theme_install.c24
-rw-r--r--riscos/thumbnail.c24
-rw-r--r--riscos/thumbnail.h4
-rw-r--r--riscos/treeview.c38
-rw-r--r--riscos/treeview.h6
-rw-r--r--riscos/ucstables.c8
-rw-r--r--riscos/uri.c18
-rw-r--r--riscos/url_complete.c20
-rw-r--r--riscos/url_protocol.c18
-rw-r--r--riscos/wimp.c14
-rw-r--r--riscos/wimp_event.c16
-rw-r--r--riscos/window.c68
-rwxr-xr-xscandeps9
-rw-r--r--utils/container.c4
-rw-r--r--utils/filename.c8
-rw-r--r--utils/hashtable.c4
-rw-r--r--utils/log.h2
-rw-r--r--utils/messages.c8
-rw-r--r--utils/messages.h2
-rw-r--r--utils/themes.c2
-rw-r--r--utils/themes.h2
-rwxr-xr-xutils/tt2code2
-rw-r--r--utils/url.c6
-rw-r--r--utils/utf8.c4
-rw-r--r--utils/utils.c10
173 files changed, 1269 insertions, 1274 deletions
diff --git a/content/content.c b/content/content.c
index dd2f3b103..53c72d81c 100644
--- a/content/content.c
+++ b/content/content.c
@@ -20,45 +20,45 @@
#include <string.h>
#include <strings.h>
#include <time.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/content/fetchcache.h"
-#include "netsurf/css/css.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/render/directory.h"
-#include "netsurf/render/html.h"
-#include "netsurf/render/textplain.h"
+#include "utils/config.h"
+#include "content/content.h"
+#include "content/fetch.h"
+#include "content/fetchcache.h"
+#include "css/css.h"
+#include "image/bitmap.h"
+#include "desktop/options.h"
+#include "render/directory.h"
+#include "render/html.h"
+#include "render/textplain.h"
#ifdef WITH_JPEG
-#include "netsurf/image/jpeg.h"
+#include "image/jpeg.h"
#endif
#ifdef WITH_MNG
-#include "netsurf/image/mng.h"
+#include "image/mng.h"
#endif
#ifdef WITH_GIF
-#include "netsurf/image/gif.h"
+#include "image/gif.h"
#endif
#ifdef WITH_BMP
-#include "netsurf/image/bmp.h"
-#include "netsurf/image/ico.h"
+#include "image/bmp.h"
+#include "image/ico.h"
#endif
#ifdef WITH_SPRITE
-#include "netsurf/riscos/sprite.h"
+#include "riscos/sprite.h"
#endif
#ifdef WITH_DRAW
-#include "netsurf/riscos/draw.h"
+#include "riscos/draw.h"
#endif
#ifdef WITH_PLUGIN
-#include "netsurf/riscos/plugin.h"
+#include "riscos/plugin.h"
#endif
#ifdef WITH_ARTWORKS
-#include "netsurf/riscos/artworks.h"
+#include "riscos/artworks.h"
#endif
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/talloc.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/talloc.h"
+#include "utils/utils.h"
/** Linked list of all content structures. May include more than one content
diff --git a/content/content.h b/content/content.h
index 0eb7c3e4c..8c6235342 100644
--- a/content/content.h
+++ b/content/content.h
@@ -16,35 +16,35 @@
#define _NETSURF_DESKTOP_CONTENT_H_
#include <stdint.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content_type.h"
-#include "netsurf/css/css.h"
-#include "netsurf/render/html.h"
-#include "netsurf/render/textplain.h"
+#include "utils/config.h"
+#include "content/content_type.h"
+#include "css/css.h"
+#include "render/html.h"
+#include "render/textplain.h"
#ifdef WITH_JPEG
-#include "netsurf/image/jpeg.h"
+#include "image/jpeg.h"
#endif
#ifdef WITH_GIF
-#include "netsurf/image/gif.h"
+#include "image/gif.h"
#endif
#ifdef WITH_BMP
-#include "netsurf/image/bmp.h"
-#include "netsurf/image/ico.h"
+#include "image/bmp.h"
+#include "image/ico.h"
#endif
#ifdef WITH_PLUGIN
-#include "netsurf/riscos/plugin.h"
+#include "riscos/plugin.h"
#endif
#ifdef WITH_MNG
-#include "netsurf/image/mng.h"
+#include "image/mng.h"
#endif
#ifdef WITH_SPRITE
-#include "netsurf/riscos/sprite.h"
+#include "riscos/sprite.h"
#endif
#ifdef WITH_DRAW
-#include "netsurf/riscos/draw.h"
+#include "riscos/draw.h"
#endif
#ifdef WITH_ARTWORKS
-#include "netsurf/riscos/artworks.h"
+#include "riscos/artworks.h"
#endif
diff --git a/content/content_type.h b/content/content_type.h
index dc6483f3f..b86254a52 100644
--- a/content/content_type.h
+++ b/content/content_type.h
@@ -14,7 +14,7 @@
#ifndef _NETSURF_DESKTOP_CONTENT_TYPE_H_
#define _NETSURF_DESKTOP_CONTENT_TYPE_H_
-#include "netsurf/utils/config.h"
+#include "utils/config.h"
/** The type of a content. */
diff --git a/content/fetch.c b/content/fetch.c
index ed2c63670..0462e5900 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -32,20 +32,20 @@
#include <unixlib/local.h>
#endif
#include <curl/curl.h>
-#include "netsurf/utils/config.h"
+#include "utils/config.h"
#ifdef WITH_SSL
#include <openssl/ssl.h>
#endif
-#include "netsurf/content/fetch.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/netsurf.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/render/form.h"
+#include "content/fetch.h"
+#include "content/urldb.h"
+#include "desktop/netsurf.h"
+#include "desktop/options.h"
+#include "render/form.h"
#undef NDEBUG
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utils.h"
bool fetch_active; /**< Fetches in progress, please call fetch_poll(). */
diff --git a/content/fetch.h b/content/fetch.h
index 4bf55503c..bf4446830 100644
--- a/content/fetch.h
+++ b/content/fetch.h
@@ -15,7 +15,7 @@
#include <stdbool.h>
#include <sys/select.h>
#include <curl/curl.h>
-#include "netsurf/utils/config.h"
+#include "utils/config.h"
typedef enum {
FETCH_TYPE,
diff --git a/content/fetchcache.c b/content/fetchcache.c
index 62d81fe15..080329f6b 100644
--- a/content/fetchcache.c
+++ b/content/fetchcache.c
@@ -20,15 +20,15 @@
#include <sys/types.h>
#include <regex.h>
#include <time.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/fetchcache.h"
-#include "netsurf/content/fetch.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 "utils/config.h"
+#include "content/content.h"
+#include "content/fetchcache.h"
+#include "content/fetch.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/talloc.h"
+#include "utils/url.h"
+#include "utils/utils.h"
static char error_page[1000];
diff --git a/content/fetchcache.h b/content/fetchcache.h
index bb57fba01..48d617918 100644
--- a/content/fetchcache.h
+++ b/content/fetchcache.h
@@ -17,7 +17,7 @@
#include <stdbool.h>
#include <stdint.h>
-#include "netsurf/content/content.h"
+#include "content/content.h"
struct form_successful_control;
diff --git a/content/urldb.c b/content/urldb.c
index e84a7f48c..b5d252b7b 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -82,19 +82,19 @@
#include <sys/select.h>
#include <curl/curl.h>
-#include "netsurf/image/bitmap.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/cookies.h"
-#include "netsurf/desktop/options.h"
+#include "image/bitmap.h"
+#include "content/content.h"
+#include "content/urldb.h"
+#include "desktop/cookies.h"
+#include "desktop/options.h"
#ifdef riscos
/** \todo lose this */
-#include "netsurf/riscos/bitmap.h"
+#include "riscos/bitmap.h"
#endif
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/filename.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/filename.h"
+#include "utils/url.h"
+#include "utils/utils.h"
struct cookie_internal_data {
char *name; /**< Cookie name */
diff --git a/content/urldb.h b/content/urldb.h
index adf13c11b..a22e43e3a 100644
--- a/content/urldb.h
+++ b/content/urldb.h
@@ -14,8 +14,8 @@
#include <stdbool.h>
#include <time.h>
-#include "netsurf/content/content.h"
-#include "netsurf/content/content_type.h"
+#include "content/content.h"
+#include "content/content_type.h"
typedef enum {
COOKIE_NETSCAPE = 0,
diff --git a/css/css.c b/css/css.c
index c3373f8d9..a63b8ad91 100644
--- a/css/css.c
+++ b/css/css.c
@@ -80,20 +80,20 @@
#include <strings.h>
#define CSS_INTERNALS
#undef NDEBUG
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/content/fetchcache.h"
-#include "netsurf/css/css.h"
-#include "netsurf/css/parser.h"
+#include "utils/config.h"
+#include "content/content.h"
+#include "content/fetch.h"
+#include "content/fetchcache.h"
+#include "css/css.h"
+#include "css/parser.h"
#ifdef riscos
-#include "netsurf/desktop/gui.h"
+#include "desktop/gui.h"
#endif
-#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"
struct css_working_stylesheet {
diff --git a/css/css.h b/css/css.h
index 086f469b9..ec6970958 100644
--- a/css/css.h
+++ b/css/css.h
@@ -25,8 +25,8 @@
#define _NETSURF_CSS_CSS_H_
#include <stdbool.h>
-#include "libxml/HTMLparser.h"
-#include "netsurf/css/css_enum.h"
+#include <libxml/HTMLparser.h>
+#include "css/css_enum.h"
typedef unsigned long colour; /* 0xbbggrr */
diff --git a/css/parser.y b/css/parser.y
index 49bf932fc..02d11a06d 100644
--- a/css/parser.y
+++ b/css/parser.y
@@ -400,8 +400,8 @@ any(A) ::= ASTERISK(B).
%include {
#include <strings.h>
#define CSS_INTERNALS
-#include "netsurf/css/css.h"
-#include "netsurf/utils/utils.h" }
+#include "css/css.h"
+#include "utils/utils.h" }
%name css_parser_
%token_type { struct css_parser_token }
diff --git a/css/ruleset.c b/css/ruleset.c
index 1a065cbc1..c45147594 100644
--- a/css/ruleset.c
+++ b/css/ruleset.c
@@ -26,12 +26,12 @@
#include <strings.h>
#define CSS_INTERNALS
#define NDEBUG
-#include "netsurf/css/css.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "css/css.h"
+#include "content/content.h"
+#include "desktop/options.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utils.h"
diff --git a/css/scanner.l b/css/scanner.l
index 6a5549a19..caac2c352 100644
--- a/css/scanner.l
+++ b/css/scanner.l
@@ -16,8 +16,8 @@
#include <stdbool.h>
#define CSS_INTERNALS
-#include "netsurf/css/css.h"
-#include "netsurf/css/parser.h"
+#include "css/css.h"
+#include "css/parser.h"
#define YYCTYPE unsigned char
#define YYCURSOR (*buffer)
diff --git a/debug/debug_bitmap.c b/debug/debug_bitmap.c
index e3b56922a..54ab79a9a 100644
--- a/debug/debug_bitmap.c
+++ b/debug/debug_bitmap.c
@@ -15,7 +15,7 @@
#include <assert.h>
#include <stdbool.h>
#include <stdlib.h>
-#include "netsurf/image/bitmap.h"
+#include "image/bitmap.h"
struct bitmap {
diff --git a/debug/filetyped.c b/debug/filetyped.c
index 950b626c5..c2798b3b1 100644
--- a/debug/filetyped.c
+++ b/debug/filetyped.c
@@ -7,9 +7,9 @@
#include <stdlib.h>
#include <string.h>
-#include "netsurf/content/fetch.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "content/fetch.h"
+#include "utils/log.h"
+#include "utils/utils.h"
/**
* filetype -- determine the MIME type of a local file
diff --git a/debug/fontd.c b/debug/fontd.c
index 82115fa13..f2c0c4b53 100644
--- a/debug/fontd.c
+++ b/debug/fontd.c
@@ -6,8 +6,8 @@
*/
#include <assert.h>
-#include "netsurf/css/css.h"
-#include "netsurf/render/font.h"
+#include "css/css.h"
+#include "render/font.h"
bool nsfont_width(const struct css_style *style,
diff --git a/debug/netsurfd.c b/debug/netsurfd.c
index c5883c1ac..847b2e24d 100644
--- a/debug/netsurfd.c
+++ b/debug/netsurfd.c
@@ -9,24 +9,24 @@
#include <stdbool.h>
#include <string.h>
#include <time.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/fetchcache.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/cookies.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/desktop/selection.h"
-#include "netsurf/desktop/textinput.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/render/box.h"
-#include "netsurf/riscos/save_complete.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/config.h"
+#include "content/fetch.h"
+#include "content/content.h"
+#include "content/fetchcache.h"
+#include "content/urldb.h"
+#include "desktop/cookies.h"
+#include "desktop/gui.h"
+#include "desktop/options.h"
+#include "desktop/selection.h"
+#include "desktop/textinput.h"
+#include "desktop/tree.h"
+#include "image/bitmap.h"
+#include "render/box.h"
+#include "riscos/save_complete.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utils.h"
int done, destroyed;
bool print_active = false;
diff --git a/desktop/401login.h b/desktop/401login.h
index e88c7638f..aaa32498e 100644
--- a/desktop/401login.h
+++ b/desktop/401login.h
@@ -8,9 +8,9 @@
#ifndef NETSURF_DESKTOP_401LOGIN_H
#define NETSURF_DESKTOP_401LOGIN_H
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/browser.h"
+#include "utils/config.h"
+#include "content/content.h"
+#include "desktop/browser.h"
#ifdef WITH_AUTH
diff --git a/desktop/browser.c b/desktop/browser.c
index dbbe30251..ca1885cbb 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -22,34 +22,34 @@
#include <string.h>
#include <sys/select.h>
#include "curl/curl.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/content/fetchcache.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/css/css.h"
+#include "utils/config.h"
+#include "content/fetch.h"
+#include "content/fetchcache.h"
+#include "content/urldb.h"
+#include "css/css.h"
#ifdef WITH_AUTH
-#include "netsurf/desktop/401login.h"
+#include "desktop/401login.h"
#endif
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/frames.h"
-#include "netsurf/desktop/history_core.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/desktop/selection.h"
-#include "netsurf/desktop/textinput.h"
-#include "netsurf/desktop/gesture_core.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/form.h"
-#include "netsurf/render/font.h"
-#include "netsurf/render/imagemap.h"
-#include "netsurf/render/layout.h"
-#include "netsurf/render/textplain.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 "netsurf/utils/utf8.h"
+#include "desktop/browser.h"
+#include "desktop/frames.h"
+#include "desktop/history_core.h"
+#include "desktop/gui.h"
+#include "desktop/options.h"
+#include "desktop/selection.h"
+#include "desktop/textinput.h"
+#include "desktop/gesture_core.h"
+#include "render/box.h"
+#include "render/form.h"
+#include "render/font.h"
+#include "render/imagemap.h"
+#include "render/layout.h"
+#include "render/textplain.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/talloc.h"
+#include "utils/url.h"
+#include "utils/utils.h"
+#include "utils/utf8.h"
/** browser window which is being redrawn. Valid only during redraw. */
struct browser_window *current_redraw_browser;
diff --git a/desktop/browser.h b/desktop/browser.h
index 090055999..676921dc3 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -16,7 +16,7 @@
#include <stdbool.h>
#include <stddef.h>
#include <time.h>
-#include "netsurf/render/html.h"
+#include "render/html.h"
struct box;
struct content;
diff --git a/desktop/frames.c b/desktop/frames.c
index bfc644ffe..b08bdde97 100644
--- a/desktop/frames.c
+++ b/desktop/frames.c
@@ -17,15 +17,15 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/frames.h"
-#include "netsurf/desktop/history_core.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/selection.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "utils/config.h"
+#include "desktop/browser.h"
+#include "desktop/frames.h"
+#include "desktop/history_core.h"
+#include "desktop/gui.h"
+#include "desktop/selection.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
/** maximum frame resize margin */
#define FRAME_RESIZE 6
diff --git a/desktop/frames.h b/desktop/frames.h
index d3acccd2a..ef7aeb4a2 100644
--- a/desktop/frames.h
+++ b/desktop/frames.h
@@ -12,8 +12,8 @@
#ifndef _NETSURF_DESKTOP_FRAMES_H_
#define _NETSURF_DESKTOP_FRAMES_H_
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/gui.h"
+#include "desktop/browser.h"
+#include "desktop/gui.h"
void browser_window_create_iframes(struct browser_window *bw,
diff --git a/desktop/gesture_core.c b/desktop/gesture_core.c
index 40d4295af..6ee3a05db 100644
--- a/desktop/gesture_core.c
+++ b/desktop/gesture_core.c
@@ -9,8 +9,8 @@
* Mouse gesture core (implementation)
*/
-#include "netsurf/utils/log.h"
-#include "netsurf/desktop/gesture_core.h"
+#include "utils/log.h"
+#include "desktop/gesture_core.h"
#include <string.h>
#include <math.h>
#include <stdlib.h>
diff --git a/desktop/gui.h b/desktop/gui.h
index 25cac55ca..a38a6f6a5 100644
--- a/desktop/gui.h
+++ b/desktop/gui.h
@@ -41,9 +41,9 @@ typedef enum { GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET,
GUI_POINTER_PROGRESS } gui_pointer_shape;
#include <stdbool.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/browser.h"
+#include "utils/config.h"
+#include "content/content.h"
+#include "desktop/browser.h"
extern struct gui_window *search_current_window;
diff --git a/desktop/history_core.c b/desktop/history_core.c
index 8ebd0bf90..62fc8096c 100644
--- a/desktop/history_core.c
+++ b/desktop/history_core.c
@@ -15,17 +15,17 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include "netsurf/content/content.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/css/css.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/history_core.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/render/font.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "content/content.h"
+#include "content/urldb.h"
+#include "css/css.h"
+#include "desktop/gui.h"
+#include "desktop/history_core.h"
+#include "desktop/plotters.h"
+#include "image/bitmap.h"
+#include "render/font.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utils.h"
#define WIDTH 100
diff --git a/desktop/knockout.c b/desktop/knockout.c
index e2333d1ad..2013ef65b 100644
--- a/desktop/knockout.c
+++ b/desktop/knockout.c
@@ -13,10 +13,10 @@
#include <assert.h>
#include <string.h>
-#include "netsurf/desktop/knockout.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/utils/log.h"
+#include "desktop/knockout.h"
+#include "desktop/plotters.h"
+#include "image/bitmap.h"
+#include "utils/log.h"
#define KNOCKOUT_ENTRIES 3072 /* 40 bytes each */
#define KNOCKOUT_BOXES 768 /* 28 bytes each */
diff --git a/desktop/knockout.h b/desktop/knockout.h
index 29718f9b5..8305f416b 100644
--- a/desktop/knockout.h
+++ b/desktop/knockout.h
@@ -9,7 +9,7 @@
* Knockout rendering (interface).
*/
-#include "netsurf/desktop/plotters.h"
+#include "desktop/plotters.h"
bool knockout_plot_start(struct plotter_table *plotter);
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 89d57341b..948e29e06 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -15,20 +15,20 @@
#include <libxml/encoding.h>
#include <libxml/globals.h>
#include <libxml/xmlversion.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/content/fetchcache.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/netsurf.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/gui.h"
+#include "utils/config.h"
+#include "content/fetch.h"
+#include "content/fetchcache.h"
+#include "content/urldb.h"
+#include "desktop/netsurf.h"
+#include "desktop/browser.h"
+#include "desktop/gui.h"
#ifdef riscos
-#include "netsurf/riscos/buffer.h"
+#include "riscos/buffer.h"
#endif
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
bool netsurf_quit = false;
bool verbose_log = false;
diff --git a/desktop/options.c b/desktop/options.c
index 3875a1d73..659c5b78a 100644
--- a/desktop/options.c
+++ b/desktop/options.c
@@ -19,20 +19,20 @@
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
-#include "libxml/HTMLparser.h"
-#include "libxml/HTMLtree.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/css/css.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include <libxml/HTMLparser.h>
+#include <libxml/HTMLtree.h>
+#include "content/urldb.h"
+#include "css/css.h"
+#include "desktop/options.h"
+#include "desktop/tree.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#if defined(riscos)
-#include "netsurf/riscos/options.h"
+#include "riscos/options.h"
#elif defined(nsgtk)
-#include "netsurf/gtk/options.h"
+#include "gtk/options.h"
#else
#define EXTRA_OPTION_DEFINE
#define EXTRA_OPTION_TABLE
diff --git a/desktop/plotters.h b/desktop/plotters.h
index 57b9dc9c7..e543aa4ca 100644
--- a/desktop/plotters.h
+++ b/desktop/plotters.h
@@ -13,7 +13,7 @@
#define _NETSURF_DESKTOP_PLOTTERS_H_
#include <stdbool.h>
-#include "netsurf/css/css.h"
+#include "css/css.h"
struct bitmap;
diff --git a/desktop/save_text.c b/desktop/save_text.c
index 78d04a2a0..c3dc799f4 100644
--- a/desktop/save_text.c
+++ b/desktop/save_text.c
@@ -8,13 +8,13 @@
#include <stdbool.h>
#include <string.h>
-#include "libxml/HTMLtree.h"
+#include <libxml/HTMLtree.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/save_text.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "utils/config.h"
+#include "content/content.h"
+#include "desktop/save_text.h"
+#include "utils/log.h"
+#include "utils/utils.h"
#ifdef WITH_TEXT_EXPORT
diff --git a/desktop/selection.c b/desktop/selection.c
index c6578ec9f..8e7d282ae 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -14,15 +14,15 @@
#include <stdlib.h>
#include <stdbool.h>
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/desktop/selection.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/form.h"
-#include "netsurf/render/textplain.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/gui.h"
+#include "desktop/plotters.h"
+#include "desktop/selection.h"
+#include "render/box.h"
+#include "render/form.h"
+#include "render/textplain.h"
+#include "utils/log.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
/**
diff --git a/desktop/selection.h b/desktop/selection.h
index 779740439..1753775dc 100644
--- a/desktop/selection.h
+++ b/desktop/selection.h
@@ -12,8 +12,8 @@
#ifndef _NETSURF_DESKTOP_SELECTION_H_
#define _NETSURF_DESKTOP_SELECTION_H_
-#include "netsurf/desktop/browser.h"
-#include "netsurf/render/box.h"
+#include "desktop/browser.h"
+#include "render/box.h"
typedef enum {
diff --git a/desktop/textinput.c b/desktop/textinput.c
index 9df89c66c..bd67836e3 100644
--- a/desktop/textinput.c
+++ b/desktop/textinput.c
@@ -17,19 +17,19 @@
#include <ctype.h>
#include <string.h>
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/selection.h"
-#include "netsurf/desktop/textinput.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/font.h"
-#include "netsurf/render/form.h"
-#include "netsurf/render/layout.h"
+#include "desktop/browser.h"
+#include "desktop/gui.h"
+#include "desktop/selection.h"
+#include "desktop/textinput.h"
+#include "render/box.h"
+#include "render/font.h"
+#include "render/form.h"
+#include "render/layout.h"
#define NDEBUG
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/talloc.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/talloc.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
/** ghost caret used to indicate the insertion point when dragging text
diff --git a/desktop/tree.c b/desktop/tree.c
index 5af782878..1ffbcfd6e 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -14,12 +14,12 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "content/urldb.h"
+#include "desktop/tree.h"
+#include "desktop/options.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
static void tree_draw_node(struct tree *tree, struct node *node, int clip_x,
int clip_y, int clip_width, int clip_height);
diff --git a/gtk/font_pango.c b/gtk/font_pango.c
index a100745d7..b03bfd79a 100644
--- a/gtk/font_pango.c
+++ b/gtk/font_pango.c
@@ -15,13 +15,13 @@
#include <assert.h>
#include <stdio.h>
#include <gtk/gtk.h>
-#include "netsurf/css/css.h"
-#include "netsurf/gtk/font_pango.h"
-#include "netsurf/gtk/gtk_plotters.h"
-#include "netsurf/render/font.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/desktop/options.h"
+#include "css/css.h"
+#include "gtk/font_pango.h"
+#include "gtk/gtk_plotters.h"
+#include "render/font.h"
+#include "utils/utils.h"
+#include "utils/log.h"
+#include "desktop/options.h"
/* Until we can consider the descenders etc, we need to not render using cairo */
#undef CAIRO_VERSION
diff --git a/gtk/gtk_bitmap.c b/gtk/gtk_bitmap.c
index dda8b7659..67a3db332 100644
--- a/gtk/gtk_bitmap.c
+++ b/gtk/gtk_bitmap.c
@@ -16,11 +16,11 @@
#include <string.h>
#include <gdk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "netsurf/content/content.h"
-#include "netsurf/gtk/gtk_bitmap.h"
-#include "netsurf/gtk/gtk_scaffolding.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/utils/log.h"
+#include "content/content.h"
+#include "gtk/gtk_bitmap.h"
+#include "gtk/gtk_scaffolding.h"
+#include "image/bitmap.h"
+#include "utils/log.h"
struct bitmap {
diff --git a/gtk/gtk_bitmap.h b/gtk/gtk_bitmap.h
index 61a800b5d..edbeb75fb 100644
--- a/gtk/gtk_bitmap.h
+++ b/gtk/gtk_bitmap.h
@@ -10,7 +10,7 @@
#include <gdk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "netsurf/image/bitmap.h"
+#include "image/bitmap.h"
GdkPixbuf *gtk_bitmap_get_primary(struct bitmap*);
GdkPixbuf *gtk_bitmap_get_pretile_x(struct bitmap*);
diff --git a/gtk/gtk_completion.c b/gtk/gtk_completion.c
index dd6aa086f..4dbe41eca 100644
--- a/gtk/gtk_completion.c
+++ b/gtk/gtk_completion.c
@@ -6,10 +6,10 @@
*/
#include <gtk/gtk.h>
-#include "netsurf/gtk/gtk_completion.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/desktop/options.h"
+#include "gtk/gtk_completion.h"
+#include "content/urldb.h"
+#include "utils/log.h"
+#include "desktop/options.h"
GtkListStore *nsgtk_completion_list;
diff --git a/gtk/gtk_filetype.c b/gtk/gtk_filetype.c
index 667129e05..f34aa0bcd 100644
--- a/gtk/gtk_filetype.c
+++ b/gtk/gtk_filetype.c
@@ -15,10 +15,10 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "netsurf/gtk/gtk_filetype.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/hashtable.h"
+#include "gtk/gtk_filetype.h"
+#include "content/fetch.h"
+#include "utils/log.h"
+#include "utils/hashtable.h"
static struct hash_table *mime_hash = NULL;
diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c
index a2c98b9c5..1aef14472 100644
--- a/gtk/gtk_gui.c
+++ b/gtk/gtk_gui.c
@@ -20,30 +20,30 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
-#include "netsurf/content/content.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/401login.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/cookies.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/netsurf.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/gtk/gtk_gui.h"
-#include "netsurf/gtk/gtk_options.h"
-#include "netsurf/gtk/gtk_completion.h"
-#include "netsurf/gtk/options.h"
-#include "netsurf/gtk/gtk_throbber.h"
-#include "netsurf/gtk/gtk_history.h"
-#include "netsurf/gtk/gtk_filetype.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/form.h"
-#include "netsurf/render/html.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "content/content.h"
+#include "content/fetch.h"
+#include "content/urldb.h"
+#include "desktop/401login.h"
+#include "desktop/browser.h"
+#include "desktop/cookies.h"
+#include "desktop/gui.h"
+#include "desktop/netsurf.h"
+#include "desktop/options.h"
+#include "gtk/gtk_gui.h"
+#include "gtk/gtk_options.h"
+#include "gtk/gtk_completion.h"
+#include "gtk/options.h"
+#include "gtk/gtk_throbber.h"
+#include "gtk/gtk_history.h"
+#include "gtk/gtk_filetype.h"
+#include "render/box.h"
+#include "render/form.h"
+#include "render/html.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
/* Where to search for shared resources. Must have trailing / */
#define RESPATH "/usr/share/netsurf/"
diff --git a/gtk/gtk_history.c b/gtk/gtk_history.c
index a7b75ef1f..72f41538a 100644
--- a/gtk/gtk_history.c
+++ b/gtk/gtk_history.c
@@ -7,11 +7,11 @@
#include <gtk/gtk.h>
#include <glade/glade.h>
-#include "netsurf/utils/log.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/gtk/gtk_history.h"
-#include "netsurf/gtk/gtk_gui.h"
-#include "netsurf/gtk/gtk_window.h"
+#include "utils/log.h"
+#include "content/urldb.h"
+#include "gtk/gtk_history.h"
+#include "gtk/gtk_gui.h"
+#include "gtk/gtk_window.h"
enum
{
diff --git a/gtk/gtk_login.c b/gtk/gtk_login.c
index 176fc1339..c3b558d55 100644
--- a/gtk/gtk_login.c
+++ b/gtk/gtk_login.c
@@ -11,16 +11,16 @@
#include <assert.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
-#include "netsurf/utils/log.h"
-#include "netsurf/gtk/gtk_gui.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/401login.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "gtk/gtk_gui.h"
+#include "content/content.h"
+#include "content/urldb.h"
+#include "desktop/browser.h"
+#include "desktop/401login.h"
+#include "desktop/gui.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utils.h"
struct session_401 {
char *url; /**< URL being fetched */
diff --git a/gtk/gtk_options.c b/gtk/gtk_options.c
index 820e1828c..5bc6644aa 100644
--- a/gtk/gtk_options.c
+++ b/gtk/gtk_options.c
@@ -10,13 +10,13 @@
#include <string.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
-#include "netsurf/utils/log.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/gtk/options.h"
-#include "netsurf/gtk/gtk_gui.h"
-#include "netsurf/gtk/gtk_scaffolding.h"
-#include "netsurf/gtk/gtk_options.h"
-#include "netsurf/gtk/gtk_window.h"
+#include "utils/log.h"
+#include "desktop/options.h"
+#include "gtk/options.h"
+#include "gtk/gtk_gui.h"
+#include "gtk/gtk_scaffolding.h"
+#include "gtk/gtk_options.h"
+#include "gtk/gtk_window.h"
GtkWindow *wndChoices;
diff --git a/gtk/gtk_plotters.c b/gtk/gtk_plotters.c
index dee34336c..4162e3909 100644
--- a/gtk/gtk_plotters.c
+++ b/gtk/gtk_plotters.c
@@ -18,15 +18,15 @@
#include <math.h>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/gtk/font_pango.h"
-#include "netsurf/gtk/gtk_plotters.h"
-#include "netsurf/gtk/gtk_scaffolding.h"
-#include "netsurf/render/font.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/gtk/options.h"
-#include "netsurf/gtk/gtk_bitmap.h"
+#include "desktop/plotters.h"
+#include "gtk/font_pango.h"
+#include "gtk/gtk_plotters.h"
+#include "gtk/gtk_scaffolding.h"
+#include "render/font.h"
+#include "utils/log.h"
+#include "desktop/options.h"
+#include "gtk/options.h"
+#include "gtk/gtk_bitmap.h"
GtkWidget *current_widget;
GdkDrawable *current_drawable;
diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c
index b1fe5c779..2ba9139f1 100644
--- a/gtk/gtk_scaffolding.c
+++ b/gtk/gtk_scaffolding.c
@@ -12,32 +12,32 @@
#include <string.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/history_core.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/netsurf.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/desktop/textinput.h"
-#include "netsurf/desktop/gesture_core.h"
-#include "netsurf/gtk/gtk_gui.h"
-#include "netsurf/gtk/gtk_plotters.h"
-#include "netsurf/gtk/gtk_scaffolding.h"
-#include "netsurf/gtk/gtk_options.h"
-#include "netsurf/gtk/gtk_completion.h"
-#include "netsurf/gtk/gtk_throbber.h"
-#include "netsurf/gtk/gtk_history.h"
-#include "netsurf/gtk/gtk_window.h"
-#include "netsurf/gtk/gtk_schedule.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/font.h"
-#include "netsurf/render/form.h"
-#include "netsurf/render/html.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "content/content.h"
+#include "desktop/browser.h"
+#include "desktop/history_core.h"
+#include "desktop/gui.h"
+#include "desktop/netsurf.h"
+#include "desktop/plotters.h"
+#include "desktop/options.h"
+#include "desktop/textinput.h"
+#include "desktop/gesture_core.h"
+#include "gtk/gtk_gui.h"
+#include "gtk/gtk_plotters.h"
+#include "gtk/gtk_scaffolding.h"
+#include "gtk/gtk_options.h"
+#include "gtk/gtk_completion.h"
+#include "gtk/gtk_throbber.h"
+#include "gtk/gtk_history.h"
+#include "gtk/gtk_window.h"
+#include "gtk/gtk_schedule.h"
+#include "render/box.h"
+#include "render/font.h"
+#include "render/form.h"
+#include "render/html.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#undef NDEBUG
-#include "netsurf/utils/log.h"
+#include "utils/log.h"
struct gtk_history_window;
diff --git a/gtk/gtk_scaffolding.h b/gtk/gtk_scaffolding.h
index d32b380fc..5f786d94f 100644
--- a/gtk/gtk_scaffolding.h
+++ b/gtk/gtk_scaffolding.h
@@ -9,8 +9,8 @@
#define NETSURF_GTK_SCAFFOLDING_H 1
#include <gtk/gtk.h>
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/plotters.h"
+#include "desktop/gui.h"
+#include "desktop/plotters.h"
typedef struct gtk_scaffolding nsgtk_scaffolding;
diff --git a/gtk/gtk_schedule.c b/gtk/gtk_schedule.c
index 73568fa93..13eb54d7d 100644
--- a/gtk/gtk_schedule.c
+++ b/gtk/gtk_schedule.c
@@ -8,7 +8,7 @@
#include <glib.h>
#include <stdlib.h>
-#include "netsurf/desktop/browser.h"
+#include "desktop/browser.h"
typedef struct {
void (*callback)(void *);
diff --git a/gtk/gtk_throbber.c b/gtk/gtk_throbber.c
index a95cf1609..49c546b4f 100644
--- a/gtk/gtk_throbber.c
+++ b/gtk/gtk_throbber.c
@@ -7,10 +7,10 @@
#include <stdio.h>
#include <stdlib.h>
-#include "netsurf/utils/log.h"
-#include "netsurf/image/gifread.h"
-#include "netsurf/gtk/gtk_throbber.h"
-#include "netsurf/gtk/gtk_bitmap.h"
+#include "utils/log.h"
+#include "image/gifread.h"
+#include "gtk/gtk_throbber.h"
+#include "gtk/gtk_bitmap.h"
struct nsgtk_throbber *nsgtk_throbber = NULL;
diff --git a/gtk/gtk_thumbnail.c b/gtk/gtk_thumbnail.c
index 2209fcf3f..5c456e6f0 100644
--- a/gtk/gtk_thumbnail.c
+++ b/gtk/gtk_thumbnail.c
@@ -15,16 +15,16 @@
#include <assert.h>
#include <gtk/gtk.h>
-#include "netsurf/content/content.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/render/font.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/gtk/gtk_scaffolding.h"
-#include "netsurf/gtk/gtk_plotters.h"
-#include "netsurf/gtk/gtk_bitmap.h"
+#include "content/content.h"
+#include "content/urldb.h"
+#include "desktop/plotters.h"
+#include "desktop/browser.h"
+#include "image/bitmap.h"
+#include "render/font.h"
+#include "utils/log.h"
+#include "gtk/gtk_scaffolding.h"
+#include "gtk/gtk_plotters.h"
+#include "gtk/gtk_bitmap.h"
/**
* Create a thumbnail of a page.
diff --git a/gtk/gtk_treeview.c b/gtk/gtk_treeview.c
index 9b5f2c2c0..3fd32b840 100644
--- a/gtk/gtk_treeview.c
+++ b/gtk/gtk_treeview.c
@@ -10,7 +10,7 @@
*/
-#include "netsurf/desktop/tree.h"
+#include "desktop/tree.h"
/**
diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c
index 641ecbb55..baa2ba564 100644
--- a/gtk/gtk_window.c
+++ b/gtk/gtk_window.c
@@ -6,16 +6,16 @@
* Copyright 2006 Rob Kendrick <rjek@rjek.com>
*/
-#include "netsurf/gtk/gtk_window.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/textinput.h"
-#include "netsurf/gtk/gtk_gui.h"
-#include "netsurf/gtk/gtk_scaffolding.h"
-#include "netsurf/gtk/gtk_plotters.h"
-#include "netsurf/gtk/gtk_schedule.h"
+#include "gtk/gtk_window.h"
+#include "desktop/browser.h"
+#include "desktop/textinput.h"
+#include "gtk/gtk_gui.h"
+#include "gtk/gtk_scaffolding.h"
+#include "gtk/gtk_plotters.h"
+#include "gtk/gtk_schedule.h"
#undef NDEBUG
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/utils.h"
#include <gdk/gdkkeysyms.h>
#include <assert.h>
diff --git a/gtk/gtk_window.h b/gtk/gtk_window.h
index 24aa5cd74..3afe04d15 100644
--- a/gtk/gtk_window.h
+++ b/gtk/gtk_window.h
@@ -8,8 +8,8 @@
#ifndef NETSURF_GTK_WINDOW_H
#define NETSURF_GTK_WINDOW_H 1
-#include "netsurf/desktop/gui.h"
-#include "netsurf/gtk/gtk_scaffolding.h"
+#include "desktop/gui.h"
+#include "gtk/gtk_scaffolding.h"
void nsgtk_window_reflow_content(struct gui_window *g);
void nsgtk_reflow_all_windows(void);
diff --git a/gtk/options.h b/gtk/options.h
index 545be330d..71aef4c9d 100644
--- a/gtk/options.h
+++ b/gtk/options.h
@@ -8,7 +8,7 @@
#ifndef _NETSURF_GTK_OPTIONS_H_
#define _NETSURF_GTK_OPTIONS_H_
-#include "netsurf/desktop/options.h"
+#include "desktop/options.h"
extern bool option_render_cairo;
extern bool option_render_resample;
diff --git a/image/bmp.c b/image/bmp.c
index 204dcaf9c..3301f893f 100644
--- a/image/bmp.c
+++ b/image/bmp.c
@@ -9,15 +9,15 @@
#include <string.h>
#include <stdbool.h>
#include <stdlib.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/image/bmp.h"
-#include "netsurf/image/bmpread.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 "desktop/plotters.h"
+#include "image/bitmap.h"
+#include "image/bmp.h"
+#include "image/bmpread.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#ifdef WITH_BMP
diff --git a/image/bmp.h b/image/bmp.h
index 3cc31cfd2..e21008454 100644
--- a/image/bmp.h
+++ b/image/bmp.h
@@ -9,7 +9,7 @@
#define _NETSURF_IMAGE_BMP_H_
#include <stdbool.h>
-#include "netsurf/image/bmpread.h"
+#include "image/bmpread.h"
struct content;
diff --git a/image/bmpread.c b/image/bmpread.c
index e9d71588c..a33499e3d 100644
--- a/image/bmpread.c
+++ b/image/bmpread.c
@@ -10,9 +10,9 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include "netsurf/image/bmpread.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/utils/log.h"
+#include "image/bmpread.h"
+#include "image/bitmap.h"
+#include "utils/log.h"
#define READ_SHORT(a, o) (a[o]|(a[o+1]<<8))
#define READ_INT(a, o) (a[o]|(a[o+1]<<8)|(a[o+2]<<16)|(a[o+3]<<24))
diff --git a/image/bmpread.h b/image/bmpread.h
index 379d8cecb..0ed0deb8e 100644
--- a/image/bmpread.h
+++ b/image/bmpread.h
@@ -13,7 +13,7 @@
#define _NETSURF_IMAGE_BMPREAD_H_
#include <stdbool.h>
-#include "netsurf/image/bitmap.h"
+#include "image/bitmap.h"
/* error return values */
typedef enum {
diff --git a/image/gif.c b/image/gif.c
index a3e0b00af..447fba705 100644
--- a/image/gif.c
+++ b/image/gif.c
@@ -10,17 +10,17 @@
#include <string.h>
#include <stdbool.h>
#include <stdlib.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/image/gif.h"
-#include "netsurf/image/gifread.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 "desktop/browser.h"
+#include "desktop/options.h"
+#include "desktop/plotters.h"
+#include "image/bitmap.h"
+#include "image/gif.h"
+#include "image/gifread.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
/* GIF FUNCTIONALITY
diff --git a/image/gif.h b/image/gif.h
index d0020a1b8..8b0d18e2f 100644
--- a/image/gif.h
+++ b/image/gif.h
@@ -9,7 +9,7 @@
#define _NETSURF_IMAGE_GIF_H_
#include <stdbool.h>
-#include "netsurf/image/gifread.h"
+#include "image/gifread.h"
struct content;
diff --git a/image/gifread.c b/image/gifread.c
index dab68eea0..bbdbfeea0 100644
--- a/image/gifread.c
+++ b/image/gifread.c
@@ -11,8 +11,8 @@
#include <string.h>
#include <stdlib.h>
#include "gifread.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/utils/log.h"
+#include "image/bitmap.h"
+#include "utils/log.h"
/* READING GIF FILES
=================
diff --git a/image/gifread.h b/image/gifread.h
index ec6bbf7f8..bc04a912a 100644
--- a/image/gifread.h
+++ b/image/gifread.h
@@ -13,7 +13,7 @@
#define _NETSURF_IMAGE_GIFREAD_H_
#include <stdbool.h>
-#include "netsurf/image/bitmap.h"
+#include "image/bitmap.h"
/* Error return values
*/
diff --git a/image/ico.c b/image/ico.c
index fbf6405d5..061b19b11 100644
--- a/image/ico.c
+++ b/image/ico.c
@@ -9,15 +9,15 @@
#include <string.h>
#include <stdbool.h>
#include <stdlib.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/image/bmpread.h"
-#include "netsurf/image/ico.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 "desktop/plotters.h"
+#include "image/bitmap.h"
+#include "image/bmpread.h"
+#include "image/ico.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#ifdef WITH_BMP
diff --git a/image/ico.h b/image/ico.h
index b02ddcf5e..4b58edfb6 100644
--- a/image/ico.h
+++ b/image/ico.h
@@ -9,7 +9,7 @@
#define _NETSURF_IMAGE_ICO_H_
#include <stdbool.h>
-#include "netsurf/image/bmpread.h"
+#include "image/bmpread.h"
struct content;
diff --git a/image/jpeg.c b/image/jpeg.c
index e18d2b0a3..7114bd550 100644
--- a/image/jpeg.c
+++ b/image/jpeg.c
@@ -19,14 +19,14 @@
#include <stdlib.h>
#define JPEG_INTERNAL_OPTIONS
#include "jpeglib.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/image/jpeg.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 "desktop/plotters.h"
+#include "image/bitmap.h"
+#include "image/jpeg.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
/* We prefer the library to be configured with these options to save
diff --git a/image/mng.c b/image/mng.c
index b0a94daf1..9949e3028 100644
--- a/image/mng.c
+++ b/image/mng.c
@@ -15,17 +15,17 @@
#include <stdlib.h>
#include <sys/time.h>
#include <time.h>
-#include "libmng.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/image/mng.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include <libmng.h>
+#include "utils/config.h"
+#include "content/content.h"
+#include "desktop/browser.h"
+#include "desktop/options.h"
+#include "desktop/plotters.h"
+#include "image/bitmap.h"
+#include "image/mng.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#ifdef WITH_MNG
diff --git a/image/mng.h b/image/mng.h
index 6e729cf64..91033279f 100644
--- a/image/mng.h
+++ b/image/mng.h
@@ -13,7 +13,7 @@
#define _NETSURF_IMAGE_MNG_H_
#include <stdbool.h>
-#include "libmng.h"
+#include <libmng.h>
struct content;
diff --git a/makefile b/makefile
index 45e4922ce..71a4acc84 100644
--- a/makefile
+++ b/makefile
@@ -121,17 +121,17 @@ WARNFLAGS = -W -Wall -Wundef -Wpointer-arith -Wcast-qual \
# PLATFORM_CFLAGS variables are defined in them
CFLAGS_RISCOS = -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -Driscos -DBOOL_DEFINED -O \
- $(WARNFLAGS) -I.. $(PLATFORM_CFLAGS_RISCOS) -mpoke-function-name \
-# -include netsurf/utils/memdebug.h
+ $(WARNFLAGS) -I. $(PLATFORM_CFLAGS_RISCOS) -mpoke-function-name \
+# -include utils/memdebug.h
CFLAGS_RISCOS_SMALL = $(CFLAGS_RISCOS) -Dsmall
CFLAGS_NCOS = $(CFLAGS_RISCOS) -Dncos
-CFLAGS_DEBUG = -std=c99 -D_BSD_SOURCE -DDEBUG_BUILD $(WARNFLAGS) -I.. \
+CFLAGS_DEBUG = -std=c99 -D_BSD_SOURCE -DDEBUG_BUILD $(WARNFLAGS) -I. \
$(PLATFORM_CFLAGS_DEBUG) -g
CFLAGS_GTK = -std=c99 -Dgtk -Dnsgtk \
-D_BSD_SOURCE \
-DGTK_DISABLE_DEPRECATED \
-D_POSIX_C_SOURCE \
- $(WARNFLAGS) -I.. -g -O2 -Wformat=2 \
+ $(WARNFLAGS) -I. -g -O2 -Wformat=2 \
`pkg-config --cflags libglade-2.0 gtk+-2.0` `xml2-config --cflags`
# Stop GCC under Cygwin throwing a fit
@@ -209,10 +209,10 @@ $(OBJDIR_NCOS)/%.o : %.s
# available), remove */*.[ch] from the line below.
# Under RISC OS, you may require *Set UnixFS$sfix "", if perl gives
# "No such file or directory" errors.
-depend: */*.[ch]
+depend: css/css_enum.c css/parser.c css/scanner.c utils/translit.c */*.[ch]
@echo "--> modified files $?"
@echo "--> updating dependencies"
@-mkdir -p $(OBJDIR_RISCOS) $(OBJDIR_RISCOS_SMALL) $(OBJDIR_NCOS) $(OBJDIR_DEBUG) $(OBJDIR_GTK)
- @perl scandeps netsurf $(OBJDIR_RISCOS) $(OBJDIR_RISCOS_SMALL) $(OBJDIR_NCOS) $(OBJDIR_DEBUG) $(OBJDIR_GTK) -- $^ > depend
+ @perl scandeps $(OBJDIR_RISCOS) $(OBJDIR_RISCOS_SMALL) $(OBJDIR_NCOS) $(OBJDIR_DEBUG) $(OBJDIR_GTK) -- $^ > depend
include depend
diff --git a/posix.mk b/posix.mk
index 5098a02fc..34cbcafed 100644
--- a/posix.mk
+++ b/posix.mk
@@ -30,7 +30,7 @@ NCRUNIMAGE = !NCNetSurf/!RunImage,ff8
# special cases - in here, cos RISC OS can't cope :(
css/css_enum.c css/css_enum.h: css/css_enums css/makeenum
- cd ..; perl netsurf/css/makeenum netsurf/css/css_enum < netsurf/css/css_enums
+ perl css/makeenum css/css_enum < css/css_enums
css/parser.c css/parser.h: css/parser.y
-cd css; lemon parser.y
css/scanner.c: css/scanner.l
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
diff --git a/riscos.mk b/riscos.mk
index bed1a3d32..c11ace71c 100644
--- a/riscos.mk
+++ b/riscos.mk
@@ -19,9 +19,7 @@ NCRUNIMAGE = !NCNetSurf/!RunImage
# special cases
css/css_enum.c css/css_enum.h: css/css_enums css/makeenum
- @dir ^
- perl netsurf/css/makeenum netsurf/css/css_enum < netsurf/css/css_enums
- @dir netsurf
+ perl css/makeenum css/css_enum < css/css_enums
css/parser.c css/parser.h: css/parser.y
@dir css
-lemon parser.y
diff --git a/riscos/401login.c b/riscos/401login.c
index b15436a33..66093c876 100644
--- a/riscos/401login.c
+++ b/riscos/401login.c
@@ -11,18 +11,18 @@
#include <stdbool.h>
#include <string.h>
#include "oslib/wimp.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/401login.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/config.h"
+#include "content/content.h"
+#include "content/urldb.h"
+#include "desktop/browser.h"
+#include "desktop/401login.h"
+#include "desktop/gui.h"
+#include "riscos/dialog.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utils.h"
#ifdef WITH_AUTH
diff --git a/riscos/artworks.c b/riscos/artworks.c
index 9cc219de1..6ff060d8d 100644
--- a/riscos/artworks.c
+++ b/riscos/artworks.c
@@ -17,14 +17,14 @@
#include "swis.h"
#include "oslib/os.h"
#include "oslib/wimp.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/content/content.h"
-#include "netsurf/riscos/artworks.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/log.h"
+#include "utils/config.h"
+#include "desktop/plotters.h"
+#include "content/content.h"
+#include "riscos/artworks.h"
+#include "riscos/gui.h"
+#include "utils/utils.h"
+#include "utils/messages.h"
+#include "utils/log.h"
#ifdef WITH_ARTWORKS
diff --git a/riscos/bitmap.c b/riscos/bitmap.c
index 1ac260b6b..9f0f4ced0 100644
--- a/riscos/bitmap.c
+++ b/riscos/bitmap.c
@@ -19,18 +19,18 @@
#include <swis.h>
#include <unixlib/local.h>
#include "oslib/osfile.h"
-#include "oslib/osspriteop.h"
-#include "netsurf/content/content.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/riscos/bitmap.h"
-#include "netsurf/riscos/image.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/palettes.h"
-#include "netsurf/riscos/sprite.h"
-#include "netsurf/riscos/tinct.h"
-#include "netsurf/utils/filename.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include <oslib/osspriteop.h>
+#include "content/content.h"
+#include "image/bitmap.h"
+#include "riscos/bitmap.h"
+#include "riscos/image.h"
+#include "riscos/options.h"
+#include "riscos/palettes.h"
+#include "riscos/sprite.h"
+#include "riscos/tinct.h"
+#include "utils/filename.h"
+#include "utils/log.h"
+#include "utils/utils.h"
/** Colour in the overlay sprite that allows the bitmap to show through */
#define OVERLAY_INDEX 0xfe
diff --git a/riscos/bitmap.h b/riscos/bitmap.h
index d90679c25..3ca0088a2 100644
--- a/riscos/bitmap.h
+++ b/riscos/bitmap.h
@@ -8,8 +8,8 @@
#ifndef _NETSURF_RISCOS_BITMAP_H_
#define _NETSURF_RISCOS_BITMAP_H_
-#include "oslib/osspriteop.h"
-#include "netsurf/image/bitmap.h"
+#include <oslib/osspriteop.h>
+#include "image/bitmap.h"
struct osspriteop_area;
diff --git a/riscos/buffer.c b/riscos/buffer.c
index 4351acf3e..ae8426e9d 100644
--- a/riscos/buffer.c
+++ b/riscos/buffer.c
@@ -11,15 +11,15 @@
#include <swis.h>
#include "oslib/colourtrans.h"
#include "oslib/os.h"
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
#include "oslib/wimpreadsysinfo.h"
-#include "netsurf/riscos/buffer.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/tinct.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/utils/log.h"
+#include "riscos/buffer.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/tinct.h"
+#include "riscos/wimp.h"
+#include "utils/log.h"
//#define NDEBUG
#define BUFFER_EXCLUSIVE_USER_REDRAW "Only support pure user redraw (faster)"
//#define BUFFER_EMULATE_32BPP "Redirect to a 32bpp sprite and plot with Tinct"
diff --git a/riscos/configure.c b/riscos/configure.c
index bbb9e705a..5974adeff 100644
--- a/riscos/configure.c
+++ b/riscos/configure.c
@@ -18,14 +18,14 @@
#include "oslib/osbyte.h"
#include "oslib/territory.h"
#include "oslib/wimp.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/utils/messages.h"
+#include "riscos/dialog.h"
+#include "riscos/configure.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure/configure.h"
+#include "utils/log.h"
+#include "utils/utils.h"
+#include "utils/messages.h"
#define CONFIGURE_ICON_PADDING_H 32
#define CONFIGURE_ICON_PADDING_V 32
diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c
index 1835ea607..4fb8283eb 100644
--- a/riscos/configure/con_cache.c
+++ b/riscos/configure/con_cache.c
@@ -6,17 +6,17 @@
*/
#include "oslib/hourglass.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/filename.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/filename.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#define CACHE_MEMORY_SIZE 3
diff --git a/riscos/configure/con_connect.c b/riscos/configure/con_connect.c
index 42dac5f72..f47e7ddb8 100644
--- a/riscos/configure/con_connect.c
+++ b/riscos/configure/con_connect.c
@@ -7,18 +7,18 @@
#include <stdbool.h>
#include <swis.h>
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/tinct.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/configure/configure.h"
+#include "riscos/dialog.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/tinct.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/utils.h"
#define CONNECTION_PROXY_FIELD 3
diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c
index 6e762eeb0..7bbc6f928 100644
--- a/riscos/configure/con_content.c
+++ b/riscos/configure/con_content.c
@@ -5,16 +5,16 @@
* Copyright 2006 Richard Wilson <info@tinct.net>
*/
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#define CONTENT_BLOCK_ADVERTISEMENTS 2
diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c
index 81d9a576d..be767f730 100644
--- a/riscos/configure/con_fonts.c
+++ b/riscos/configure/con_fonts.c
@@ -5,18 +5,18 @@
* Copyright 2005 Richard Wilson <info@tinct.net>
*/
-#include "netsurf/css/css.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "css/css.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#define FONT_SANS_FIELD 3
diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c
index 26d104ebf..a2e3ab958 100644
--- a/riscos/configure/con_home.c
+++ b/riscos/configure/con_home.c
@@ -5,17 +5,17 @@
* Copyright 2005 Richard Wilson <info@tinct.net>
*/
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#define HOME_URL_FIELD 3
diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c
index 3d67fc1f4..6892fd758 100644
--- a/riscos/configure/con_image.c
+++ b/riscos/configure/con_image.c
@@ -7,18 +7,18 @@
#include <stdbool.h>
#include <swis.h>
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/tinct.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/configure/configure.h"
+#include "riscos/dialog.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/tinct.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/utils.h"
#define IMAGE_FOREGROUND_FIELD 3
diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c
index a649270a5..186874e61 100644
--- a/riscos/configure/con_inter.c
+++ b/riscos/configure/con_inter.c
@@ -5,13 +5,13 @@
* Copyright 2006 Adrian Lees <adrianl@users.sourceforge.net>
*/
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
#define INTERFACE_STRIP_EXTNS_OPTION 2
diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c
index 637f84ac9..f458f6df8 100644
--- a/riscos/configure/con_language.c
+++ b/riscos/configure/con_language.c
@@ -6,18 +6,18 @@
* Copyright 2006 Richard Wilson <info@tinct.net>
*/
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#define LANGUAGE_INTERFACE_FIELD 3
diff --git a/riscos/configure/con_memory.c b/riscos/configure/con_memory.c
index c5c7466e1..1bfa8d567 100644
--- a/riscos/configure/con_memory.c
+++ b/riscos/configure/con_memory.c
@@ -5,13 +5,13 @@
* Copyright 2006 Richard Wilson <info@tinct.net>
*/
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/bitmap.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/configure/configure.h"
+#include "desktop/options.h"
+#include "riscos/bitmap.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/dialog.h"
+#include "riscos/configure/configure.h"
#define MEMORY_DIRECT_FIELD 3
diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c
index 2b16f3116..46f30bd0f 100644
--- a/riscos/configure/con_secure.c
+++ b/riscos/configure/con_secure.c
@@ -5,16 +5,16 @@
* Copyright 2006 Richard Wilson <info@tinct.net>
*/
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#define SECURITY_REFERRER 2
diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c
index de0a10583..d8dfda6fb 100644
--- a/riscos/configure/con_theme.c
+++ b/riscos/configure/con_theme.c
@@ -8,22 +8,22 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/url_complete.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "utils/config.h"
+#include "riscos/configure/configure.h"
+#include "riscos/configure.h"
+#include "riscos/dialog.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/theme.h"
+#include "riscos/url_complete.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#define THEME_PANE_AREA 0
diff --git a/riscos/cookies.c b/riscos/cookies.c
index 809d404d3..0c370c379 100644
--- a/riscos/cookies.c
+++ b/riscos/cookies.c
@@ -17,21 +17,21 @@
#include <time.h>
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/cookies.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/riscos/cookies.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/treeview.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "content/urldb.h"
+#include "desktop/cookies.h"
+#include "desktop/tree.h"
+#include "riscos/cookies.h"
+#include "riscos/dialog.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/theme.h"
+#include "riscos/treeview.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/messages.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utils.h"
static bool ro_gui_cookies_click(wimp_pointer *pointer);
static struct node *ro_gui_cookies_find(const char *url);
diff --git a/riscos/debugwin.c b/riscos/debugwin.c
index dfdc3dfd3..85577f41c 100644
--- a/riscos/debugwin.c
+++ b/riscos/debugwin.c
@@ -12,12 +12,12 @@
#include <stdio.h>
#include <stdlib.h>
#include "oslib/wimp.h"
-#include "netsurf/content/content.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/talloc.h"
-#include "netsurf/utils/utils.h"
+#include "content/content.h"
+#include "riscos/dialog.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/talloc.h"
+#include "utils/utils.h"
/** Update interval / cs. */
#define DEBUGWIN_UPDATE 500
diff --git a/riscos/dialog.c b/riscos/dialog.c
index c0d224d69..562ef052c 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -17,28 +17,28 @@
#include "oslib/colourtrans.h"
#include "oslib/osfile.h"
#include "oslib/osgbpb.h"
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
#include "rufl.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/desktop/netsurf.h"
-#include "netsurf/render/font.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/cookies.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/global_history.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/save.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/url_complete.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/config.h"
+#include "desktop/netsurf.h"
+#include "render/font.h"
+#include "riscos/configure.h"
+#include "riscos/cookies.h"
+#include "riscos/dialog.h"
+#include "riscos/global_history.h"
+#include "riscos/gui.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/save.h"
+#include "riscos/theme.h"
+#include "riscos/url_complete.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utils.h"
#define ICON_ZOOM_VALUE 1
#define ICON_ZOOM_DEC 2
diff --git a/riscos/dialog.h b/riscos/dialog.h
index d1963565a..2373e2dae 100644
--- a/riscos/dialog.h
+++ b/riscos/dialog.h
@@ -11,10 +11,10 @@
#include <stdbool.h>
#include <stdlib.h>
#include <oslib/wimp.h>
-#include "netsurf/riscos/theme.h"
+#include "riscos/theme.h"
-#include "netsurf/riscos/gui.h"
+#include "riscos/gui.h"
diff --git a/riscos/download.c b/riscos/download.c
index 37c8e03d0..f28bfed20 100644
--- a/riscos/download.c
+++ b/riscos/download.c
@@ -30,20 +30,20 @@
#include "oslib/osgbpb.h"
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/netsurf.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/save.h"
-#include "netsurf/riscos/query.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "content/fetch.h"
+#include "desktop/gui.h"
+#include "desktop/netsurf.h"
+#include "riscos/dialog.h"
+#include "riscos/options.h"
+#include "riscos/save.h"
+#include "riscos/query.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
#define ICON_DOWNLOAD_ICON 0
#define ICON_DOWNLOAD_URL 1
diff --git a/riscos/draw.c b/riscos/draw.c
index 489da7ff9..4fc154ea5 100644
--- a/riscos/draw.c
+++ b/riscos/draw.c
@@ -14,14 +14,14 @@
#include <string.h>
#include <stdlib.h>
#include "oslib/drawfile.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/content/content.h"
-#include "netsurf/riscos/draw.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/log.h"
+#include "utils/config.h"
+#include "desktop/plotters.h"
+#include "content/content.h"
+#include "riscos/draw.h"
+#include "riscos/gui.h"
+#include "utils/utils.h"
+#include "utils/messages.h"
+#include "utils/log.h"
#ifdef WITH_DRAW
diff --git a/riscos/filetype.c b/riscos/filetype.c
index eb226685a..914d76ec8 100644
--- a/riscos/filetype.c
+++ b/riscos/filetype.c
@@ -10,12 +10,12 @@
#include <unixlib/local.h>
#include "oslib/mimemap.h"
#include "oslib/osfile.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "content/content.h"
+#include "content/fetch.h"
+#include "riscos/gui.h"
+#include "utils/config.h"
+#include "utils/log.h"
+#include "utils/utils.h"
/* type_map must be in sorted order by file_type */
struct type_entry {
diff --git a/riscos/font.c b/riscos/font.c
index 40cc0874f..cda57d76b 100644
--- a/riscos/font.c
+++ b/riscos/font.c
@@ -16,13 +16,13 @@
#include "oslib/wimp.h"
#include "oslib/wimpreadsysinfo.h"
#include "rufl.h"
-#include "netsurf/css/css.h"
-#include "netsurf/render/font.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "css/css.h"
+#include "render/font.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
/** desktop font, size and style being used */
diff --git a/riscos/global_history.c b/riscos/global_history.c
index f6e260af2..26c6b44d8 100644
--- a/riscos/global_history.c
+++ b/riscos/global_history.c
@@ -17,21 +17,21 @@
#include <time.h>
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/global_history.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/treeview.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "content/urldb.h"
+#include "desktop/tree.h"
+#include "riscos/dialog.h"
+#include "riscos/global_history.h"
+#include "riscos/gui.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/theme.h"
+#include "riscos/treeview.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/messages.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utils.h"
#define MAXIMUM_URL_LENGTH 1024
#define MAXIMUM_BASE_NODES 16
diff --git a/riscos/gui.c b/riscos/gui.c
index 28eaa8c3e..0d34af698 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -32,58 +32,58 @@
#include "oslib/osfscontrol.h"
#include "oslib/osgbpb.h"
#include "oslib/osmodule.h"
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/pdriver.h"
#include "oslib/plugin.h"
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
#include "oslib/uri.h"
#include "rufl.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/netsurf.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/font.h"
-#include "netsurf/render/html.h"
-#include "netsurf/riscos/bitmap.h"
-#include "netsurf/riscos/buffer.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/global_history.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/help.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/message.h"
-#include "netsurf/riscos/options.h"
+#include "utils/config.h"
+#include "content/content.h"
+#include "content/urldb.h"
+#include "desktop/gui.h"
+#include "desktop/netsurf.h"
+#include "desktop/options.h"
+#include "desktop/tree.h"
+#include "render/box.h"
+#include "render/font.h"
+#include "render/html.h"
+#include "riscos/bitmap.h"
+#include "riscos/buffer.h"
+#include "riscos/dialog.h"
+#include "riscos/global_history.h"
+#include "riscos/gui.h"
+#include "riscos/help.h"
+#include "riscos/menus.h"
+#include "riscos/message.h"
+#include "riscos/options.h"
#ifdef WITH_PLUGIN
-#include "netsurf/riscos/plugin.h"
+#include "riscos/plugin.h"
#endif
#ifdef WITH_PRINT
-#include "netsurf/riscos/print.h"
+#include "riscos/print.h"
#endif
-#include "netsurf/riscos/query.h"
-#include "netsurf/riscos/save.h"
-#include "netsurf/riscos/save_complete.h"
-#include "netsurf/riscos/textselection.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/treeview.h"
+#include "riscos/query.h"
+#include "riscos/save.h"
+#include "riscos/save_complete.h"
+#include "riscos/textselection.h"
+#include "riscos/theme.h"
+#include "riscos/treeview.h"
#ifdef WITH_URI
-#include "netsurf/riscos/uri.h"
+#include "riscos/uri.h"
#endif
#ifdef WITH_URL
-#include "netsurf/riscos/url_protocol.h"
+#include "riscos/url_protocol.h"
#endif
-#include "netsurf/riscos/url_complete.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/filename.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "riscos/url_complete.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/filename.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utils.h"
diff --git a/riscos/gui.h b/riscos/gui.h
index 50c821dd6..2bc251060 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -15,9 +15,9 @@
#include <oslib/osspriteop.h>
#include <oslib/wimp.h>
#include <rufl.h>
-#include "netsurf/desktop/browser.h"
-#include "netsurf/content/content_type.h"
-#include "netsurf/utils/config.h"
+#include "desktop/browser.h"
+#include "content/content_type.h"
+#include "utils/config.h"
#define RISCOS5 0xAA
diff --git a/riscos/gui/progress_bar.c b/riscos/gui/progress_bar.c
index 0ca2d28b0..072c43df0 100644
--- a/riscos/gui/progress_bar.c
+++ b/riscos/gui/progress_bar.c
@@ -15,16 +15,16 @@
#include <swis.h>
#include "oslib/colourtrans.h"
#include "oslib/os.h"
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/tinct.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/gui/progress_bar.h"
+#include "desktop/plotters.h"
+#include "utils/log.h"
+#include "utils/utils.h"
+#include "riscos/gui.h"
+#include "riscos/tinct.h"
+#include "riscos/wimp_event.h"
+#include "riscos/gui/progress_bar.h"
#define MARGIN 6
diff --git a/riscos/gui/progress_bar.h b/riscos/gui/progress_bar.h
index b93a36d39..0bcf2bafc 100644
--- a/riscos/gui/progress_bar.h
+++ b/riscos/gui/progress_bar.h
@@ -10,7 +10,7 @@
*/
#include <stdbool.h>
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
#ifndef _NETSURF_RISCOS_PROGRESS_BAR_H_
diff --git a/riscos/gui/status_bar.c b/riscos/gui/status_bar.c
index 84ce994c8..ef7d5062f 100644
--- a/riscos/gui/status_bar.c
+++ b/riscos/gui/status_bar.c
@@ -17,14 +17,14 @@
#include "oslib/os.h"
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/gui/progress_bar.h"
-#include "netsurf/riscos/gui/status_bar.h"
+#include "desktop/plotters.h"
+#include "utils/log.h"
+#include "utils/utils.h"
+#include "riscos/gui.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/gui/progress_bar.h"
+#include "riscos/gui/status_bar.h"
#define ICON_WIDGET 0
#define WIDGET_WIDTH 12
diff --git a/riscos/help.c b/riscos/help.c
index b536dbc61..97fd11668 100644
--- a/riscos/help.c
+++ b/riscos/help.c
@@ -16,18 +16,18 @@
#include "oslib/os.h"
#include "oslib/taskmanager.h"
#include "oslib/wimp.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/help.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/treeview.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/tree.h"
+#include "riscos/gui.h"
+#include "riscos/help.h"
+#include "riscos/menus.h"
+#include "riscos/theme.h"
+#include "riscos/treeview.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/messages.h"
+#include "utils/log.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
/* Recognised help keys
diff --git a/riscos/history.c b/riscos/history.c
index d5146701b..a1a13156f 100644
--- a/riscos/history.c
+++ b/riscos/history.c
@@ -16,16 +16,16 @@
#include <stdlib.h>
#include <string.h>
#include "oslib/wimp.h"
-#include "netsurf/desktop/history_core.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/history_core.h"
+#include "desktop/plotters.h"
+#include "riscos/dialog.h"
+#include "riscos/options.h"
+#include "riscos/gui.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utils.h"
static struct browser_window *history_bw;
diff --git a/riscos/hotlist.c b/riscos/hotlist.c
index 26ec6dbd0..2ac540fc3 100644
--- a/riscos/hotlist.c
+++ b/riscos/hotlist.c
@@ -16,20 +16,20 @@
#include <time.h>
#include "oslib/osfile.h"
#include "oslib/wimp.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/treeview.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/utils/url.h"
+#include "content/content.h"
+#include "content/urldb.h"
+#include "desktop/tree.h"
+#include "riscos/dialog.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/theme.h"
+#include "riscos/treeview.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+#include "utils/url.h"
static void ro_gui_hotlist_visited(struct content *content, struct tree *tree,
diff --git a/riscos/image.c b/riscos/image.c
index 531b0770a..61219c77f 100644
--- a/riscos/image.c
+++ b/riscos/image.c
@@ -9,14 +9,14 @@
#include <swis.h>
#include "oslib/colourtrans.h"
-#include "oslib/osspriteop.h"
-
-#include "netsurf/riscos/image.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/tinct.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include <oslib/osspriteop.h>
+
+#include "riscos/image.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/tinct.h"
+#include "utils/log.h"
+#include "utils/utils.h"
static bool image_redraw_tinct(osspriteop_id header, int x, int y,
diff --git a/riscos/image.h b/riscos/image.h
index 85f913e55..2f591e6ff 100644
--- a/riscos/image.h
+++ b/riscos/image.h
@@ -8,7 +8,7 @@
#ifndef _NETSURF_RISCOS_IMAGE_H_
#define _NETSURF_RISCOS_IMAGE_H_
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
struct osspriteop_area;
diff --git a/riscos/menus.c b/riscos/menus.c
index 6650bb356..823b530fd 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -20,31 +20,31 @@
#include "oslib/osgbpb.h"
#include "oslib/territory.h"
#include "oslib/wimp.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/history_core.h"
-#include "netsurf/desktop/netsurf.h"
-#include "netsurf/render/box.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/render/form.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/cookies.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/global_history.h"
-#include "netsurf/riscos/help.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/save.h"
-#include "netsurf/riscos/tinct.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/treeview.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/utils/utf8.h"
+#include "content/urldb.h"
+#include "desktop/gui.h"
+#include "desktop/history_core.h"
+#include "desktop/netsurf.h"
+#include "render/box.h"
+#include "riscos/dialog.h"
+#include "render/form.h"
+#include "riscos/configure.h"
+#include "riscos/cookies.h"
+#include "riscos/gui.h"
+#include "riscos/global_history.h"
+#include "riscos/help.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/save.h"
+#include "riscos/tinct.h"
+#include "riscos/theme.h"
+#include "riscos/treeview.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utils.h"
+#include "utils/utf8.h"
struct ns_menu_entry {
diff --git a/riscos/menus.h b/riscos/menus.h
index 13a4ed249..78293124d 100644
--- a/riscos/menus.h
+++ b/riscos/menus.h
@@ -10,7 +10,7 @@
#include <stdbool.h>
#include "oslib/wimp.h"
-#include "netsurf/riscos/gui.h"
+#include "riscos/gui.h"
extern wimp_menu *iconbar_menu, *browser_menu, *hotlist_menu, *cookies_menu,
*global_history_menu, *image_quality_menu,
diff --git a/riscos/message.c b/riscos/message.c
index 1e2208f1c..cb2cf7e49 100644
--- a/riscos/message.c
+++ b/riscos/message.c
@@ -14,9 +14,9 @@
#include <stdlib.h>
#include "oslib/os.h"
#include "oslib/wimp.h"
-#include "netsurf/riscos/message.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "riscos/message.h"
+#include "utils/log.h"
+#include "utils/utils.h"
struct active_message {
diff --git a/riscos/options.h b/riscos/options.h
index d013d7a51..1aa2c2f0f 100644
--- a/riscos/options.h
+++ b/riscos/options.h
@@ -14,8 +14,8 @@
#ifndef _NETSURF_RISCOS_OPTIONS_H_
#define _NETSURF_RISCOS_OPTIONS_H_
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/tinct.h"
+#include "desktop/options.h"
+#include "riscos/tinct.h"
extern bool option_allow_text_selection;
extern char *option_theme;
diff --git a/riscos/palettes.c b/riscos/palettes.c
index 8ab68e2a1..bbda19324 100644
--- a/riscos/palettes.c
+++ b/riscos/palettes.c
@@ -9,7 +9,7 @@
* Palette definitions for sprites
*/
-#include "netsurf/riscos/palettes.h"
+#include "riscos/palettes.h"
const os_colour default_palette1[] =
diff --git a/riscos/plotters.c b/riscos/plotters.c
index defa68337..b719adbbd 100644
--- a/riscos/plotters.c
+++ b/riscos/plotters.c
@@ -13,12 +13,12 @@
#include "oslib/colourtrans.h"
#include "oslib/draw.h"
#include "oslib/os.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/render/font.h"
-#include "netsurf/riscos/bitmap.h"
-#include "netsurf/riscos/image.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/utils/log.h"
+#include "desktop/plotters.h"
+#include "render/font.h"
+#include "riscos/bitmap.h"
+#include "riscos/image.h"
+#include "riscos/gui.h"
+#include "utils/log.h"
diff --git a/riscos/plugin.c b/riscos/plugin.c
index 57f6f6515..e0dc02f9d 100644
--- a/riscos/plugin.c
+++ b/riscos/plugin.c
@@ -41,22 +41,22 @@
#include "oslib/plugin.h"
#include "oslib/wimp.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/render/html.h"
-#include "netsurf/render/box.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/plugin.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.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 "render/html.h"
+#include "render/box.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/plugin.h"
+#include "riscos/theme.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utils.h"
#ifdef WITH_PLUGIN
diff --git a/riscos/plugin.h b/riscos/plugin.h
index 63e79e597..aa6b976d6 100644
--- a/riscos/plugin.h
+++ b/riscos/plugin.h
@@ -9,8 +9,8 @@
#define _NETSURF_RISCOS_PLUGIN_H_
#include <stdbool.h>
-#include "oslib/plugin.h"
-#include "oslib/wimp.h"
+#include <oslib/plugin.h>
+#include <oslib/wimp.h>
struct box;
struct browser_window;
diff --git a/riscos/print.c b/riscos/print.c
index a95768b96..9d74f762a 100644
--- a/riscos/print.c
+++ b/riscos/print.c
@@ -15,21 +15,21 @@
#include "oslib/pdriver.h"
#include "oslib/wimp.h"
#include "rufl.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/font.h"
-#include "netsurf/render/html.h"
-#include "netsurf/render/layout.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/print.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.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 "desktop/plotters.h"
+#include "render/box.h"
+#include "render/font.h"
+#include "render/html.h"
+#include "render/layout.h"
+#include "riscos/dialog.h"
+#include "riscos/menus.h"
+#include "riscos/print.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#define ICON_PRINT_TO_BOTTOM 1
diff --git a/riscos/query.c b/riscos/query.c
index 578c32eb5..e9c316eee 100644
--- a/riscos/query.c
+++ b/riscos/query.c
@@ -9,14 +9,14 @@
#include <stdlib.h>
#include <string.h>
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/query.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "riscos/dialog.h"
+#include "riscos/query.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
#define ICON_QUERY_MESSAGE 0
#define ICON_QUERY_YES 1
diff --git a/riscos/query.h b/riscos/query.h
index 28dc0e0f2..d6fdfff15 100644
--- a/riscos/query.h
+++ b/riscos/query.h
@@ -9,7 +9,7 @@
#define _NETSURF_RISCOS_QUERY_H
#include <stdbool.h>
#include "oslib/wimp.h"
-#include "netsurf/utils/utils.h"
+#include "utils/utils.h"
struct gui_query_window;
diff --git a/riscos/save.c b/riscos/save.c
index 2acb7bbc4..aca013a41 100644
--- a/riscos/save.c
+++ b/riscos/save.c
@@ -21,30 +21,30 @@
#include "oslib/osbyte.h"
#include "oslib/osfile.h"
#include "oslib/osmodule.h"
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "netsurf/desktop/netsurf.h"
-#include "netsurf/desktop/save_text.h"
-#include "netsurf/desktop/selection.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/save.h"
-#include "netsurf/riscos/save_complete.h"
-#include "netsurf/riscos/save_draw.h"
-#include "netsurf/riscos/textselection.h"
-#include "netsurf/riscos/thumbnail.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/netsurf.h"
+#include "desktop/save_text.h"
+#include "desktop/selection.h"
+#include "image/bitmap.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/save.h"
+#include "riscos/save_complete.h"
+#include "riscos/save_draw.h"
+#include "riscos/textselection.h"
+#include "riscos/thumbnail.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/config.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
static gui_save_type gui_save_current_type;
diff --git a/riscos/save.h b/riscos/save.h
index b09ec5ef0..d37b946b3 100644
--- a/riscos/save.h
+++ b/riscos/save.h
@@ -13,7 +13,7 @@
#define _NETSURF_RISCOS_SAVE_H_
#include "oslib/wimp.h"
-#include "netsurf/desktop/gui.h"
+#include "desktop/gui.h"
wimp_w ro_gui_saveas_create(const char *template_name);
diff --git a/riscos/save_complete.c b/riscos/save_complete.c
index 79c521ac7..9a8c103a4 100644
--- a/riscos/save_complete.c
+++ b/riscos/save_complete.c
@@ -17,18 +17,18 @@
#include <string.h>
#include <sys/types.h>
#include <regex.h>
-#include "libxml/HTMLtree.h"
-#include "libxml/parserInternals.h"
-#include "oslib/osfile.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/css/css.h"
-#include "netsurf/render/box.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/save_complete.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include <libxml/HTMLtree.h>
+#include <libxml/parserInternals.h>
+#include <oslib/osfile.h>
+#include "utils/config.h"
+#include "content/content.h"
+#include "css/css.h"
+#include "render/box.h"
+#include "riscos/gui.h"
+#include "riscos/save_complete.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utils.h"
#ifdef WITH_SAVE_COMPLETE
diff --git a/riscos/save_draw.c b/riscos/save_draw.c
index eb96cf70c..4871b2d98 100644
--- a/riscos/save_draw.c
+++ b/riscos/save_draw.c
@@ -16,13 +16,13 @@
#include <oslib/draw.h>
#include <oslib/osfile.h>
#include <pencil.h>
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/riscos/bitmap.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/save_draw.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "content/content.h"
+#include "desktop/plotters.h"
+#include "riscos/bitmap.h"
+#include "riscos/gui.h"
+#include "riscos/save_draw.h"
+#include "utils/log.h"
+#include "utils/utils.h"
static bool ro_save_draw_clg(colour c);
diff --git a/riscos/schedule.c b/riscos/schedule.c
index 50e949470..024fcb5c6 100644
--- a/riscos/schedule.c
+++ b/riscos/schedule.c
@@ -14,8 +14,8 @@
#include <stdbool.h>
#include <stdlib.h>
#include "oslib/os.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/utils/log.h"
+#include "riscos/gui.h"
+#include "utils/log.h"
/** Entry in the queue of scheduled callbacks. */
diff --git a/riscos/search.c b/riscos/search.c
index 4fc5b04bd..3f70fff01 100644
--- a/riscos/search.c
+++ b/riscos/search.c
@@ -16,20 +16,20 @@
#include "oslib/hourglass.h"
#include "oslib/wimp.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/selection.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/html.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.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 "desktop/browser.h"
+#include "desktop/gui.h"
+#include "desktop/selection.h"
+#include "render/box.h"
+#include "render/html.h"
+#include "riscos/dialog.h"
+#include "riscos/menus.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#ifdef WITH_SEARCH
diff --git a/riscos/sprite.c b/riscos/sprite.c
index c17cd1a57..7cd3d6a5f 100644
--- a/riscos/sprite.c
+++ b/riscos/sprite.c
@@ -17,16 +17,16 @@
#include <string.h>
#include <stdlib.h>
-#include "oslib/osspriteop.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/content/content.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/image.h"
-#include "netsurf/riscos/sprite.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include <oslib/osspriteop.h>
+#include "utils/config.h"
+#include "desktop/plotters.h"
+#include "content/content.h"
+#include "riscos/gui.h"
+#include "riscos/image.h"
+#include "riscos/sprite.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#ifdef WITH_SPRITE
diff --git a/riscos/sprite.h b/riscos/sprite.h
index 0707871dc..f4793f474 100644
--- a/riscos/sprite.h
+++ b/riscos/sprite.h
@@ -13,7 +13,7 @@
#define _NETSURF_RISCOS_SPRITE_H_
#include <stdbool.h>
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
struct content;
diff --git a/riscos/sslcert.c b/riscos/sslcert.c
index 650babab6..d12405e3e 100644
--- a/riscos/sslcert.c
+++ b/riscos/sslcert.c
@@ -9,7 +9,7 @@
* SSL Certificate verification UI (implementation)
*/
-#include "netsurf/utils/config.h"
+#include "utils/config.h"
#ifdef WITH_SSL
@@ -18,19 +18,19 @@
#include <stdio.h>
#include <string.h>
#include "oslib/wimp.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/textarea.h"
-#include "netsurf/riscos/treeview.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "content/content.h"
+#include "content/fetch.h"
+#include "content/urldb.h"
+#include "desktop/browser.h"
+#include "desktop/gui.h"
+#include "desktop/tree.h"
+#include "riscos/dialog.h"
+#include "riscos/textarea.h"
+#include "riscos/treeview.h"
+#include "riscos/wimp_event.h"
+#include "riscos/wimp.h"
+#include "utils/log.h"
+#include "utils/utils.h"
#define ICON_SSL_PANE 1
#define ICON_SSL_REJECT 3
diff --git a/riscos/textarea.c b/riscos/textarea.c
index ca0112d9c..191c6911e 100644
--- a/riscos/textarea.c
+++ b/riscos/textarea.c
@@ -23,13 +23,13 @@
#include "rufl.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/textarea.h"
-#include "netsurf/riscos/ucstables.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utf8.h"
+#include "riscos/gui.h"
+#include "riscos/textarea.h"
+#include "riscos/ucstables.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/utf8.h"
#define MARGIN_LEFT 8
#define MARGIN_RIGHT 8
diff --git a/riscos/textselection.c b/riscos/textselection.c
index 25bbc7f81..11f4a82be 100644
--- a/riscos/textselection.c
+++ b/riscos/textselection.c
@@ -14,17 +14,17 @@
#include <string.h>
#include "oslib/osfile.h"
#include "oslib/wimp.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/selection.h"
-#include "netsurf/desktop/textinput.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/message.h"
-#include "netsurf/riscos/save.h"
-#include "netsurf/riscos/textselection.h"
-#include "netsurf/render/form.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/gui.h"
+#include "desktop/selection.h"
+#include "desktop/textinput.h"
+#include "riscos/gui.h"
+#include "riscos/message.h"
+#include "riscos/save.h"
+#include "riscos/textselection.h"
+#include "render/form.h"
+#include "utils/log.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
#ifndef wimp_DRAG_CLAIM_SUPPRESS_DRAGBOX
#define wimp_DRAG_CLAIM_SUPPRESS_DRAGBOX ((wimp_drag_claim_flags) 0x2u)
diff --git a/riscos/textselection.h b/riscos/textselection.h
index 5576ff1f6..a701d904e 100644
--- a/riscos/textselection.h
+++ b/riscos/textselection.h
@@ -13,7 +13,7 @@
#define _NETSURF_RISCOS_TEXTSELECTION_H_
#include "oslib/wimp.h"
-#include "netsurf/desktop/gui.h"
+#include "desktop/gui.h"
void ro_gui_selection_drag_end(struct gui_window *g, wimp_dragged *drag);
diff --git a/riscos/theme.c b/riscos/theme.c
index 3eac01944..0d35a581a 100644
--- a/riscos/theme.c
+++ b/riscos/theme.c
@@ -19,23 +19,23 @@
#include "oslib/osgbpb.h"
#include "oslib/osfile.h"
#include "oslib/osfind.h"
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimpspriteop.h"
#include "oslib/squash.h"
#include "oslib/wimp.h"
#include "oslib/wimpextend.h"
#include "oslib/wimpspriteop.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/treeview.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/gui.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/theme.h"
+#include "riscos/treeview.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/utils.h"
#define THEME_URL_MEMORY 256
#define THEME_THROBBER_MEMORY 12
diff --git a/riscos/theme_install.c b/riscos/theme_install.c
index f8f1c43af..5f57ec8f4 100644
--- a/riscos/theme_install.c
+++ b/riscos/theme_install.c
@@ -12,18 +12,18 @@
#include <assert.h>
#include <stdbool.h>
#include "oslib/osfile.h"
-#include "netsurf/content/content.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "content/content.h"
+#include "desktop/browser.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/theme.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utils.h"
static struct content *theme_install_content = NULL;
diff --git a/riscos/thumbnail.c b/riscos/thumbnail.c
index 99c888168..7227f64cc 100644
--- a/riscos/thumbnail.c
+++ b/riscos/thumbnail.c
@@ -19,18 +19,18 @@
#include "rufl.h"
#include "oslib/colourtrans.h"
#include "oslib/osfile.h"
-#include "oslib/osspriteop.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/render/font.h"
-#include "netsurf/riscos/bitmap.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/thumbnail.h"
-#include "netsurf/riscos/tinct.h"
-#include "netsurf/utils/log.h"
+#include <oslib/osspriteop.h>
+#include "content/content.h"
+#include "content/urldb.h"
+#include "desktop/plotters.h"
+#include "image/bitmap.h"
+#include "render/font.h"
+#include "riscos/bitmap.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/thumbnail.h"
+#include "riscos/tinct.h"
+#include "utils/log.h"
/* Whether we can use 32bpp sprites
diff --git a/riscos/thumbnail.h b/riscos/thumbnail.h
index b7b07545e..a3fc5aa37 100644
--- a/riscos/thumbnail.h
+++ b/riscos/thumbnail.h
@@ -10,7 +10,7 @@
* Page thumbnail creation (interface).
*/
-#include "oslib/osspriteop.h"
-#include "netsurf/image/bitmap.h"
+#include <oslib/osspriteop.h>
+#include "image/bitmap.h"
osspriteop_area *thumbnail_convert_8bpp(struct bitmap *bitmap);
diff --git a/riscos/treeview.c b/riscos/treeview.c
index 65d04ea31..3086f436b 100644
--- a/riscos/treeview.c
+++ b/riscos/treeview.c
@@ -19,26 +19,26 @@
#include "oslib/colourtrans.h"
#include "oslib/dragasprite.h"
#include "oslib/osbyte.h"
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/riscos/bitmap.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/image.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/tinct.h"
-#include "netsurf/riscos/textarea.h"
-#include "netsurf/riscos/treeview.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "content/urldb.h"
+#include "desktop/browser.h"
+#include "desktop/plotters.h"
+#include "desktop/tree.h"
+#include "riscos/bitmap.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/image.h"
+#include "riscos/menus.h"
+#include "riscos/theme.h"
+#include "riscos/tinct.h"
+#include "riscos/textarea.h"
+#include "riscos/treeview.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#ifndef wimp_KEY_END
#define wimp_KEY_END wimp_KEY_COPY
diff --git a/riscos/treeview.h b/riscos/treeview.h
index 8413dcfd5..3394d10ae 100644
--- a/riscos/treeview.h
+++ b/riscos/treeview.h
@@ -13,10 +13,10 @@
#define _NETSURF_RISCOS_TREEVIEW_H_
#include <stdbool.h>
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/image/bitmap.h"
+#include "desktop/tree.h"
+#include "image/bitmap.h"
#define TREE_TEXT_HEIGHT 40
#define TREE_SPRITE_WIDTH 40 /* text plus sprite entries only */
diff --git a/riscos/ucstables.c b/riscos/ucstables.c
index a468cd178..073814ca0 100644
--- a/riscos/ucstables.c
+++ b/riscos/ucstables.c
@@ -17,10 +17,10 @@
#include "oslib/osbyte.h"
#include "oslib/territory.h"
-#include "netsurf/riscos/ucstables.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "riscos/ucstables.h"
+#include "utils/log.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
/* Common values (ASCII) */
#define common \
diff --git a/riscos/uri.c b/riscos/uri.c
index 35ba06898..9db177c0e 100644
--- a/riscos/uri.c
+++ b/riscos/uri.c
@@ -11,15 +11,15 @@
#include <string.h>
#include "oslib/uri.h"
#include "oslib/wimp.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/url_protocol.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "utils/config.h"
+#include "content/fetch.h"
+#include "desktop/browser.h"
+#include "riscos/theme.h"
+#include "desktop/gui.h"
+#include "riscos/gui.h"
+#include "riscos/url_protocol.h"
+#include "utils/log.h"
+#include "utils/utils.h"
#ifdef WITH_URI
diff --git a/riscos/url_complete.c b/riscos/url_complete.c
index 44614efc9..5cd8393d8 100644
--- a/riscos/url_complete.c
+++ b/riscos/url_complete.c
@@ -16,16 +16,16 @@
#include <string.h>
#include <wchar.h>
#include "oslib/wimp.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/riscos/global_history.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/url_complete.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/utils.h"
+#include "content/urldb.h"
+#include "utils/log.h"
+#include "riscos/global_history.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/theme.h"
+#include "riscos/url_complete.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/utils.h"
#define MAXIMUM_VISIBLE_LINES 7
diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c
index 101c3e19e..d67b2cb69 100644
--- a/riscos/url_protocol.c
+++ b/riscos/url_protocol.c
@@ -19,15 +19,15 @@
#include <string.h>
#include "oslib/inetsuite.h"
#include "oslib/wimp.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/uri.h"
-#include "netsurf/riscos/url_protocol.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "utils/config.h"
+#include "content/fetch.h"
+#include "desktop/browser.h"
+#include "desktop/gui.h"
+#include "riscos/gui.h"
+#include "riscos/uri.h"
+#include "riscos/url_protocol.h"
+#include "utils/log.h"
+#include "utils/utils.h"
#ifdef WITH_URL
diff --git a/riscos/wimp.c b/riscos/wimp.c
index f6c6d2250..df47a7a1e 100644
--- a/riscos/wimp.c
+++ b/riscos/wimp.c
@@ -21,13 +21,13 @@
#include "oslib/wimp.h"
#include "oslib/wimpextend.h"
#include "oslib/wimpspriteop.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/gui.h"
+#include "riscos/gui.h"
+#include "riscos/theme.h"
+#include "riscos/wimp.h"
+#include "utils/log.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
static void ro_gui_wimp_cache_furniture_sizes(wimp_w w);
diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c
index 87ed789ff..c86231960 100644
--- a/riscos/wimp_event.c
+++ b/riscos/wimp_event.c
@@ -18,14 +18,14 @@
#include "oslib/osbyte.h"
#include "oslib/serviceinternational.h"
#include "oslib/wimp.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/ucstables.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/gui.h"
+#include "riscos/dialog.h"
+#include "riscos/menus.h"
+#include "riscos/ucstables.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/utils.h"
#define WIN_HASH_SIZE 32
#define WIN_HASH(w) (((unsigned)(w) >> 5) % WIN_HASH_SIZE)
diff --git a/riscos/window.c b/riscos/window.c
index 7195064a0..fe7ffa315 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -24,42 +24,42 @@
#include "oslib/colourtrans.h"
#include "oslib/osbyte.h"
#include "oslib/osfile.h"
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/css/css.h"
-#include "netsurf/desktop/browser.h"
-#include "netsurf/desktop/frames.h"
-#include "netsurf/desktop/knockout.h"
-#include "netsurf/desktop/plotters.h"
-#include "netsurf/desktop/textinput.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/render/box.h"
-#include "netsurf/render/form.h"
-#include "netsurf/riscos/bitmap.h"
-#include "netsurf/riscos/buffer.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/global_history.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/gui/status_bar.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/save.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/thumbnail.h"
-#include "netsurf/riscos/url_complete.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/talloc.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/utils/messages.h"
+#include "utils/config.h"
+#include "content/content.h"
+#include "content/urldb.h"
+#include "css/css.h"
+#include "desktop/browser.h"
+#include "desktop/frames.h"
+#include "desktop/knockout.h"
+#include "desktop/plotters.h"
+#include "desktop/textinput.h"
+#include "desktop/tree.h"
+#include "desktop/gui.h"
+#include "render/box.h"
+#include "render/form.h"
+#include "riscos/bitmap.h"
+#include "riscos/buffer.h"
+#include "riscos/dialog.h"
+#include "riscos/global_history.h"
+#include "riscos/gui.h"
+#include "riscos/gui/status_bar.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/save.h"
+#include "riscos/theme.h"
+#include "riscos/thumbnail.h"
+#include "riscos/url_complete.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/talloc.h"
+#include "utils/url.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
+#include "utils/messages.h"
#ifndef wimp_KEY_END
#define wimp_KEY_END wimp_KEY_COPY
diff --git a/scandeps b/scandeps
index e60c5b8f1..3a5b64092 100755
--- a/scandeps
+++ b/scandeps
@@ -2,10 +2,7 @@
%include = ();
-die "Usage: scandeps prefix object_dirs -- sources" if (@ARGV < 4);
-
-$prefix = shift @ARGV;
-$prefix = $prefix; # silence warning
+die "Usage: scandeps object_dirs -- sources" if (@ARGV < 3);
@objdirs = ();
while (($z = shift @ARGV) ne "--") {
@@ -16,8 +13,8 @@ while (($z = shift @ARGV) ne "--") {
foreach my $file (@ARGV) {
open FILE, "<$file" or die "Failed to open $file: $!";
while (my $line = <FILE>) {
- if ($line =~ m|#include "$prefix/?([^"]+)"|) {
- $include{$file}{$1} = 1;
+ if ($line =~ m|#include "([^"]+)"|) {
+ $include{$file}{$1} = 1 if (-e $1);
}
}
close FILE;
diff --git a/utils/container.c b/utils/container.c
index c85e15ef1..eaeda5a98 100644
--- a/utils/container.c
+++ b/utils/container.c
@@ -20,8 +20,8 @@
#include <string.h>
#include <stdbool.h>
#include <arpa/inet.h>
-#include "netsurf/utils/container.h"
-#include "netsurf/utils/config.h"
+#include "utils/container.h"
+#include "utils/config.h"
#ifdef WITH_MMAP
#include <sys/mman.h>
#endif
diff --git a/utils/filename.c b/utils/filename.c
index 84b286dfc..85e0db4ab 100644
--- a/utils/filename.c
+++ b/utils/filename.c
@@ -17,10 +17,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
-#include "netsurf/utils/filename.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/filename.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utils.h"
#define FULL_WORD (unsigned int)4294967295
/* '0' + '0' * 10 */
diff --git a/utils/hashtable.c b/utils/hashtable.c
index 6c82be0b4..a06b5c45a 100644
--- a/utils/hashtable.c
+++ b/utils/hashtable.c
@@ -16,8 +16,8 @@
#include <assert.h>
#include <stdio.h>
#endif
-#include "netsurf/utils/hashtable.h"
-#include "netsurf/utils/log.h"
+#include "utils/hashtable.h"
+#include "utils/log.h"
struct hash_entry {
diff --git a/utils/log.h b/utils/log.h
index 86a933a40..db2c4caac 100644
--- a/utils/log.h
+++ b/utils/log.h
@@ -7,7 +7,7 @@
*/
#include <stdio.h>
-#include "netsurf/desktop/netsurf.h"
+#include "desktop/netsurf.h"
#ifndef _NETSURF_LOG_H_
#define _NETSURF_LOG_H_
diff --git a/utils/messages.c b/utils/messages.c
index a10eec025..de5946423 100644
--- a/utils/messages.c
+++ b/utils/messages.c
@@ -18,10 +18,10 @@
#include <stdio.h>
#include <stdbool.h>
#include <string.h>
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/utils/hashtable.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+#include "utils/hashtable.h"
/** We store the messages in a fixed-size hash table. */
#define HASH_SIZE 101
diff --git a/utils/messages.h b/utils/messages.h
index db1f713c8..183d8bb0f 100644
--- a/utils/messages.h
+++ b/utils/messages.h
@@ -22,7 +22,7 @@
#ifndef _NETSURF_UTILS_MESSAGES_H_
#define _NETSURF_UTILS_MESSAGES_H_
-#include "netsurf/utils/hashtable.h"
+#include "utils/hashtable.h"
void messages_load(const char *path);
struct hash_table *messages_load_ctx(const char *path, struct hash_table *ctx);
diff --git a/utils/themes.c b/utils/themes.c
index 0387a1d1d..cedf82d5b 100644
--- a/utils/themes.c
+++ b/utils/themes.c
@@ -5,7 +5,7 @@
* Copyright 2006 Rob Kendrick <rjek@rjek.com>
*/
-#include "netsurf/utils/themes.h"
+#include "utils/themes.h"
struct theme_descriptor;
diff --git a/utils/themes.h b/utils/themes.h
index bbebec381..7b2ebba9e 100644
--- a/utils/themes.h
+++ b/utils/themes.h
@@ -8,7 +8,7 @@
#ifndef __THEMES_H__
#define __THEMES_H__
-#include "netsurf/image/bitmap.h"
+#include "image/bitmap.h"
struct theme_descriptor;
diff --git a/utils/tt2code b/utils/tt2code
index 8012f31e6..170954da1 100755
--- a/utils/tt2code
+++ b/utils/tt2code
@@ -8,7 +8,7 @@ print <<END;
* Copyright 2003 James Bursa <bursa\@users.sourceforge.net>
*/
-#include "netsurf/utils/utils.h"
+#include "utils/utils.h"
void unicode_transliterate(unsigned int c, char **r)
{
diff --git a/utils/url.c b/utils/url.c
index 8edd373b6..aafc88c22 100644
--- a/utils/url.c
+++ b/utils/url.c
@@ -19,9 +19,9 @@
#include <strings.h>
#include <sys/types.h>
#include <regex.h>
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utils.h"
struct url_components_internal {
char *buffer; /* buffer used for all the following data */
diff --git a/utils/utf8.c b/utils/utf8.c
index b811a6595..69414400e 100644
--- a/utils/utf8.c
+++ b/utils/utf8.c
@@ -17,8 +17,8 @@
#include <iconv.h>
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utf8.h"
+#include "utils/log.h"
+#include "utils/utf8.h"
static utf8_convert_ret utf8_convert(const char *string, size_t len,
const char *from, const char *to, char **result);
diff --git a/utils/utils.c b/utils/utils.c
index cfd7d68aa..f2250b7fa 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -19,12 +19,12 @@
#include <sys/time.h>
#include <regex.h>
#include <time.h>
-#include "netsurf/utils/config.h"
+#include "utils/config.h"
#define NDEBUG
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
char * strip(char * const s)