diff --git a/framebuffer/fbtk/event.c b/framebuffer/fbtk/event.c
index aab150283..c0894921e 100644
--- a/framebuffer/fbtk/event.c
+++ b/framebuffer/fbtk/event.c
@@ -32,7 +32,6 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "desktop/browser.h"
-#include "desktop/plotters.h"
 #include "desktop/textinput.h"
 
 #include "framebuffer/gui.h"
diff --git a/framebuffer/fbtk/text.c b/framebuffer/fbtk/text.c
index 3d3558347..258e9dff9 100644
--- a/framebuffer/fbtk/text.c
+++ b/framebuffer/fbtk/text.c
@@ -29,6 +29,7 @@
 
 #include "utils/log.h"
 #include "desktop/browser.h"
+#include "desktop/plotters.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"
diff --git a/framebuffer/fbtk/user.c b/framebuffer/fbtk/user.c
index 5be0f380f..2b9cc8768 100644
--- a/framebuffer/fbtk/user.c
+++ b/framebuffer/fbtk/user.c
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <libnsfb.h>
 
-#include "desktop/plotters.h"
+#include "desktop/plot_style.h"
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"
 
diff --git a/framebuffer/framebuffer.c b/framebuffer/framebuffer.c
index 7d811aafc..57dfecb4d 100644
--- a/framebuffer/framebuffer.c
+++ b/framebuffer/framebuffer.c
@@ -32,6 +32,7 @@
 #include "utils/log.h"
 #include "utils/utf8.h"
 #include "desktop/browser.h"
+#include "desktop/plotters.h"
 #include "image/bitmap.h"
 
 #include "framebuffer/gui.h"
diff --git a/framebuffer/framebuffer.h b/framebuffer/framebuffer.h
index 5204dbd92..d99049f52 100644
--- a/framebuffer/framebuffer.h
+++ b/framebuffer/framebuffer.h
@@ -1,4 +1,28 @@
-#include "desktop/plotters.h"
+/*
+ * Copyright 2008 Vincent Sanders <vince@simtec.co.uk>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * framebuffer interface.
+ */
+
+#ifndef NETSURF_FB_FRAMEBUFFER_H
+#define NETSURF_FB_FRAMEBUFFER_H
 
 extern const struct plotter_table fb_plotters;
 
@@ -12,3 +36,5 @@ bool framebuffer_set_cursor(struct fbtk_bitmap *bm);
  * @return return old surface
  */
 nsfb_t *framebuffer_set_surface(nsfb_t *new_nsfb);
+
+#endif
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index 7e48b654e..b0b98c546 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -41,6 +41,8 @@
 #include "desktop/gui_window.h"
 #include "desktop/gui_misc.h"
 #include "desktop/netsurf.h"
+#include "content/urldb.h"
+#include "content/fetch.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"
@@ -53,8 +55,6 @@
 #include "framebuffer/fetch.h"
 #include "framebuffer/bitmap.h"
 
-#include "content/urldb.h"
-#include "content/fetch.h"
 
 #define NSFB_TOOLBAR_DEFAULT_LAYOUT "blfsrutc"