4 files changed, 5 insertions, 10 deletions
diff --git a/riscos/dialog.c b/riscos/dialog.c
index fd854b857..0244860cc 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -42,7 +42,6 @@
 #include "utils/utils.h"
 #include "desktop/netsurf.h"
 #include "desktop/browser.h"
-#include "render/font.h"
 
 #include "riscos/configure.h"
 #include "riscos/cookies.h"
diff --git a/riscos/font.c b/riscos/font.c
index 7e6c80fe5..db6376a88 100644
--- a/riscos/font.c
+++ b/riscos/font.c
@@ -29,13 +29,11 @@
 #include <oslib/wimp.h>
 #include <oslib/wimpreadsysinfo.h>
 
-#include "css/css.h"
-#include "css/utils.h"
-#include "render/font.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
+#include "desktop/font.h"
 
 #include "riscos/gui.h"
 #include "riscos/font.h"
diff --git a/riscos/plotters.c b/riscos/plotters.c
index 6e49c2278..e3745c5ba 100644
--- a/riscos/plotters.c
+++ b/riscos/plotters.c
@@ -28,7 +28,6 @@
 
 #include "utils/log.h"
 #include "desktop/plotters.h"
-#include "render/font.h"
 
 #include "riscos/bitmap.h"
 #include "riscos/image.h"
@@ -36,7 +35,6 @@
 #include "riscos/font.h"
 #include "riscos/oslib_pre7.h"
 
-
 static bool ro_plot_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style);
 static bool ro_plot_line(int x0, int y0, int x1, int y1, const plot_style_t *style);
 static bool ro_plot_draw_path(const draw_path * const path, int width,
diff --git a/riscos/thumbnail.c b/riscos/thumbnail.c
index 2bdd37251..e259686f8 100644
--- a/riscos/thumbnail.c
+++ b/riscos/thumbnail.c
@@ -31,21 +31,21 @@
 #include "oslib/colourtrans.h"
 #include "oslib/osfile.h"
 #include "oslib/osspriteop.h"
+
+#include "utils/nsoption.h"
+#include "utils/log.h"
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "desktop/plotters.h"
 #include "desktop/thumbnail.h"
 #include "image/bitmap.h"
-#include "render/font.h"
+
 #include "riscos/bitmap.h"
 #include "riscos/gui.h"
-#include "utils/nsoption.h"
 #include "riscos/oslib_pre7.h"
 #include "riscos/thumbnail.h"
 #include "riscos/tinct.h"
-#include "utils/log.h"
-
 
 /*	Whether we can use 32bpp sprites
 */