Consolidate include lines to a single fitz.h.

16 files changed, 16 insertions, 46 deletions

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