--- psiconv/trunk/program/psiconv/psiconv.h	1999/12/02 17:19:23	35
+++ psiconv/trunk/program/psiconv/psiconv.h	2000/12/10 16:49:40	58
@@ -20,11 +20,12 @@
 #ifndef PSICONV_PSICONV_H
 #define PSICONV_PSICONV_H
 
-#include "data.h"
+#include "psiconv/data.h"
 
-typedef int output_function(FILE *, const psiconv_file,const char *);
+typedef int output_function(const char *filename, const psiconv_file,
+                            const char *type);
 
-typedef struct psiconv_fileformat {
+typedef struct psiconv_fileformat_s {
   const char *name;
   const char *description;
   output_function *output;