1 files changed, 2 insertions, 27 deletions
diff --git a/include/samus.h b/include/samus.h
index c90b8cad..215fe573 100644
--- a/include/samus.h
+++ b/include/samus.h
@@ -7,31 +7,6 @@
 #error "fitz.h must be included before samus.h"
 #endif
 
-/*
- * ZIP archive
- */
-
-typedef struct sa_zip_s sa_zip;
-typedef struct sa_zipent_s sa_zipent;
-
-struct sa_zipent_s
-{
-	unsigned offset;
-	unsigned csize;
-	unsigned usize;
-	char *name;
-};
-
-struct sa_zip_s
-{
-	fz_file *file;
-	int len;
-	sa_zipent *table;
-};
-
-fz_error *sa_openzip(sa_zip **zipp, char *filename);
-void sa_debugzip(sa_zip *zip);
-void sa_closezip(sa_zip *zip);
-fz_error *sa_openzipstream(sa_zip *zip, char *name);
-void sa_closezipstream(sa_zip *zip);
+#include "samus/zip.h"
+#include "samus/xml.h"