4 files changed, 42 insertions, 6 deletions
diff --git a/riscos/gif.h b/riscos/gif.h
index b1a0cfc7c..b0c516b36 100644
--- a/riscos/gif.h
+++ b/riscos/gif.h
@@ -8,7 +8,17 @@
 #ifndef _NETSURF_RISCOS_GIF_H_
 #define _NETSURF_RISCOS_GIF_H_
 
-#include "netsurf/content/content.h"
+#include "oslib/osspriteop.h"
+
+struct content;
+
+struct content_gif_data {
+	char *data;
+	unsigned long length;
+	unsigned long buffer_pos;
+	osspriteop_area *sprite_area;
+	char *sprite_image;
+};
 
 void nsgif_init(void);
 void nsgif_create(struct content *c);
diff --git a/riscos/jpeg.h b/riscos/jpeg.h
index d2ba94214..c81cff6b6 100644
--- a/riscos/jpeg.h
+++ b/riscos/jpeg.h
@@ -8,7 +8,12 @@
 #ifndef _NETSURF_RISCOS_JPEG_H_
 #define _NETSURF_RISCOS_JPEG_H_
 
-#include "netsurf/content/content.h"
+struct content;
+
+struct content_jpeg_data {
+	char *data;
+	unsigned long length;
+};
 
 void jpeg_create(struct content *c);
 void jpeg_process_data(struct content *c, char *data, unsigned long size);
diff --git a/riscos/plugin.h b/riscos/plugin.h
index d71e5ef42..babc6310e 100644
--- a/riscos/plugin.h
+++ b/riscos/plugin.h
@@ -9,12 +9,20 @@
 #define _NETSURF_RISCOS_PLUGIN_H_
 
 #include <stdbool.h>
-#include "netsurf/content/content.h"
-#include "netsurf/render/box.h"
-
 #include "oslib/plugin.h"
 #include "oslib/wimp.h"
 
+struct box;
+struct browser_window;
+struct content;
+struct object_params;
+
+struct content_plugin_data {
+	char *data;		/* object data */
+	unsigned long length;	/* object length */
+	char *sysvar;		/* system variable set by plugin */
+};
+
 struct plugin_state {
 	int dummy;
 };
diff --git a/riscos/png.h b/riscos/png.h
index 370fa6ba3..2521630b8 100644
--- a/riscos/png.h
+++ b/riscos/png.h
@@ -8,7 +8,20 @@
 #ifndef _NETSURF_RISCOS_PNG_H_
 #define _NETSURF_RISCOS_PNG_H_
 
-#include "netsurf/content/content.h"
+#include "libpng/png.h"
+#include "oslib/osspriteop.h"
+
+struct content;
+
+struct content_png_data {
+	png_structp png;
+	png_infop info;
+	unsigned long rowbytes;
+	int interlace;
+	osspriteop_area *sprite_area;
+	char *sprite_image;
+	enum { PNG_PALETTE, PNG_DITHER, PNG_DEEP } type;
+};
 
 void nspng_init(void);
 void nspng_create(struct content *c);