Merge and move header files into the source directories.

15 files changed, 45 insertions, 45 deletions

diff --git a/fitzdraw/archppc.c b/fitzdraw/archppc.c
index 30dbd780..e0235a42 100644
--- a/fitzdraw/archppc.c
+++ b/fitzdraw/archppc.c
@@ -2,9 +2,9 @@
  * PowerPC specific render optims live here
  */
 
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 typedef unsigned char byte;
 
diff --git a/fitzdraw/archsparc.c b/fitzdraw/archsparc.c
index b78e5a4d..55bffa98 100644
--- a/fitzdraw/archsparc.c
+++ b/fitzdraw/archsparc.c
@@ -1,9 +1,9 @@
 /*
 SPARC specific render optims live here
 */
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 #ifdef HAVE_VIS
 
diff --git a/fitzdraw/archx86.c b/fitzdraw/archx86.c
index 261b8a16..abbdf1e0 100644
--- a/fitzdraw/archx86.c
+++ b/fitzdraw/archx86.c
@@ -2,9 +2,9 @@
  * x86 specific render optims live here
  */
 
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 typedef unsigned char byte;
 
diff --git a/fitzdraw/blendmodes.c b/fitzdraw/blendmodes.c
index f3ba8ac5..e14b8a32 100644
--- a/fitzdraw/blendmodes.c
+++ b/fitzdraw/blendmodes.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 typedef unsigned char byte;
 
diff --git a/fitzdraw/glyphcache.c b/fitzdraw/glyphcache.c
index fe03524e..38beb677 100644
--- a/fitzdraw/glyphcache.c
+++ b/fitzdraw/glyphcache.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.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 1ad74bf7..ad488431 100644
--- a/fitzdraw/imagedraw.c
+++ b/fitzdraw/imagedraw.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 typedef unsigned char byte;
 
diff --git a/fitzdraw/imagescale.c b/fitzdraw/imagescale.c
index f25d4d5a..d8f28917 100644
--- a/fitzdraw/imagescale.c
+++ b/fitzdraw/imagescale.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 typedef unsigned char byte;
 
diff --git a/fitzdraw/imageunpack.c b/fitzdraw/imageunpack.c
index a07d4f16..d7238b5e 100644
--- a/fitzdraw/imageunpack.c
+++ b/fitzdraw/imageunpack.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 typedef unsigned char byte;
 
diff --git a/fitzdraw/meshdraw.c b/fitzdraw/meshdraw.c
index abdcaaa1..cede57d3 100644
--- a/fitzdraw/meshdraw.c
+++ b/fitzdraw/meshdraw.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 /*
  * polygon clipping
diff --git a/fitzdraw/pathfill.c b/fitzdraw/pathfill.c
index 3040e6a3..cf76f216 100644
--- a/fitzdraw/pathfill.c
+++ b/fitzdraw/pathfill.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.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 0ea46502..647b872f 100644
--- a/fitzdraw/pathscan.c
+++ b/fitzdraw/pathscan.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 enum { HSCALE = 17, VSCALE = 15, SF = 1 };
 
diff --git a/fitzdraw/pathstroke.c b/fitzdraw/pathstroke.c
index d68f38ed..1c5c7a6c 100644
--- a/fitzdraw/pathstroke.c
+++ b/fitzdraw/pathstroke.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 enum { BUTT = 0, ROUND = 1, SQUARE = 2, MITER = 0, BEVEL = 2 };
 
diff --git a/fitzdraw/pixmap.c b/fitzdraw/pixmap.c
index 077009f8..1c06505d 100644
--- a/fitzdraw/pixmap.c
+++ b/fitzdraw/pixmap.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.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 8f2b9862..755ba434 100644
--- a/fitzdraw/porterduff.c
+++ b/fitzdraw/porterduff.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 typedef unsigned char byte;
 
diff --git a/fitzdraw/render.c b/fitzdraw/render.c
index 90ead6a7..acc2c723 100644
--- a/fitzdraw/render.c
+++ b/fitzdraw/render.c
@@ -1,6 +1,6 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-#include "fitz-draw.h"
+#include "fitz_base.h"
+#include "fitz_tree.h"
+#include "fitz_draw.h"
 
 #ifdef _MSC_VER
 #define noDebug printf