--- psiconv/trunk/program/psiconv/gen_image.c	2000/10/21 00:49:13	53
+++ psiconv/trunk/program/psiconv/gen_image.c	2000/12/10 16:49:40	58
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "data.h"
+#include "psiconv/data.h"
 #include "gen.h"
 #include <string.h>
 #include "psiconv.h"
@@ -199,7 +199,7 @@
 
 void init_image(void)
 {
-  struct psiconv_fileformat ff;
+  struct psiconv_fileformat_s ff;
 #if IMAGEMAGICK
   MagickInfo *mi;
   ff.output = psiconv_gen_image;