more shuffling

25 files changed, 22 insertions, 22 deletions

diff --git a/include/fitz-base.h b/include/fitz-base.h
index 0f6e8ba6..8c13cd5e 100644
--- a/include/fitz-base.h
+++ b/include/fitz-base.h
@@ -3,10 +3,11 @@
 #endif
 #define _FITZ_BASE_H_
 
-#include "fitz/sysdep.h"
-#include "fitz/cpudep.h"
-#include "fitz/runtime.h"
-#include "fitz/math.h"
-#include "fitz/geometry.h"
-#include "fitz/hash.h"
+#include "fitz/base_sysdep.h"
+#include "fitz/base_cpudep.h"
+#include "fitz/base_runtime.h"
+#include "fitz/base_math.h"
+#include "fitz/base_geom.h"
+#include "fitz/base_hash.h"
+#include "fitz/base_pixmap.h"
 
diff --git a/include/fitz-draw.h b/include/fitz-draw.h
index 9f25fe44..ceef524a 100644
--- a/include/fitz-draw.h
+++ b/include/fitz-draw.h
@@ -15,6 +15,6 @@
 #error "fitz-world.h must be included before fitz-draw.h"
 #endif
 
-#include "fitz/pathscan.h"
-#include "fitz/render.h"
+#include "fitz/draw_path.h"
+#include "fitz/draw_misc.h"
 
diff --git a/include/fitz-stream.h b/include/fitz-stream.h
index 47454ce5..bd210f24 100644
--- a/include/fitz-stream.h
+++ b/include/fitz-stream.h
@@ -11,9 +11,9 @@
 #error "fitz-base.h must be included before fitz-stream.h"
 #endif
 
-#include "fitz/crypt.h"
-#include "fitz/object.h"
-#include "fitz/buffer.h"
-#include "fitz/filter.h"
-#include "fitz/stream.h"
+#include "fitz/stm_crypt.h"
+#include "fitz/stm_object.h"
+#include "fitz/stm_buffer.h"
+#include "fitz/stm_filter.h"
+#include "fitz/stm_stream.h"
 
diff --git a/include/fitz-world.h b/include/fitz-world.h
index 0f1855f5..f810e07b 100644
--- a/include/fitz-world.h
+++ b/include/fitz-world.h
@@ -11,13 +11,11 @@
 #error "fitz-base.h must be included before fitz-world.h"
 #endif
 
-#include "fitz/font.h"
-#include "fitz/pixmap.h"
-#include "fitz/colorspace.h"
-#include "fitz/image.h"
-#include "fitz/shade.h"
-
-#include "fitz/tree.h"
-#include "fitz/path.h"
-#include "fitz/text.h"
+#include "fitz/wld_font.h"
+#include "fitz/wld_color.h"
+#include "fitz/wld_image.h"
+#include "fitz/wld_shade.h"
+#include "fitz/wld_tree.h"
+#include "fitz/wld_path.h"
+#include "fitz/wld_text.h"
 
diff --git a/include/fitz/cpudep.h b/include/fitz/base_cpudep.h
index 261c3c79..261c3c79 100644
--- a/include/fitz/cpudep.h
+++ b/include/fitz/base_cpudep.h
diff --git a/include/fitz/geometry.h b/include/fitz/base_geom.h
index 13290007..13290007 100644
--- a/include/fitz/geometry.h
+++ b/include/fitz/base_geom.h
diff --git a/include/fitz/hash.h b/include/fitz/base_hash.h
index 5d2ec1b5..5d2ec1b5 100644
--- a/include/fitz/hash.h
+++ b/include/fitz/base_hash.h
diff --git a/include/fitz/math.h b/include/fitz/base_math.h
index 4dee81fc..4dee81fc 100644
--- a/include/fitz/math.h
+++ b/include/fitz/base_math.h
diff --git a/include/fitz/pixmap.h b/include/fitz/base_pixmap.h
index c369df84..9a0f2b43 100644
--- a/include/fitz/pixmap.h
+++ b/include/fitz/base_pixmap.h
@@ -1,3 +1,4 @@
+/* TODO: move this into draw module */
 /*
 pixmaps have n components per pixel. the first is always alpha.
 premultiplied alpha when rendering, but non-premultiplied for colorspace
diff --git a/include/fitz/runtime.h b/include/fitz/base_runtime.h
index feeb7ffc..feeb7ffc 100644
--- a/include/fitz/runtime.h
+++ b/include/fitz/base_runtime.h
diff --git a/include/fitz/sysdep.h b/include/fitz/base_sysdep.h
index 4e8b1115..4e8b1115 100644
--- a/include/fitz/sysdep.h
+++ b/include/fitz/base_sysdep.h
diff --git a/include/fitz/render.h b/include/fitz/draw_misc.h
index cb78b57c..cb78b57c 100644
--- a/include/fitz/render.h
+++ b/include/fitz/draw_misc.h
diff --git a/include/fitz/pathscan.h b/include/fitz/draw_path.h
index 0be71e9e..0be71e9e 100644
--- a/include/fitz/pathscan.h
+++ b/include/fitz/draw_path.h
diff --git a/include/fitz/buffer.h b/include/fitz/stm_buffer.h
index 1a6f34ad..1a6f34ad 100644
--- a/include/fitz/buffer.h
+++ b/include/fitz/stm_buffer.h
diff --git a/include/fitz/crypt.h b/include/fitz/stm_crypt.h
index 15191caa..15191caa 100644
--- a/include/fitz/crypt.h
+++ b/include/fitz/stm_crypt.h
diff --git a/include/fitz/filter.h b/include/fitz/stm_filter.h
index f8902f98..f8902f98 100644
--- a/include/fitz/filter.h
+++ b/include/fitz/stm_filter.h
diff --git a/include/fitz/object.h b/include/fitz/stm_object.h
index fe9c12e5..fe9c12e5 100644
--- a/include/fitz/object.h
+++ b/include/fitz/stm_object.h
diff --git a/include/fitz/stream.h b/include/fitz/stm_stream.h
index b0778373..b0778373 100644
--- a/include/fitz/stream.h
+++ b/include/fitz/stm_stream.h
diff --git a/include/fitz/colorspace.h b/include/fitz/wld_color.h
index f6fae48c..f6fae48c 100644
--- a/include/fitz/colorspace.h
+++ b/include/fitz/wld_color.h
diff --git a/include/fitz/font.h b/include/fitz/wld_font.h
index 27217c6c..27217c6c 100644
--- a/include/fitz/font.h
+++ b/include/fitz/wld_font.h
diff --git a/include/fitz/image.h b/include/fitz/wld_image.h
index 89d180ba..89d180ba 100644
--- a/include/fitz/image.h
+++ b/include/fitz/wld_image.h
diff --git a/include/fitz/path.h b/include/fitz/wld_path.h
index 6a7c55b7..6a7c55b7 100644
--- a/include/fitz/path.h
+++ b/include/fitz/wld_path.h
diff --git a/include/fitz/shade.h b/include/fitz/wld_shade.h
index 1b7c81c5..1b7c81c5 100644
--- a/include/fitz/shade.h
+++ b/include/fitz/wld_shade.h
diff --git a/include/fitz/text.h b/include/fitz/wld_text.h
index 619aae83..619aae83 100644
--- a/include/fitz/text.h
+++ b/include/fitz/wld_text.h
diff --git a/include/fitz/tree.h b/include/fitz/wld_tree.h
index 324b8098..324b8098 100644
--- a/include/fitz/tree.h
+++ b/include/fitz/wld_tree.h