summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fitz/base_error.c2
-rw-r--r--fitz/base_hash.c2
-rw-r--r--fitz/base_matrix.c2
-rw-r--r--fitz/base_memory.c2
-rw-r--r--fitz/base_rect.c2
-rw-r--r--fitz/base_string.c3
-rw-r--r--fitz/base_unicode.c2
-rw-r--r--fitz/crypt_aes.c3
-rw-r--r--fitz/crypt_arc4.c3
-rw-r--r--fitz/crypt_crc32.c3
-rw-r--r--fitz/crypt_md5.c3
-rw-r--r--fitz/filt_aesd.c3
-rw-r--r--fitz/filt_arc4.c3
-rw-r--r--fitz/filt_basic.c3
-rw-r--r--fitz/filt_dctd.c4
-rw-r--r--fitz/filt_faxd.c3
-rw-r--r--fitz/filt_flate.c3
-rw-r--r--fitz/filt_jbig2d.c3
-rw-r--r--fitz/filt_jpxd.c3
-rw-r--r--fitz/filt_lzwd.c3
-rw-r--r--fitz/filt_pipeline.c5
-rw-r--r--fitz/filt_predict.c3
-rw-r--r--fitz/fitz_base.h2
-rw-r--r--fitz/node_path.c3
-rw-r--r--fitz/node_text.c3
-rw-r--r--fitz/obj_array.c3
-rw-r--r--fitz/obj_dict.c3
-rw-r--r--fitz/obj_parse.c3
-rw-r--r--fitz/obj_print.c3
-rw-r--r--fitz/obj_simple.c2
-rw-r--r--fitz/res_colorspace.c3
-rw-r--r--fitz/res_font.c5
-rw-r--r--fitz/res_image.c3
-rw-r--r--fitz/res_shade.c3
-rw-r--r--fitz/stm_buffer.c3
-rw-r--r--fitz/stm_filter.c3
-rw-r--r--fitz/stm_misc.c3
-rw-r--r--fitz/stm_open.c3
-rw-r--r--fitz/stm_read.c3
-rw-r--r--fitzdraw/Jamfile2
-rw-r--r--fitzdraw/archppc.c4
-rw-r--r--fitzdraw/archsparc.c4
-rw-r--r--fitzdraw/archx86.c4
-rw-r--r--fitzdraw/blendmodes.c4
-rw-r--r--fitzdraw/glyphcache.c4
-rw-r--r--fitzdraw/imagedraw.c4
-rw-r--r--fitzdraw/imagescale.c4
-rw-r--r--fitzdraw/imageunpack.c4
-rw-r--r--fitzdraw/meshdraw.c4
-rw-r--r--fitzdraw/pathfill.c4
-rw-r--r--fitzdraw/pathscan.c4
-rw-r--r--fitzdraw/pathstroke.c4
-rw-r--r--fitzdraw/pixmap.c4
-rw-r--r--fitzdraw/porterduff.c4
-rw-r--r--fitzdraw/render.c4
55 files changed, 57 insertions, 119 deletions
diff --git a/fitz/base_error.c b/fitz/base_error.c
index fd07bb78..52e1b601 100644
--- a/fitz/base_error.c
+++ b/fitz/base_error.c
@@ -1,4 +1,4 @@
-#include "fitz_base.h"
+#include "fitz.h"
char fz_errorbuf[100*20] = {0};
static int fz_errorlen = 0;
diff --git a/fitz/base_hash.c b/fitz/base_hash.c
index 36533cc1..f999eee9 100644
--- a/fitz/base_hash.c
+++ b/fitz/base_hash.c
@@ -9,7 +9,7 @@
* and removed frequently.
*/
-#include "fitz_base.h"
+#include "fitz.h"
enum { MAXKEYLEN = 16 };
diff --git a/fitz/base_matrix.c b/fitz/base_matrix.c
index 42481733..8bdd6e6c 100644
--- a/fitz/base_matrix.c
+++ b/fitz/base_matrix.c
@@ -1,4 +1,4 @@
-#include "fitz_base.h"
+#include "fitz.h"
void fz_invert3x3(float *dst, float *m)
{
diff --git a/fitz/base_memory.c b/fitz/base_memory.c
index d7b81fc4..3209b333 100644
--- a/fitz/base_memory.c
+++ b/fitz/base_memory.c
@@ -1,4 +1,4 @@
-#include "fitz_base.h"
+#include "fitz.h"
void * fz_malloc(int n)
{
diff --git a/fitz/base_rect.c b/fitz/base_rect.c
index f0606163..d25535f0 100644
--- a/fitz/base_rect.c
+++ b/fitz/base_rect.c
@@ -1,4 +1,4 @@
-#include "fitz_base.h"
+#include "fitz.h"
fz_rect fz_infiniterect = { 1, 1, -1, -1 };
fz_rect fz_emptyrect = { 0, 0, 0, 0 };
diff --git a/fitz/base_string.c b/fitz/base_string.c
index e4b8eb67..e18d8720 100644
--- a/fitz/base_string.c
+++ b/fitz/base_string.c
@@ -1,4 +1,5 @@
-#include "fitz_base.h"
+#include "fitz.h"
+
#include <string.h>
char *fz_strsep(char **stringp, const char *delim)
diff --git a/fitz/base_unicode.c b/fitz/base_unicode.c
index ac860c9c..ca879607 100644
--- a/fitz/base_unicode.c
+++ b/fitz/base_unicode.c
@@ -1,3 +1,5 @@
+#include "fitz.h"
+
enum
{
UTFmax = 4, /* maximum bytes per rune */
diff --git a/fitz/crypt_aes.c b/fitz/crypt_aes.c
index 246739da..33a0b364 100644
--- a/fitz/crypt_aes.c
+++ b/fitz/crypt_aes.c
@@ -36,8 +36,7 @@
* http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
*/
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
#define aes_context fz_aes
diff --git a/fitz/crypt_arc4.c b/fitz/crypt_arc4.c
index 01a5b90d..f53505cf 100644
--- a/fitz/crypt_arc4.c
+++ b/fitz/crypt_arc4.c
@@ -21,8 +21,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
void
fz_arc4init(fz_arc4 *arc4, const unsigned char *key, const unsigned keylen)
diff --git a/fitz/crypt_crc32.c b/fitz/crypt_crc32.c
index c83759ac..2aaefe5e 100644
--- a/fitz/crypt_crc32.c
+++ b/fitz/crypt_crc32.c
@@ -2,8 +2,7 @@
* Compute the CRC-32 of a data buffer
*/
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
static const unsigned long crctab[256] =
{
diff --git a/fitz/crypt_md5.c b/fitz/crypt_md5.c
index 37f6c776..37f0822a 100644
--- a/fitz/crypt_md5.c
+++ b/fitz/crypt_md5.c
@@ -23,8 +23,7 @@ These notices must be retained in any copies of any part of this
documentation and/or software.
*/
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
/* Constants for MD5Transform routine */
enum
diff --git a/fitz/filt_aesd.c b/fitz/filt_aesd.c
index a4425c2e..914d28e0 100644
--- a/fitz/filt_aesd.c
+++ b/fitz/filt_aesd.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
typedef struct fz_aesd_s fz_aesd;
diff --git a/fitz/filt_arc4.c b/fitz/filt_arc4.c
index f50f8e86..79154460 100644
--- a/fitz/filt_arc4.c
+++ b/fitz/filt_arc4.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
typedef struct fz_arc4c_s fz_arc4c;
diff --git a/fitz/filt_basic.c b/fitz/filt_basic.c
index cbbc9907..b5b9f3c9 100644
--- a/fitz/filt_basic.c
+++ b/fitz/filt_basic.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
fz_filter *
fz_newcopyfilter(void)
diff --git a/fitz/filt_dctd.c b/fitz/filt_dctd.c
index 0bfd49ca..3018218a 100644
--- a/fitz/filt_dctd.c
+++ b/fitz/filt_dctd.c
@@ -1,8 +1,6 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
#include <jpeglib.h>
-
#include <setjmp.h>
typedef struct fz_dctd_s fz_dctd;
diff --git a/fitz/filt_faxd.c b/fitz/filt_faxd.c
index b050021d..61238819 100644
--- a/fitz/filt_faxd.c
+++ b/fitz/filt_faxd.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
#include "filt_faxd.h"
diff --git a/fitz/filt_flate.c b/fitz/filt_flate.c
index 65233e6d..46cd4ee8 100644
--- a/fitz/filt_flate.c
+++ b/fitz/filt_flate.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
#include <zlib.h>
diff --git a/fitz/filt_jbig2d.c b/fitz/filt_jbig2d.c
index 3e38b975..9f77ac86 100644
--- a/fitz/filt_jbig2d.c
+++ b/fitz/filt_jbig2d.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
/* TODO: complete rewrite with error checking and use fitz memctx */
diff --git a/fitz/filt_jpxd.c b/fitz/filt_jpxd.c
index a0b68bbe..2a40670d 100644
--- a/fitz/filt_jpxd.c
+++ b/fitz/filt_jpxd.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
#define OPJ_STATIC
#include <openjpeg.h>
diff --git a/fitz/filt_lzwd.c b/fitz/filt_lzwd.c
index d57d399f..85a346a7 100644
--- a/fitz/filt_lzwd.c
+++ b/fitz/filt_lzwd.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
/* TODO: error checking */
diff --git a/fitz/filt_pipeline.c b/fitz/filt_pipeline.c
index 3340e5b0..986ca4e7 100644
--- a/fitz/filt_pipeline.c
+++ b/fitz/filt_pipeline.c
@@ -1,7 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
-
-#define noDEBUG 1
+#include "fitz.h"
typedef struct fz_pipeline_s fz_pipeline;
diff --git a/fitz/filt_predict.c b/fitz/filt_predict.c
index a9958c63..5458a37a 100644
--- a/fitz/filt_predict.c
+++ b/fitz/filt_predict.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
/* TODO: check if this works with 16bpp images */
diff --git a/fitz/fitz_base.h b/fitz/fitz_base.h
index 78efea49..93421511 100644
--- a/fitz/fitz_base.h
+++ b/fitz/fitz_base.h
@@ -167,7 +167,7 @@ extern unsigned fz_cpuflags;
/* plan9 stuff for utf-8 */
int chartorune(int *rune, char *str);
int runetochar(char *str, int *rune);
-int runelen(long c);
+int runelen(int c);
int runenlen(int *r, int nrune);
int fullrune(char *str, int n);
diff --git a/fitz/node_path.c b/fitz/node_path.c
index bca274d3..3813996c 100644
--- a/fitz/node_path.c
+++ b/fitz/node_path.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
+#include "fitz.h"
fz_path *
fz_newpath(void)
diff --git a/fitz/node_text.c b/fitz/node_text.c
index 8f11ed26..923ee221 100644
--- a/fitz/node_text.c
+++ b/fitz/node_text.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
+#include "fitz.h"
fz_text *
fz_newtext(fz_font *font)
diff --git a/fitz/obj_array.c b/fitz/obj_array.c
index 07916aa2..8c9ae553 100644
--- a/fitz/obj_array.c
+++ b/fitz/obj_array.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
void fz_freearray(fz_obj *obj);
diff --git a/fitz/obj_dict.c b/fitz/obj_dict.c
index 6849b21b..66e59ada 100644
--- a/fitz/obj_dict.c
+++ b/fitz/obj_dict.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
/* dicts may only have names as keys! */
diff --git a/fitz/obj_parse.c b/fitz/obj_parse.c
index c1a696ec..8e06cd6a 100644
--- a/fitz/obj_parse.c
+++ b/fitz/obj_parse.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
struct vap { va_list ap; };
diff --git a/fitz/obj_print.c b/fitz/obj_print.c
index 1c2cd62d..d4dd6050 100644
--- a/fitz/obj_print.c
+++ b/fitz/obj_print.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
struct fmt
{
diff --git a/fitz/obj_simple.c b/fitz/obj_simple.c
index b6b9281f..258f328e 100644
--- a/fitz/obj_simple.c
+++ b/fitz/obj_simple.c
@@ -1,5 +1,5 @@
#include "fitz.h"
-#include "mupdf.h"
+#include "mupdf.h" /* for pdf_loadobject */
extern void fz_freearray(fz_obj *array);
extern void fz_freedict(fz_obj *dict);
diff --git a/fitz/res_colorspace.c b/fitz/res_colorspace.c
index a3d6f211..248cb012 100644
--- a/fitz/res_colorspace.c
+++ b/fitz/res_colorspace.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
+#include "fitz.h"
void
fz_convertpixmap(fz_colorspace *srcs, fz_pixmap *src, fz_colorspace *dsts, fz_pixmap *dst)
diff --git a/fitz/res_font.c b/fitz/res_font.c
index b06c4e4f..5eb33225 100644
--- a/fitz/res_font.c
+++ b/fitz/res_font.c
@@ -1,7 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
-#include "fitz_res.h"
-#include "fitz_draw.h" /* FIXME -- for glyph rendering callbacks */
+#include "fitz.h"
#include <ft2build.h>
#include FT_FREETYPE_H
diff --git a/fitz/res_image.c b/fitz/res_image.c
index 3ccc01dc..8da98a72 100644
--- a/fitz/res_image.c
+++ b/fitz/res_image.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
+#include "fitz.h"
fz_image *
fz_keepimage(fz_image *image)
diff --git a/fitz/res_shade.c b/fitz/res_shade.c
index 5efa1827..d49f4121 100644
--- a/fitz/res_shade.c
+++ b/fitz/res_shade.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
+#include "fitz.h"
fz_shade *
fz_keepshade(fz_shade *shade)
diff --git a/fitz/stm_buffer.c b/fitz/stm_buffer.c
index bfc0b0dc..3879f871 100644
--- a/fitz/stm_buffer.c
+++ b/fitz/stm_buffer.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
fz_buffer *
fz_newbuffer(int size)
diff --git a/fitz/stm_filter.c b/fitz/stm_filter.c
index 21fce662..543d41fe 100644
--- a/fitz/stm_filter.c
+++ b/fitz/stm_filter.c
@@ -1,5 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
fz_error
fz_process(fz_filter *f, fz_buffer *in, fz_buffer *out)
diff --git a/fitz/stm_misc.c b/fitz/stm_misc.c
index 3663107e..351cedbf 100644
--- a/fitz/stm_misc.c
+++ b/fitz/stm_misc.c
@@ -2,8 +2,7 @@
* Miscellaneous I/O functions
*/
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
/*
* Read a line terminated by LF or CR or CRLF.
diff --git a/fitz/stm_open.c b/fitz/stm_open.c
index 48e9587f..02b4cd51 100644
--- a/fitz/stm_open.c
+++ b/fitz/stm_open.c
@@ -2,8 +2,7 @@
* Creation and destruction.
*/
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
static fz_stream *
newstm(int kind)
diff --git a/fitz/stm_read.c b/fitz/stm_read.c
index 1dfa4648..9938b6e6 100644
--- a/fitz/stm_read.c
+++ b/fitz/stm_read.c
@@ -2,8 +2,7 @@
* Input streams.
*/
-#include "fitz_base.h"
-#include "fitz_stream.h"
+#include "fitz.h"
fz_error
fz_readimp(fz_stream *stm)
diff --git a/fitzdraw/Jamfile b/fitzdraw/Jamfile
index 7c66733c..826fedcc 100644
--- a/fitzdraw/Jamfile
+++ b/fitzdraw/Jamfile
@@ -8,7 +8,7 @@ Library libfitzdraw :
imagedraw.c
imageunpack.c
imagescale.c
-# pathscan.c
+ pathscan.c
# pathfill.c
# pathstroke.c
# render.c
diff --git a/fitzdraw/archppc.c b/fitzdraw/archppc.c
index e0235a42..4f1bfc95 100644
--- a/fitzdraw/archppc.c
+++ b/fitzdraw/archppc.c
@@ -2,9 +2,7 @@
* PowerPC specific render optims live here
*/
-#include "fitz_base.h"
-#include "fitz_tree.h"
-#include "fitz_draw.h"
+#include "fitz.h"
typedef unsigned char byte;
diff --git a/fitzdraw/archsparc.c b/fitzdraw/archsparc.c
index 55bffa98..a1e54b03 100644
--- a/fitzdraw/archsparc.c
+++ b/fitzdraw/archsparc.c
@@ -1,9 +1,7 @@
/*
SPARC specific render optims live here
*/
-#include "fitz_base.h"
-#include "fitz_tree.h"
-#include "fitz_draw.h"
+#include "fitz.h"
#ifdef HAVE_VIS
diff --git a/fitzdraw/archx86.c b/fitzdraw/archx86.c
index 23efa93d..5f746b9e 100644
--- a/fitzdraw/archx86.c
+++ b/fitzdraw/archx86.c
@@ -2,9 +2,7 @@
* x86 specific render optims live here
*/
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
typedef unsigned char byte;
diff --git a/fitzdraw/blendmodes.c b/fitzdraw/blendmodes.c
index 66517d8b..973d79ab 100644
--- a/fitzdraw/blendmodes.c
+++ b/fitzdraw/blendmodes.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
typedef unsigned char byte;
diff --git a/fitzdraw/glyphcache.c b/fitzdraw/glyphcache.c
index a921ba89..183a19ad 100644
--- a/fitzdraw/glyphcache.c
+++ b/fitzdraw/glyphcache.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
typedef struct fz_hash_s fz_hash;
typedef struct fz_key_s fz_key;
diff --git a/fitzdraw/imagedraw.c b/fitzdraw/imagedraw.c
index aa1698dc..08a6d785 100644
--- a/fitzdraw/imagedraw.c
+++ b/fitzdraw/imagedraw.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
typedef unsigned char byte;
diff --git a/fitzdraw/imagescale.c b/fitzdraw/imagescale.c
index e9f503cb..19c8abd7 100644
--- a/fitzdraw/imagescale.c
+++ b/fitzdraw/imagescale.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
typedef unsigned char byte;
diff --git a/fitzdraw/imageunpack.c b/fitzdraw/imageunpack.c
index 61eacb63..6e4e7f85 100644
--- a/fitzdraw/imageunpack.c
+++ b/fitzdraw/imageunpack.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
typedef unsigned char byte;
diff --git a/fitzdraw/meshdraw.c b/fitzdraw/meshdraw.c
index 4c341a82..2078371f 100644
--- a/fitzdraw/meshdraw.c
+++ b/fitzdraw/meshdraw.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
/*
* polygon clipping
diff --git a/fitzdraw/pathfill.c b/fitzdraw/pathfill.c
index 75d30cc5..8703e066 100644
--- a/fitzdraw/pathfill.c
+++ b/fitzdraw/pathfill.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_tree.h"
-#include "fitz_draw.h"
+#include "fitz.h"
static fz_error
line(fz_gel *gel, fz_matrix *ctm, float x0, float y0, float x1, float y1)
diff --git a/fitzdraw/pathscan.c b/fitzdraw/pathscan.c
index e2e18e7e..5c060c6f 100644
--- a/fitzdraw/pathscan.c
+++ b/fitzdraw/pathscan.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
/* divide and floor towards -inf */
static inline int fz_idiv(int a, int b)
diff --git a/fitzdraw/pathstroke.c b/fitzdraw/pathstroke.c
index 7b08ab5c..81c9d90e 100644
--- a/fitzdraw/pathstroke.c
+++ b/fitzdraw/pathstroke.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
enum { BUTT = 0, ROUND = 1, SQUARE = 2, MITER = 0, BEVEL = 2 };
diff --git a/fitzdraw/pixmap.c b/fitzdraw/pixmap.c
index 6ea1d1d9..96e08b84 100644
--- a/fitzdraw/pixmap.c
+++ b/fitzdraw/pixmap.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
fz_error
fz_newpixmap(fz_pixmap **pixp, int x, int y, int w, int h, int n)
diff --git a/fitzdraw/porterduff.c b/fitzdraw/porterduff.c
index 59c7714b..78ba198d 100644
--- a/fitzdraw/porterduff.c
+++ b/fitzdraw/porterduff.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
typedef unsigned char byte;
diff --git a/fitzdraw/render.c b/fitzdraw/render.c
index 0c202e9e..e6521472 100644
--- a/fitzdraw/render.c
+++ b/fitzdraw/render.c
@@ -1,6 +1,4 @@
-#include "fitz_base.h"
-#include "fitz_res.h"
-#include "fitz_draw.h"
+#include "fitz.h"
#ifdef _MSC_VER
#define noDebug printf