new world order ii -- revenge of the header files

32 files changed, 64 insertions, 32 deletions

diff --git a/stream/crypt_arc4.c b/stream/crypt_arc4.c
index 86c9afd8..0a5c942f 100644
--- a/stream/crypt_arc4.c
+++ b/stream/crypt_arc4.c
@@ -21,7 +21,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 void
 fz_arc4init(fz_arc4 *arc4, unsigned char *key, unsigned keylen)
diff --git a/stream/crypt_md5.c b/stream/crypt_md5.c
index 03601e5b..cf20024b 100644
--- a/stream/crypt_md5.c
+++ b/stream/crypt_md5.c
@@ -23,7 +23,8 @@ These notices must be retained in any copies of any part of this
 documentation and/or software.
 */
 
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 /* Constants for MD5Transform routine */
 enum
diff --git a/stream/filt_a85d.c b/stream/filt_a85d.c
index 5b2e105e..3db4951a 100644
--- a/stream/filt_a85d.c
+++ b/stream/filt_a85d.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 typedef struct fz_a85d_s fz_a85d;
 
diff --git a/stream/filt_a85e.c b/stream/filt_a85e.c
index d9cd22c6..357bd4de 100644
--- a/stream/filt_a85e.c
+++ b/stream/filt_a85e.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 typedef struct fz_a85e_s fz_a85e;
 
diff --git a/stream/filt_ahxd.c b/stream/filt_ahxd.c
index d0e6d7f5..f54670b2 100644
--- a/stream/filt_ahxd.c
+++ b/stream/filt_ahxd.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 typedef struct fz_ahxd_s fz_ahxd;
 
diff --git a/stream/filt_ahxe.c b/stream/filt_ahxe.c
index c2b882a6..12c8aad0 100644
--- a/stream/filt_ahxe.c
+++ b/stream/filt_ahxe.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 typedef struct fz_ahxe_s fz_ahxe;
 
diff --git a/stream/filt_arc4.c b/stream/filt_arc4.c
index b025368c..3b3c5957 100644
--- a/stream/filt_arc4.c
+++ b/stream/filt_arc4.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 typedef struct fz_arc4c_s fz_arc4c;
 
diff --git a/stream/filt_dctd.c b/stream/filt_dctd.c
index ebdf2f65..38ab3fbf 100644
--- a/stream/filt_dctd.c
+++ b/stream/filt_dctd.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 #include "filt_dctc.h"
 
diff --git a/stream/filt_dcte.c b/stream/filt_dcte.c
index 74f6bbd3..06f3fcbe 100644
--- a/stream/filt_dcte.c
+++ b/stream/filt_dcte.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 #include "filt_dctc.h"
 
diff --git a/stream/filt_faxd.c b/stream/filt_faxd.c
index 19db9cb1..45f9d556 100644
--- a/stream/filt_faxd.c
+++ b/stream/filt_faxd.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 #include "filt_faxd.h"
 #include "filt_faxc.h"
diff --git a/stream/filt_faxe.c b/stream/filt_faxe.c
index c9155e01..97c16c0d 100644
--- a/stream/filt_faxe.c
+++ b/stream/filt_faxe.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 #include "filt_faxe.h"
 #include "filt_faxc.h"
diff --git a/stream/filt_flate.c b/stream/filt_flate.c
index 777d6d56..00310172 100644
--- a/stream/filt_flate.c
+++ b/stream/filt_flate.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 #include <zlib.h>
 
diff --git a/stream/filt_jbig2d.c b/stream/filt_jbig2d.c
index ed54eed3..ce73ee53 100644
--- a/stream/filt_jbig2d.c
+++ b/stream/filt_jbig2d.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 /* TODO: complete rewrite with error checking and use fitz memctx */
 
diff --git a/stream/filt_jpxd.c b/stream/filt_jpxd.c
index 2aa93448..1b93f477 100644
--- a/stream/filt_jpxd.c
+++ b/stream/filt_jpxd.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 /* TODO: bpc */
 
diff --git a/stream/filt_lzwd.c b/stream/filt_lzwd.c
index 95fc462a..bbdb4984 100644
--- a/stream/filt_lzwd.c
+++ b/stream/filt_lzwd.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 /* TODO: error checking */
 
diff --git a/stream/filt_lzwe.c b/stream/filt_lzwe.c
index f2c3c7a4..a24d8fe5 100644
--- a/stream/filt_lzwe.c
+++ b/stream/filt_lzwe.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 #define noDEBUG 1
 
diff --git a/stream/filt_null.c b/stream/filt_null.c
index e83b6d5a..d2c068e9 100644
--- a/stream/filt_null.c
+++ b/stream/filt_null.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 typedef struct fz_nullfilter_s fz_nullfilter;
 
diff --git a/stream/filt_pipeline.c b/stream/filt_pipeline.c
index 7b7f4252..65e1c38d 100644
--- a/stream/filt_pipeline.c
+++ b/stream/filt_pipeline.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 #define noDEBUG 1
 
diff --git a/stream/filt_predict.c b/stream/filt_predict.c
index f3c50f6e..bf4680e7 100644
--- a/stream/filt_predict.c
+++ b/stream/filt_predict.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 /* TODO: check if this works with 16bpp images */
 
diff --git a/stream/filt_rld.c b/stream/filt_rld.c
index c36913d6..dc720fbd 100644
--- a/stream/filt_rld.c
+++ b/stream/filt_rld.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 fz_error *
 fz_newrld(fz_filter **fp, fz_obj *params)
diff --git a/stream/filt_rle.c b/stream/filt_rle.c
index 921e470a..598733e1 100644
--- a/stream/filt_rle.c
+++ b/stream/filt_rle.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 /* TODO: rewrite!
  * make it non-optimal or something,
diff --git a/stream/obj_array.c b/stream/obj_array.c
index c493bdaa..666e113a 100644
--- a/stream/obj_array.c
+++ b/stream/obj_array.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 void fz_droparray(fz_obj *obj);
 
diff --git a/stream/obj_dict.c b/stream/obj_dict.c
index a0fb6d25..2eef56b5 100644
--- a/stream/obj_dict.c
+++ b/stream/obj_dict.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 /* keep either names or strings in the dict. don't mix & match. */
 
diff --git a/stream/obj_parse.c b/stream/obj_parse.c
index c3f3d3dc..bd8133a2 100644
--- a/stream/obj_parse.c
+++ b/stream/obj_parse.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 struct vap { va_list ap; };
 
diff --git a/stream/obj_print.c b/stream/obj_print.c
index 7ada9845..e58462b3 100644
--- a/stream/obj_print.c
+++ b/stream/obj_print.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 struct fmt
 {
diff --git a/stream/obj_simple.c b/stream/obj_simple.c
index 131e11b4..c674f056 100644
--- a/stream/obj_simple.c
+++ b/stream/obj_simple.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 extern void fz_droparray(fz_obj *array);
 extern void fz_dropdict(fz_obj *dict);
diff --git a/stream/stm_buffer.c b/stream/stm_buffer.c
index 7d58e192..4fc5636c 100644
--- a/stream/stm_buffer.c
+++ b/stream/stm_buffer.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 fz_error *
 fz_newbuffer(fz_buffer **bp, int size)
diff --git a/stream/stm_filter.c b/stream/stm_filter.c
index afe4feed..c8091136 100644
--- a/stream/stm_filter.c
+++ b/stream/stm_filter.c
@@ -1,4 +1,5 @@
-#include <fitz.h>
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 fz_error fz_kioneedin = { -1, "<ioneedin>", "<process>", "filter.c", 0 };
 fz_error fz_kioneedout = { -1, "<ioneedout>", "<process>", "filter.c", 0 };
diff --git a/stream/stm_misc.c b/stream/stm_misc.c
index 010676fd..bc739055 100644
--- a/stream/stm_misc.c
+++ b/stream/stm_misc.c
@@ -2,7 +2,8 @@
  * Miscellaneous I/O functions
  */
 
-#include "fitz.h"
+#include "fitz-base.h"
+#include "fitz-stream.h"
 
 int fz_tell(fz_stream *stm)
 {
diff --git a/stream/stm_open.c b/stream/stm_open.c
index d72d9837..baec93fa 100644
--- a/stream/stm_open.c
+++ b/stream/stm_open.c
@@ -2,7 +2,8 @@
  * Creation and destruction.

  */

 

-#include "fitz.h"

+#include "fitz-base.h"
+#include "fitz-stream.h"
 

 static fz_stream *

 newstm(int kind, int mode)

diff --git a/stream/stm_read.c b/stream/stm_read.c
index cb7c5c02..484414c5 100644
--- a/stream/stm_read.c
+++ b/stream/stm_read.c
@@ -2,7 +2,8 @@
  * Input streams.

  */

 

-#include "fitz.h"

+#include "fitz-base.h"
+#include "fitz-stream.h"
 

 int

 fz_makedata(fz_stream *stm)

diff --git a/stream/stm_write.c b/stream/stm_write.c
index 3b4a8baf..e0dad571 100644
--- a/stream/stm_write.c
+++ b/stream/stm_write.c
@@ -2,7 +2,8 @@
  * Output streams.

  */

 

-#include "fitz.h"

+#include "fitz-base.h"
+#include "fitz-stream.h"
 

 int fz_wtell(fz_stream *stm)

 {