13 files changed, 59 insertions, 59 deletions
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;