Remove unecessary inclusion of the image bitmap header

gtk/thumbnail.c

@@ -35,7 +35,6 @@
 #include "desktop/plotters.h"
 #include "desktop/browser.h"
 #include "desktop/thumbnail.h"
-#include "image/bitmap.h"
 
 #include "gtk/scaffolding.h"
 #include "gtk/plotters.h"

image/bmp.h

@@ -26,8 +26,6 @@
 
 #include <libnsbmp.h>
 
-#include "image/bitmap.h"
-
 extern bmp_bitmap_callback_vt bmp_bitmap_callbacks; /** Only to be used by ICO code.  */
 
 nserror nsbmp_init(void);

image/image_cache.c

@@ -27,6 +27,7 @@
 #include "desktop/gui_misc.h"
 #include "desktop/gui_internal.h"
 
+#include "image/bitmap.h"
 #include "image/image_cache.h"
 #include "image/image.h"
 

image/image_cache.h

@@ -38,10 +38,9 @@
 #define NETSURF_IMAGE_IMAGE_CACHE_H_
 
 #include "utils/errors.h"
-#include "desktop/plotters.h"
-#include "image/bitmap.h"
 
 struct content_redraw_data;
+struct redraw_context;
 
 typedef struct bitmap * (image_cache_convert_fn) (struct content *content);