move plotters header into public API

content/content.c

@@ -28,7 +28,6 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "desktop/plotters.h"
 #include "desktop/knockout.h"
 #include "desktop/gui_internal.h"
 #include "netsurf/browser_window.h"

content/handlers/image/bmp.c

@@ -30,7 +30,7 @@
 #include "utils/messages.h"
 #include "content/content_protected.h"
 #include "desktop/gui_internal.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/bitmap.h"
 
 #include "bmp.h"

content/handlers/image/image.c

@@ -23,7 +23,7 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "content/content.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/gui_internal.h"
 #include "netsurf/bitmap.h"
 

content/handlers/image/nssprite.c

@@ -30,7 +30,7 @@
 #include "utils/messages.h"
 #include "content/content_protected.h"
 #include "desktop/gui_internal.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/bitmap.h"
 
 #include "nssprite.h"

content/handlers/image/rsvg.c

@@ -42,7 +42,7 @@
 #include "utils/utils.h"
 #include "utils/messages.h"
 #include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/gui_internal.h"
 #include "netsurf/bitmap.h"
 

content/handlers/image/svg.c

@@ -30,7 +30,7 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "svg.h"
 

desktop/browser.c

@@ -68,7 +68,7 @@
 #include "desktop/knockout.h"
 #include "desktop/scrollbar.h"
 #include "desktop/selection.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/theme.h"
 #include "netsurf/misc.h"
 #include "netsurf/window.h"

desktop/browser_history.c

@@ -40,7 +40,7 @@
 #include "desktop/gui_internal.h"
 #include "desktop/browser_history.h"
 #include "desktop/browser_private.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #define WIDTH 100
 #define HEIGHT 86

desktop/knockout.c

@@ -74,7 +74,7 @@
 
 #include "desktop/gui_internal.h"
 #include "desktop/knockout.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 /* Define to enable knockout debug */
 #undef KNOCKOUT_DEBUG

desktop/knockout.h

@@ -23,7 +23,7 @@
 #ifndef _NETSURF_DESKTOP_KNOCKOUT_H_
 #define _NETSURF_DESKTOP_KNOCKOUT_H_
 
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 
 bool knockout_plot_start(const struct redraw_context *ctx,

desktop/plot_style.c

@@ -23,7 +23,7 @@
  * These plot styles are globaly available and used in many places.
  */
 
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 static plot_style_t plot_style_fill_white_static = {
 	.fill_type = PLOT_OP_TYPE_SOLID,

desktop/print.c

@@ -35,7 +35,7 @@
 #include "content/handlers/css/utils.h"
 #include "render/box.h"
 
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/print.h"
 #include "desktop/printer.h"
 

desktop/save_pdf.c

@@ -62,7 +62,7 @@
 #include "utils/nsoption.h"
 #include "netsurf/bitmap.h"
 
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/print.h"
 #include "desktop/printer.h"
 

desktop/scrollbar.c

@@ -34,7 +34,7 @@
 #include "desktop/system_colour.h"
 #include "netsurf/mouse.h"
 #include "desktop/scrollbar.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/plot_style.h"
 
 

desktop/selection.c

@@ -39,7 +39,7 @@
 
 #include "netsurf/mouse.h"
 #include "desktop/browser_private.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/save_text.h"
 #include "desktop/selection.h"
 #include "netsurf/clipboard.h"

desktop/textarea.c

@@ -35,7 +35,7 @@
 #include "netsurf/mouse.h"
 #include "desktop/textarea.h"
 #include "desktop/textinput.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/scrollbar.h"
 #include "netsurf/clipboard.h"
 #include "netsurf/layout.h"

desktop/treeview.c

@@ -29,7 +29,7 @@
 
 #include "desktop/system_colour.h"
 #include "desktop/knockout.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/textarea.h"
 #include "desktop/treeview.h"
 #include "netsurf/clipboard.h"

frontends/amiga/clipboard.c

@@ -32,7 +32,7 @@
 #include "utils/nsurl.h"
 #include "content/hlcache.h"
 #include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/textinput.h"
 #include "netsurf/window.h"
 #include "netsurf/clipboard.h"

frontends/amiga/dt_anim.c

@@ -38,7 +38,7 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/bitmap.h"
 
 #include "amiga/bitmap.h"

frontends/amiga/dt_picture.c

@@ -34,7 +34,7 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/bitmap.h"
 #include "content/handlers/image/image_cache.h"
 

frontends/amiga/dt_sound.c

@@ -26,7 +26,7 @@
 #include "amiga/filetype.h"
 #include "amiga/datatypes.h"
 #include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "render/box.h"
 #include "utils/log.h"
 #include "utils/messages.h"

frontends/amiga/font.h

@@ -19,7 +19,7 @@
 #ifndef AMIGA_FONT_H
 #define AMIGA_FONT_H
 
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "utils/errors.h"
 #include <graphics/rastport.h>
 #include <graphics/text.h>

frontends/amiga/history_local.c

@@ -46,7 +46,7 @@
 #include "utils/messages.h"
 #include "desktop/browser_history.h"
 #include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/window.h"
 #include "graphics/rpattr.h"
 

frontends/amiga/icon.c

@@ -41,7 +41,7 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/file.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/bitmap.h"
 #include "content/content_protected.h"
 

frontends/amiga/plotters.h

@@ -18,7 +18,7 @@
 
 #ifndef AMIGA_PLOTTERS_H
 #define AMIGA_PLOTTERS_H
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include <proto/layers.h>
 #include <proto/graphics.h>
 

frontends/amiga/plugin_hack.c

@@ -28,7 +28,7 @@
 #include "amiga/plugin_hack.h"
 #include "content/content_protected.h"
 #include "content/hlcache.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 

frontends/amiga/print.c

@@ -49,7 +49,7 @@
 #include "utils/nsoption.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/printer.h"
 #include "desktop/print.h"
 #include "netsurf/layout.h"

frontends/atari/cookies.c

@@ -21,7 +21,7 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "netsurf/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/core_window.h"
 

frontends/atari/font.c

@@ -26,7 +26,7 @@
 #include "utils/nsoption.h"
 #include "netsurf/layout.h"
 #include "netsurf/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "atari/gui.h"
 #include "atari/plot/fontplot.h"

frontends/atari/plot/plot.c

@@ -30,7 +30,7 @@
 #include "utils/utf8.h"
 #include "utils/utils.h"
 #include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/mouse.h"
 
 #include "atari/gui.h"

frontends/atari/rootwin.c

@@ -39,7 +39,7 @@
 #include "utils/log.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/textinput.h"
 #include "content/content.h"
 #include "content/hlcache.h"

frontends/atari/statusbar.c

@@ -29,7 +29,7 @@
 
 #include "utils/log.h"
 #include "netsurf/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "atari/gui.h"
 #include "atari/statusbar.h"

frontends/atari/toolbar.c

@@ -35,7 +35,7 @@
 #include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
 #include "desktop/plot_style.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/tree.h"
 #include "desktop/hotlist.h"
 #include "desktop/textarea.h"

frontends/atari/treeview.c

@@ -28,7 +28,7 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "content/urldb.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/mouse.h"
 #include "desktop/treeview.h"
 

frontends/beos/bitmap.cpp

@@ -40,7 +40,7 @@ extern "C" {
 #include "utils/log.h"
 #include "content/content.h"
 #include "content/urldb.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/bitmap.h"
 }

frontends/beos/cookies.cpp

@@ -24,7 +24,7 @@ extern "C" {
 #include "netsurf/mouse.h"
 #include "utils/log.h"
 #include "desktop/cookie_manager.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/tree.h"
 #include "desktop/textinput.h"
 #include "content/urldb.h"

frontends/beos/plotters.cpp

@@ -31,7 +31,7 @@
 #include <View.h>
 #include <Shape.h>
 extern "C" {
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "utils/log.h"
 #include "utils/utils.h"
 #include "utils/nsoption.h"

frontends/beos/scaffolding.cpp

@@ -59,7 +59,7 @@ extern "C" {
 #include "desktop/version.h"
 #include "desktop/searchweb.h"
 #include "desktop/search.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "utils/nsoption.h"
 #include "desktop/textinput.h"
 #include "render/form.h"

frontends/beos/window.cpp

@@ -32,7 +32,7 @@ extern "C" {
 #include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
 #include "desktop/textinput.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/window.h"
 #include "netsurf/clipboard.h"
 }

frontends/cocoa/BrowserView.m

@@ -19,7 +19,7 @@
 #import "utils/nsoption.h"
 #import "utils/messages.h"
 #import "netsurf/browser_window.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
 #import "desktop/textinput.h"
 #import "content/hlcache.h"
 

frontends/cocoa/HistoryView.m

@@ -24,7 +24,7 @@
 #import "cocoa/BrowserView.h"
 
 #import "desktop/browser_history.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
 
 @implementation HistoryView
 

frontends/cocoa/NetsurfApp.m

@@ -33,7 +33,7 @@
 #import "utils/utils.h"
 #import "content/urldb.h"
 #import "utils/nsoption.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
 #import "desktop/save_complete.h"
 #import "desktop/textinput.h"
 #import "desktop/tree.h"

frontends/cocoa/Tree.m

@@ -21,7 +21,7 @@
 #import "cocoa/font.h"
 #import "cocoa/plotter.h"
 
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
 #import "desktop/tree.h"
 
 @implementation Tree

frontends/cocoa/TreeView.m

@@ -19,7 +19,7 @@
 #import "cocoa/TreeView.h"
 #import "cocoa/Tree.h"
 
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
 #import "desktop/textinput.h"
 
 @interface TreeView () <TreeDelegate>

frontends/cocoa/apple_image.m

@@ -23,7 +23,7 @@
 #include "utils/config.h"
 #include "content/content_protected.h"
 #include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "utils/utils.h"
 
 #import "cocoa/schedule.h"

frontends/cocoa/bitmap.m

@@ -24,7 +24,7 @@
 #import <Cocoa/Cocoa.h>
 
 #import "netsurf/browser_window.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
 #import "netsurf/bitmap.h"
 #import "content/urldb.h"
 #import "content/content.h"

frontends/cocoa/font.m

@@ -23,7 +23,7 @@
 
 #import "utils/nsoption.h"
 #import "netsurf/layout.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
 
 
 static NSLayoutManager *cocoa_prepare_layout_manager( const char *string, size_t length, 

frontends/cocoa/plotter.m

@@ -21,7 +21,7 @@
 #import "utils/log.h"
 #import "utils/utils.h"
 #import "netsurf/browser_window.h"
-#import "desktop/plotters.h"
+#import "netsurf/plotters.h"
 #import "desktop/plot_style.h"
 
 #import "cocoa/font.h"

frontends/framebuffer/bitmap.c

@@ -31,7 +31,7 @@
 #include "utils/log.h"
 #include "utils/utils.h"
 #include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "content/content.h"
 
 #include "framebuffer/gui.h"

frontends/framebuffer/fbtk/fbtk.c

@@ -35,7 +35,7 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"

frontends/framebuffer/fbtk/text.c

@@ -29,7 +29,7 @@
 
 #include "utils/log.h"
 #include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"

frontends/framebuffer/framebuffer.c

@@ -32,7 +32,7 @@
 #include "utils/log.h"
 #include "utils/utf8.h"
 #include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/bitmap.h"
 
 #include "framebuffer/gui.h"

frontends/framebuffer/gui.c

@@ -37,7 +37,7 @@
 #include "netsurf/browser_window.h"
 #include "desktop/textinput.h"
 #include "desktop/browser_history.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "netsurf/window.h"
 #include "netsurf/misc.h"
 #include "netsurf/netsurf.h"

frontends/framebuffer/localhistory.c

@@ -25,7 +25,7 @@
 #include <libnsfb_event.h>
 
 #include "desktop/browser_history.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"

frontends/gtk/bitmap.c

@@ -34,7 +34,7 @@
 #include "utils/log.h"
 #include "content/content.h"
 #include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "gtk/scaffolding.h"
 #include "gtk/plotters.h"

frontends/gtk/plotters.c

@@ -32,7 +32,7 @@
 
 #include "utils/log.h"
 #include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "utils/nsoption.h"
 
 #include "gtk/layout_pango.h"

frontends/gtk/print.c

@@ -36,7 +36,7 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "utils/nsoption.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/print.h"
 #include "desktop/printer.h"
 

frontends/gtk/scaffolding.c

@@ -36,7 +36,7 @@
 #include "desktop/browser_history.h"
 #include "netsurf/browser_window.h"
 #include "desktop/hotlist.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/print.h"
 #include "desktop/save_complete.h"
 #ifdef WITH_PDF_EXPORT

frontends/gtk/treeview.c

@@ -33,7 +33,7 @@
 #include "utils/log.h"
 #include "utils/utf8.h"
 #include "desktop/tree.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "gtk/warn.h"
 #include "gtk/compat.h"

frontends/gtk/window.c

@@ -44,7 +44,7 @@
 #include "desktop/searchweb.h"
 #include "desktop/textinput.h"
 #include "netsurf/window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "render/form.h"
 
 #include "gtk/warn.h"

frontends/monkey/browser.c

@@ -28,7 +28,7 @@
 #include "netsurf/mouse.h"
 #include "netsurf/window.h"
 #include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "content/hlcache.h"
 
 #include "monkey/browser.h"

frontends/monkey/plot.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 static bool
 monkey_plot_disc(int x, int y, int radius, const plot_style_t *style)

frontends/riscos/bitmap.c

@@ -43,7 +43,7 @@
 #include "utils/filename.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "content/content.h"
 #include "netsurf/bitmap.h"
 

frontends/riscos/content-handlers/artworks.c

@@ -37,7 +37,7 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "riscos/content-handlers/artworks.h"
 #include "riscos/gui.h"

frontends/riscos/content-handlers/draw.c

@@ -34,7 +34,7 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "riscos/content-handlers/draw.h"
 #include "riscos/gui.h"

frontends/riscos/content-handlers/sprite.c

@@ -33,7 +33,7 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "riscos/gui.h"
 #include "riscos/image.h"

frontends/riscos/gui/progress_bar.c

@@ -30,7 +30,7 @@
 #include "oslib/wimp.h"
 #include "oslib/wimpspriteop.h"
 
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "utils/log.h"
 #include "utils/utils.h"
 

frontends/riscos/gui/status_bar.c

@@ -28,7 +28,7 @@
 #include "oslib/os.h"
 #include "oslib/wimp.h"
 #include "oslib/wimpspriteop.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "utils/log.h"
 #include "utils/utils.h"
 

frontends/riscos/gui/url_bar.c

@@ -38,7 +38,7 @@
 #include "content/hlcache.h"
 #include "content/content.h"
 #include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "riscos/gui.h"
 #include "riscos/hotlist.h"

frontends/riscos/history.c

@@ -31,7 +31,7 @@
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "desktop/browser_history.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "riscos/dialog.h"
 #include "riscos/gui.h"

frontends/riscos/plotters.c

@@ -28,7 +28,7 @@
 
 #include "utils/log.h"
 #include "utils/utils.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "riscos/bitmap.h"
 #include "riscos/image.h"

frontends/riscos/print.c

@@ -39,7 +39,7 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "riscos/gui.h"
 #include "riscos/dialog.h"

frontends/riscos/save_draw.c

@@ -34,7 +34,7 @@
 #include "utils/utils.h"
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "riscos/bitmap.h"
 #include "riscos/gui.h"

frontends/riscos/toolbar.c

@@ -41,7 +41,6 @@
 #include "utils/log.h"
 #include "utils/nsoption.h"
 #include "content/content.h"
-#include "desktop/plotters.h"
 
 #include "riscos/cookies.h"
 #include "riscos/dialog.h"

frontends/riscos/treeview.c

@@ -40,7 +40,7 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "content/urldb.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/textinput.h"
 #include "desktop/tree.h"
 

frontends/riscos/window.c

@@ -61,7 +61,7 @@
 #include "desktop/scrollbar.h"
 #include "desktop/frames.h"
 #include "netsurf/mouse.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/textinput.h"
 #include "desktop/tree.h"
 #include "netsurf/window.h"

frontends/windows/bitmap.c

@@ -31,7 +31,7 @@
 
 #include "utils/log.h"
 #include "netsurf/bitmap.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "content/content.h"
 
 #include "windows/plot.h"

frontends/windows/drawable.c

@@ -25,7 +25,7 @@
 
 #include "netsurf/browser_window.h"
 #include "desktop/textinput.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "utils/errors.h"
 #include "utils/log.h"
 #include "utils/utils.h"

frontends/windows/localhistory.c

@@ -23,7 +23,7 @@
 #include <commctrl.h>
 
 #include "desktop/browser_history.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"

frontends/windows/plot.c

@@ -30,7 +30,7 @@
 #include "utils/utils.h"
 #include "netsurf/mouse.h"
 #include "netsurf/window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 
 #include "windows/bitmap.h"
 #include "windows/font.h"

include/netsurf/browser_window.h

@@ -22,8 +22,8 @@
  * Browser window creation and manipulation interface.
  */
 
-#ifndef _NETSURF_DESKTOP_BROWSER_H_
-#define _NETSURF_DESKTOP_BROWSER_H_
+#ifndef _NETSURF_BROWSER_WINDOW_H_
+#define _NETSURF_BROWSER_WINDOW_H_
 
 #include <stdbool.h>
 #include <stdio.h>

include/netsurf/plotters.h

@@ -16,12 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Target independent plotting (interface).
+/**
+ * \file
+ * Target independent plotting interface.
  */
 
-#ifndef _NETSURF_DESKTOP_PLOTTERS_H_
-#define _NETSURF_DESKTOP_PLOTTERS_H_
+#ifndef _NETSURF_PLOTTERS_H_
+#define _NETSURF_PLOTTERS_H_
 
 #include <stdbool.h>
 #include <stdio.h>

render/form.c

@@ -47,7 +47,7 @@
 #include "netsurf/mouse.h"
 #include "desktop/knockout.h"
 #include "desktop/plot_style.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
 #include "netsurf/misc.h"

render/html_redraw.c

@@ -43,7 +43,7 @@
 #include "content/content_protected.h"
 #include "content/handlers/css/utils.h"
 #include "netsurf/browser_window.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/selection.h"
 #include "desktop/print.h"
 #include "desktop/scrollbar.h"

render/textplain.c

@@ -42,7 +42,7 @@
 #include "content/handlers/css/utils.h"
 #include "netsurf/browser_window.h"
 #include "utils/nsoption.h"
-#include "desktop/plotters.h"
+#include "netsurf/plotters.h"
 #include "desktop/search.h"
 #include "desktop/selection.h"
 #include "desktop/textinput.h"