summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-05-23 23:32:16 +0100
committerVincent Sanders <vince@kyllikki.org>2016-05-23 23:32:16 +0100
commit3224d7121aff91ab8d888831dc493ef621e3dd39 (patch)
tree5e4585fd78b6b247a5e602ea1a1d55e0dfe206fb
parent93be8d805e7e1f32638015770446476fef22ceac (diff)
downloadnetsurf-3224d7121aff91ab8d888831dc493ef621e3dd39.tar.gz
netsurf-3224d7121aff91ab8d888831dc493ef621e3dd39.tar.bz2
move image content handlers to accomodate core build changes
-rw-r--r--Makefile6
-rw-r--r--content/Makefile6
-rw-r--r--content/content.c2
-rw-r--r--content/fetchers/about.c2
-rw-r--r--content/handlers/Makefile4
-rw-r--r--content/handlers/image/Makefile (renamed from image/Makefile)0
-rw-r--r--content/handlers/image/bitmap.h (renamed from image/bitmap.h)0
-rw-r--r--content/handlers/image/bmp.c (renamed from image/bmp.c)4
-rw-r--r--content/handlers/image/bmp.h (renamed from image/bmp.h)0
-rw-r--r--content/handlers/image/gif.c (renamed from image/gif.c)6
-rw-r--r--content/handlers/image/gif.h (renamed from image/gif.h)0
-rw-r--r--content/handlers/image/ico.c (renamed from image/ico.c)6
-rw-r--r--content/handlers/image/ico.h (renamed from image/ico.h)0
-rw-r--r--content/handlers/image/image.c (renamed from image/image.c)20
-rw-r--r--content/handlers/image/image.h (renamed from image/image.h)0
-rw-r--r--content/handlers/image/image_cache.c (renamed from image/image_cache.c)6
-rw-r--r--content/handlers/image/image_cache.h (renamed from image/image_cache.h)0
-rw-r--r--content/handlers/image/jpeg.c (renamed from image/jpeg.c)6
-rw-r--r--content/handlers/image/jpeg.h (renamed from image/jpeg.h)0
-rw-r--r--content/handlers/image/nssprite.c (renamed from image/nssprite.c)4
-rw-r--r--content/handlers/image/nssprite.h (renamed from image/nssprite.h)0
-rw-r--r--content/handlers/image/png.c (renamed from image/png.c)6
-rw-r--r--content/handlers/image/png.h (renamed from image/png.h)0
-rw-r--r--content/handlers/image/rsvg.c (renamed from image/rsvg.c)4
-rw-r--r--content/handlers/image/rsvg.h (renamed from image/rsvg.h)0
-rw-r--r--content/handlers/image/svg.c (renamed from image/svg.c)2
-rw-r--r--content/handlers/image/svg.h (renamed from image/svg.h)0
-rw-r--r--content/handlers/image/video.c (renamed from image/video.c)3
-rw-r--r--content/handlers/image/video.h (renamed from image/video.h)0
-rw-r--r--content/urldb.c2
-rw-r--r--desktop/browser_history.c2
-rw-r--r--desktop/gui_factory.c2
-rw-r--r--desktop/knockout.c2
-rw-r--r--desktop/netsurf.c4
-rw-r--r--desktop/save_pdf.c2
-rw-r--r--desktop/treeview.c2
-rw-r--r--frontends/amiga/bitmap.c2
-rw-r--r--frontends/amiga/download.c2
-rw-r--r--frontends/amiga/dt_anim.c2
-rw-r--r--frontends/amiga/dt_picture.c4
-rw-r--r--frontends/amiga/gui.c2
-rw-r--r--frontends/amiga/icon.c2
-rw-r--r--frontends/atari/bitmap.c2
-rw-r--r--frontends/atari/plot/plot.c2
-rw-r--r--frontends/beos/bitmap.cpp2
-rw-r--r--frontends/cocoa/apple_image.m2
-rw-r--r--frontends/framebuffer/bitmap.c2
-rw-r--r--frontends/framebuffer/framebuffer.c2
-rw-r--r--frontends/gtk/bitmap.c2
-rw-r--r--frontends/monkey/bitmap.c2
-rw-r--r--frontends/riscos/bitmap.c2
-rw-r--r--frontends/riscos/save.c2
-rw-r--r--frontends/riscos/window.c2
-rw-r--r--frontends/windows/bitmap.c2
-rw-r--r--render/html.c2
-rw-r--r--render/html_redraw.c2
-rw-r--r--test/urldbtest.c2
57 files changed, 76 insertions, 71 deletions
diff --git a/Makefile b/Makefile
index 4af0a0391..35e734e60 100644
--- a/Makefile
+++ b/Makefile
@@ -585,9 +585,6 @@ include frontends/Makefile
# Content sources
include content/Makefile
-# Content fetchers sources
-include content/fetchers/Makefile
-
# CSS sources
include css/Makefile
@@ -606,9 +603,6 @@ include desktop/Makefile
# Javascript source
include javascript/Makefile
-# Image content handler sources
-include image/Makefile
-
# S_COMMON are sources common to all builds
S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_CSS) $(S_RENDER) $(S_UTILS) \
$(S_HTTP) $(S_DESKTOP) $(S_JAVASCRIPT)
diff --git a/content/Makefile b/content/Makefile
index ab257eaea..02490618a 100644
--- a/content/Makefile
+++ b/content/Makefile
@@ -9,3 +9,9 @@ ifeq ($(NETSURF_FS_BACKING_STORE),YES)
endif
S_CONTENT := $(addprefix content/,$(S_CONTENT))
+
+# Content fetchers sources
+include content/fetchers/Makefile
+
+# Content handlers
+include content/handlers/Makefile
diff --git a/content/content.c b/content/content.c
index e112f3844..9b53a4971 100644
--- a/content/content.c
+++ b/content/content.c
@@ -32,8 +32,8 @@
#include "desktop/knockout.h"
#include "desktop/gui_internal.h"
#include "desktop/browser.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "content/content_protected.h"
#include "content/content_debug.h"
#include "content/hlcache.h"
diff --git a/content/fetchers/about.c b/content/fetchers/about.c
index 605d3a8d9..69ca0aed2 100644
--- a/content/fetchers/about.c
+++ b/content/fetchers/about.c
@@ -41,7 +41,7 @@
#include "content/fetchers.h"
#include "content/fetchers/about.h"
#include "content/content_type.h"
-#include "image/image_cache.h"
+#include "content/handlers/image/image_cache.h"
struct fetch_about_context;
diff --git a/content/handlers/Makefile b/content/handlers/Makefile
new file mode 100644
index 000000000..97d2813b4
--- /dev/null
+++ b/content/handlers/Makefile
@@ -0,0 +1,4 @@
+# Image content handler sources
+include content/handlers/image/Makefile
+
+S_IMAGE := $(addprefix content/handlers/,$(S_IMAGE))
diff --git a/image/Makefile b/content/handlers/image/Makefile
index 5851a1c43..5851a1c43 100644
--- a/image/Makefile
+++ b/content/handlers/image/Makefile
diff --git a/image/bitmap.h b/content/handlers/image/bitmap.h
index ef6c1b49b..ef6c1b49b 100644
--- a/image/bitmap.h
+++ b/content/handlers/image/bitmap.h
diff --git a/image/bmp.c b/content/handlers/image/bmp.c
index 2468b4d72..f622f6cb0 100644
--- a/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -32,8 +32,8 @@
#include "desktop/gui_internal.h"
#include "desktop/plotters.h"
-#include "image/bitmap.h"
-#include "image/bmp.h"
+#include "bitmap.h"
+#include "bmp.h"
/** bmp context. */
typedef struct nsbmp_content {
diff --git a/image/bmp.h b/content/handlers/image/bmp.h
index f3b398584..f3b398584 100644
--- a/image/bmp.h
+++ b/content/handlers/image/bmp.h
diff --git a/image/gif.c b/content/handlers/image/gif.c
index 878a42a3c..d8d968e7d 100644
--- a/image/gif.c
+++ b/content/handlers/image/gif.c
@@ -43,9 +43,9 @@
#include "desktop/gui_misc.h"
#include "desktop/gui_internal.h"
-#include "image/image.h"
-#include "image/bitmap.h"
-#include "image/gif.h"
+#include "image.h"
+#include "bitmap.h"
+#include "gif.h"
typedef struct nsgif_content {
struct content base;
diff --git a/image/gif.h b/content/handlers/image/gif.h
index a75821a96..a75821a96 100644
--- a/image/gif.h
+++ b/content/handlers/image/gif.h
diff --git a/image/ico.c b/content/handlers/image/ico.c
index 5f453bc9e..d364fdff5 100644
--- a/image/ico.c
+++ b/content/handlers/image/ico.c
@@ -30,9 +30,9 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "image/image.h"
-#include "image/bitmap.h"
-#include "image/ico.h"
+#include "image.h"
+#include "bitmap.h"
+#include "ico.h"
typedef struct nsico_content {
struct content base;
diff --git a/image/ico.h b/content/handlers/image/ico.h
index 21e9bdb6e..21e9bdb6e 100644
--- a/image/ico.h
+++ b/content/handlers/image/ico.h
diff --git a/image/image.c b/content/handlers/image/image.c
index b9bcf1e97..d1743697d 100644
--- a/image/image.c
+++ b/content/handlers/image/image.c
@@ -26,16 +26,16 @@
#include "desktop/plotters.h"
#include "desktop/gui_internal.h"
-#include "image/bitmap.h"
-#include "image/bmp.h"
-#include "image/gif.h"
-#include "image/ico.h"
-#include "image/jpeg.h"
-#include "image/nssprite.h"
-#include "image/png.h"
-#include "image/rsvg.h"
-#include "image/svg.h"
-#include "image/image.h"
+#include "bitmap.h"
+#include "bmp.h"
+#include "gif.h"
+#include "ico.h"
+#include "jpeg.h"
+#include "nssprite.h"
+#include "png.h"
+#include "rsvg.h"
+#include "svg.h"
+#include "image.h"
/**
* Initialise image content handlers
diff --git a/image/image.h b/content/handlers/image/image.h
index eb9482583..eb9482583 100644
--- a/image/image.h
+++ b/content/handlers/image/image.h
diff --git a/image/image_cache.c b/content/handlers/image/image_cache.c
index 9f217f860..49370ad6e 100644
--- a/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -29,9 +29,9 @@
#include "desktop/gui_misc.h"
#include "desktop/gui_internal.h"
-#include "image/bitmap.h"
-#include "image/image_cache.h"
-#include "image/image.h"
+#include "bitmap.h"
+#include "image_cache.h"
+#include "image.h"
/** Age of an entry within the cache
*
diff --git a/image/image_cache.h b/content/handlers/image/image_cache.h
index 2f1a5caee..2f1a5caee 100644
--- a/image/image_cache.h
+++ b/content/handlers/image/image_cache.h
diff --git a/image/jpeg.c b/content/handlers/image/jpeg.c
index cf265b47a..b5eade306 100644
--- a/image/jpeg.c
+++ b/content/handlers/image/jpeg.c
@@ -33,12 +33,12 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "image/image_cache.h"
-#include "image/bitmap.h"
+#include "image_cache.h"
+#include "bitmap.h"
#define JPEG_INTERNAL_OPTIONS
#include "jpeglib.h"
-#include "image/jpeg.h"
+#include "jpeg.h"
/** absolute minimum size of a jpeg below which it is not even worth
* trying to read header data
diff --git a/image/jpeg.h b/content/handlers/image/jpeg.h
index 8c054732b..8c054732b 100644
--- a/image/jpeg.h
+++ b/content/handlers/image/jpeg.h
diff --git a/image/nssprite.c b/content/handlers/image/nssprite.c
index 0fe25270b..fd651e0b0 100644
--- a/image/nssprite.c
+++ b/content/handlers/image/nssprite.c
@@ -32,8 +32,8 @@
#include "desktop/gui_internal.h"
#include "desktop/plotters.h"
-#include "image/bitmap.h"
-#include "image/nssprite.h"
+#include "bitmap.h"
+#include "nssprite.h"
typedef struct nssprite_content {
struct content base;
diff --git a/image/nssprite.h b/content/handlers/image/nssprite.h
index 38226f84e..38226f84e 100644
--- a/image/nssprite.h
+++ b/content/handlers/image/nssprite.h
diff --git a/image/png.c b/content/handlers/image/png.c
index 11903cbd3..4f6f17d58 100644
--- a/image/png.c
+++ b/content/handlers/image/png.c
@@ -28,9 +28,9 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "image/image_cache.h"
-#include "image/bitmap.h"
-#include "image/png.h"
+#include "image_cache.h"
+#include "bitmap.h"
+#include "png.h"
/* accommodate for old versions of libpng (beware security holes!) */
diff --git a/image/png.h b/content/handlers/image/png.h
index 3a2e3741f..3a2e3741f 100644
--- a/image/png.h
+++ b/content/handlers/image/png.h
diff --git a/image/rsvg.c b/content/handlers/image/rsvg.c
index b781125bf..bd773682f 100644
--- a/image/rsvg.c
+++ b/content/handlers/image/rsvg.c
@@ -45,8 +45,8 @@
#include "desktop/plotters.h"
#include "desktop/gui_internal.h"
-#include "image/bitmap.h"
-#include "image/rsvg.h"
+#include "bitmap.h"
+#include "rsvg.h"
typedef struct rsvg_content {
struct content base;
diff --git a/image/rsvg.h b/content/handlers/image/rsvg.h
index f38f8b0e8..f38f8b0e8 100644
--- a/image/rsvg.h
+++ b/content/handlers/image/rsvg.h
diff --git a/image/svg.c b/content/handlers/image/svg.c
index 63cdb3bf8..c91b00650 100644
--- a/image/svg.c
+++ b/content/handlers/image/svg.c
@@ -32,7 +32,7 @@
#include "css/css.h"
#include "desktop/plotters.h"
-#include "image/svg.h"
+#include "svg.h"
typedef struct svg_content {
struct content base;
diff --git a/image/svg.h b/content/handlers/image/svg.h
index 96b9c3879..96b9c3879 100644
--- a/image/svg.h
+++ b/content/handlers/image/svg.h
diff --git a/image/video.c b/content/handlers/image/video.c
index 1cbbeebf0..53b654337 100644
--- a/image/video.c
+++ b/content/handlers/image/video.c
@@ -20,7 +20,8 @@
#include "content/content_factory.h"
#include "content/content_protected.h"
-#include "image/video.h"
+
+#include "video.h"
typedef struct nsvideo_content {
struct content base;
diff --git a/image/video.h b/content/handlers/image/video.h
index 376c837ba..376c837ba 100644
--- a/image/video.h
+++ b/content/handlers/image/video.h
diff --git a/content/urldb.c b/content/urldb.c
index 0b59e1f4d..b11ec987e 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -104,7 +104,7 @@
#include "utils/utils.h"
#include "utils/bloom.h"
#include "utils/time.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "desktop/cookie_manager.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/browser_history.c b/desktop/browser_history.c
index f2b0fb3ee..b90884e04 100644
--- a/desktop/browser_history.c
+++ b/desktop/browser_history.c
@@ -35,7 +35,7 @@
#include "content/hlcache.h"
#include "content/urldb.h"
#include "css/css.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "desktop/gui_layout.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index 956c508e6..f43e1c9fd 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -23,7 +23,7 @@
#include "utils/config.h"
#include "utils/errors.h"
#include "utils/file.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "content/hlcache.h"
#include "content/backing_store.h"
diff --git a/desktop/knockout.c b/desktop/knockout.c
index 54e371ccd..22aac8693 100644
--- a/desktop/knockout.c
+++ b/desktop/knockout.c
@@ -69,7 +69,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/errors.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "content/content.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 46d8d6728..440e14081 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -38,8 +38,8 @@
#include "content/mimesniff.h"
#include "content/urldb.h"
#include "css/css.h"
-#include "image/image.h"
-#include "image/image_cache.h"
+#include "content/handlers/image/image.h"
+#include "content/handlers/image/image_cache.h"
#include "javascript/js.h"
#include "render/html.h"
#include "render/textplain.h"
diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
index 8fd67959f..0168d0203 100644
--- a/desktop/save_pdf.c
+++ b/desktop/save_pdf.c
@@ -60,7 +60,7 @@
#include "desktop/plotters.h"
#include "desktop/print.h"
#include "desktop/printer.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "utils/log.h"
#include "utils/utils.h"
#include "utils/useragent.h"
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 97cf30d23..6b04eacb9 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -24,7 +24,7 @@
#include "utils/log.h"
#include "css/utils.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "content/hlcache.h"
#include "desktop/system_colour.h"
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index d04857262..62a5fdf1b 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -50,7 +50,7 @@
#include "content/hlcache.h"
#include "desktop/mouse.h"
#include "desktop/gui_window.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "amiga/gui.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index a0bc5c47b..c646a5fa2 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -54,7 +54,7 @@
#include "desktop/mouse.h"
#include "desktop/gui_window.h"
#include "desktop/gui_download.h"
-#include "image/ico.h"
+#include "content/handlers/image/ico.h"
#include "amiga/gui.h"
#include "amiga/download.h"
diff --git a/frontends/amiga/dt_anim.c b/frontends/amiga/dt_anim.c
index a3bfb1d66..824609985 100644
--- a/frontends/amiga/dt_anim.c
+++ b/frontends/amiga/dt_anim.c
@@ -39,7 +39,7 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "amiga/bitmap.h"
#include "amiga/filetype.h"
diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c
index aa2418dca..6d7d5aae8 100644
--- a/frontends/amiga/dt_picture.c
+++ b/frontends/amiga/dt_picture.c
@@ -35,8 +35,8 @@
#include "utils/messages.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
-#include "image/bitmap.h"
-#include "image/image_cache.h"
+#include "content/handlers/image/bitmap.h"
+#include "content/handlers/image/image_cache.h"
#include "amiga/bitmap.h"
#include "amiga/filetype.h"
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index c6c963312..b3f417180 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -100,7 +100,7 @@
#include "content/fetchers.h"
#include "content/fetchers/resource.h"
#include "content/urldb.h"
-#include "image/ico.h"
+#include "content/handlers/image/ico.h"
#include "desktop/browser_history.h"
#include "desktop/browser.h"
#include "desktop/hotlist.h"
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index e75bf82b0..816361283 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -42,7 +42,7 @@
#include "utils/utils.h"
#include "utils/file.h"
#include "desktop/plotters.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "content/content_protected.h"
#include "amiga/os3support.h"
diff --git a/frontends/atari/bitmap.c b/frontends/atari/bitmap.c
index a159a6659..680fe97a0 100644
--- a/frontends/atari/bitmap.c
+++ b/frontends/atari/bitmap.c
@@ -24,7 +24,7 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "desktop/mouse.h"
#include "atari/bitmap.h"
diff --git a/frontends/atari/plot/plot.c b/frontends/atari/plot/plot.c
index 45e4cead2..4f4d08cb9 100644
--- a/frontends/atari/plot/plot.c
+++ b/frontends/atari/plot/plot.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "desktop/plotters.h"
#include "desktop/mouse.h"
diff --git a/frontends/beos/bitmap.cpp b/frontends/beos/bitmap.cpp
index 26b7a3957..7adaae7e7 100644
--- a/frontends/beos/bitmap.cpp
+++ b/frontends/beos/bitmap.cpp
@@ -42,7 +42,7 @@ extern "C" {
#include "content/urldb.h"
#include "desktop/plotters.h"
#include "desktop/browser.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
}
#include "beos/bitmap.h"
diff --git a/frontends/cocoa/apple_image.m b/frontends/cocoa/apple_image.m
index 8261e8bc6..4f8deeb99 100644
--- a/frontends/cocoa/apple_image.m
+++ b/frontends/cocoa/apple_image.m
@@ -22,7 +22,7 @@
#include "utils/config.h"
#include "content/content_protected.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "desktop/plotters.h"
#include "utils/utils.h"
diff --git a/frontends/framebuffer/bitmap.c b/frontends/framebuffer/bitmap.c
index b4907ada6..925b6feb8 100644
--- a/frontends/framebuffer/bitmap.c
+++ b/frontends/framebuffer/bitmap.c
@@ -30,7 +30,7 @@
#include "utils/log.h"
#include "utils/utils.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "desktop/plotters.h"
#include "content/content.h"
diff --git a/frontends/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c
index 57dfecb4d..bd94403fb 100644
--- a/frontends/framebuffer/framebuffer.c
+++ b/frontends/framebuffer/framebuffer.c
@@ -33,7 +33,7 @@
#include "utils/utf8.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/gtk/bitmap.c b/frontends/gtk/bitmap.c
index f8dcf1d17..08dee61be 100644
--- a/frontends/gtk/bitmap.c
+++ b/frontends/gtk/bitmap.c
@@ -33,7 +33,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "content/content.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "desktop/plotters.h"
#include "gtk/scaffolding.h"
diff --git a/frontends/monkey/bitmap.c b/frontends/monkey/bitmap.c
index 5605073ba..daf90b43a 100644
--- a/frontends/monkey/bitmap.c
+++ b/frontends/monkey/bitmap.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include "utils/errors.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "monkey/bitmap.h"
diff --git a/frontends/riscos/bitmap.c b/frontends/riscos/bitmap.c
index cc4be590c..b56000f95 100644
--- a/frontends/riscos/bitmap.c
+++ b/frontends/riscos/bitmap.c
@@ -45,7 +45,7 @@
#include "utils/messages.h"
#include "desktop/plotters.h"
#include "content/content.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "riscos/gui.h"
#include "riscos/image.h"
diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c
index 27330700c..468ede6f6 100644
--- a/frontends/riscos/save.c
+++ b/frontends/riscos/save.c
@@ -49,7 +49,7 @@
#include "desktop/save_complete.h"
#include "desktop/save_text.h"
#include "desktop/gui_window.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "render/form.h"
#include "riscos/bitmap.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index ab1501cd6..ff8902770 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -65,7 +65,7 @@
#include "desktop/textinput.h"
#include "desktop/tree.h"
#include "desktop/gui_window.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "render/form.h"
#include "riscos/bitmap.h"
diff --git a/frontends/windows/bitmap.c b/frontends/windows/bitmap.c
index 664244838..1a7856104 100644
--- a/frontends/windows/bitmap.c
+++ b/frontends/windows/bitmap.c
@@ -30,7 +30,7 @@
#include <windows.h>
#include "utils/log.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "desktop/plotters.h"
#include "content/content.h"
diff --git a/render/html.c b/render/html.c
index c809ee159..ecbd99c2a 100644
--- a/render/html.c
+++ b/render/html.c
@@ -46,7 +46,7 @@
#include "desktop/selection.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "javascript/js.h"
#include "desktop/browser.h"
#include "desktop/gui_utf8.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 969b74f87..93c136fb0 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -49,7 +49,7 @@
#include "desktop/print.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "desktop/gui_layout.h"
#include "desktop/gui_internal.h"
diff --git a/test/urldbtest.c b/test/urldbtest.c
index 7a0337970..efe33be05 100644
--- a/test/urldbtest.c
+++ b/test/urldbtest.c
@@ -30,7 +30,7 @@
#include <curl/curl.h>
#include "utils/errors.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
#include "content/content.h"
#include "content/urldb.h"
#include "desktop/cookie_manager.h"