109 files changed, 454 insertions, 353 deletions

diff --git a/Jamconfig b/Jamconfig
deleted file mode 100644
index d211566d..00000000
--- a/Jamconfig
+++ /dev/null
@@ -1,59 +0,0 @@
-# Customize to your liking
-# Shortcut for developers: you can override the settings here with ~/.jamconfig
-
-# Comment out to disable
-# HAVE_JBIG2DEC = yes ;
-# HAVE_JASPER = yes ;
-# HAVE_X11 = yes ;
-# HAVE_GTK = yes ;
-
-# Add any non-standard header/library (-I/-L) search paths here
-# In particular add paths needed by above mentioned libraries here
-EXTRA_INCLUDES = ;
-EXTRA_LIBRARIES = ;
-
-# Basic system should be mostly SUSv3 compliant
-CCFLAGS += -D_XOPEN_SOURCE=600 ;
-
-# Default optimize/profile/debug compiler/linker switches
-OPTIM = -O3 ;
-PROF = -g -pg ;
-DEBUG = -g ;
-
-switch $(OS)
-{
-	case LINUX :
-		LINKFLAGS += -L/usr/X11R6/lib ;
-		CCFLAGS += -DNEED_STRLCPY -DNEED_STRLCAT ;
-
-		switch $(CC)-$(OSPLAT)
-		{
-		case icc-X86 :
-			CCFLAGS += -DARCH_X86 ;
-			OPTIM = -O3 -ip -tpp6 -xM ;
-			PROF = -g -qp ;
-		case gcc-X86 :
-			CCFLAGS += -DARCH_X86 ;
-			# add -msse -msse2 when such functions exist...
-			OPTIM = -O3 -march=pentium -mmmx ;
-		}
-
-	case MACOSX :
-		CCFLAGS += -std=gnu99 -DHAVE_C99 -Wall -faltivec -DARCH_PPC ;
-		OPTIM = -fast ;
-
-	case MINGW :
-		NOARSCAN = true ; # compatibility for old jamrules
-		CCFLAGS += -std=gnu99 -DHAVE_C99 -Wall -DWIN32 ;
-		CCFLAGS += -DNEED_GETOPT -DNEED_STRSEP -DNEED_STRLCPY -DNEED_STRLCAT ;
-
-	case SOLARIS :
-		CCFLAGS += -std=c89 -Wall -DNEED_STRSEP ;
-
-	# Additional platforms go here
-
-	# Bail on unknown platforms
-	case * :
-		Exit "OS '$(OS)' not known by build system" ;
-}
-
diff --git a/Jamfile b/Jamfile
index 3dbd289f..327b7bef 100644
--- a/Jamfile
+++ b/Jamfile
@@ -1,265 +1,323 @@
+# --------------------------------------------------------------------------
 #
-# Build flags
+# This is the Jamfile used for building Fitz and MuPDF.
+# Put compiler options and other tweaks in Jamrules, not here.
+#
+#   http://public.perforce.com/public/jam/src/Jam.html
+#
+# Set environment variable BUILD to one of: debug release profile
+#
+#   jam -sBUILD=release
 #
 
-include Jamconfig ;
-include $(HOME)/.jamconfig ;
+SubDir TOP ;
 
-HDRS = include filter ;
+ALL_LOCATE_TARGET = [ FDirName $(TOP) build $(BUILD) ] ;
 
-#
-# Libraries
-#
+BINDIR = [ FDirName $(TOP) dist ] ;
 
-if -DNEED_GETOPT  in $(CCFLAGS) { Library libfitz : util/getopt.c ; }
-if -DNEED_STRSEP  in $(CCFLAGS) { Library libfitz : util/strsep.c ; }
-if -DNEED_STRLCPY in $(CCFLAGS) { Library libfitz : util/strlcpy.c ; }
-if -DNEED_STRLCAT in $(CCFLAGS) { Library libfitz : util/strlcat.c ; }
+LINKLIBS = -lfreetype -ljpeg -lz -lm ;
+FITZLIBS = libmupdf libstream libfitz librender libfonts ;
 
-if $(HAVE_JASPER)
+if $(HAVE_JASPER) = yes
 {
 	CCFLAGS += -DHAVE_JASPER ;
 	LINKLIBS += -ljasper ;
-	Library libfitz : filter/jpxd.c ;
 }
 
-if $(HAVE_JBIG2DEC)
+if $(HAVE_JBIG2DEC) = yes
 {
 	CCFLAGS += -DHAVE_JBIG2DEC ;
 	LINKLIBS += -ljbig2dec ;
-	Library libfitz : filter/jbig2d.c ;
 }
 
-Library libfitz :
-	base/cpudep.c
-	base/error.c
-	base/memory.c
-	base/md5.c
-	base/arc4.c
-	base/rect.c
-	base/matrix.c
-	base/hash.c
-	base/rune.c
-	;
-
-Library libfitz :
-	object/simple.c
-	object/array.c
-	object/dict.c
-	object/print.c
-	object/parse.c
-	;
-
-Library libfitz :
-	filter/buffer.c
-	filter/filter.c
-	filter/filec.c		# unistd.h
-	filter/filer.c		# unistd.h
-	filter/filew.c		# unistd.h
-	filter/null.c
-	filter/arc4filter.c
-	filter/pipeline.c
-	filter/ahxd.c
-	filter/ahxe.c
-	filter/a85d.c
-	filter/a85e.c
-	filter/rld.c
-	filter/rle.c
-	filter/predict.c
-	filter/lzwd.c
-	filter/lzwe.c
-	filter/faxd.c
-	filter/faxdtab.c
-	filter/faxe.c
-	filter/faxetab.c
-	filter/flate.c		# libz
-	filter/dctd.c		# libjpeg
-	filter/dcte.c		# libjpeg
-	;
+if $(NEED_GETOPT)  = yes { CCFLAGS += -DNEED_GETOPT ; }
+if $(NEED_STRLCAT) = yes { CCFLAGS += -DNEED_STRLCAT ; }
+if $(NEED_STRLCPY) = yes { CCFLAGS += -DNEED_STRLCPY ; }
+if $(NEED_STRSEP)  = yes { CCFLAGS += -DNEED_STRSEP ; }
 
-Library libfitz :
-	tree/cmap.c
-	tree/font.c
-	tree/colorspace.c
-	tree/image.c
-	tree/shade.c
-	tree/tree.c
-	tree/node1.c
-	tree/node2.c
-	tree/text.c
-	tree/path.c
-	tree/debug.c
-	tree/optimize.c
+HDRS =
+	[ FDirName $(TOP) include ]
+	[ FDirName $(TOP) stream ]
 	;
 
-Library libfitz :
-	render/glyphcache.c
-	render/pixmap.c
-	render/porterduff.c
-	render/meshdraw.c
-	render/imagedraw.c
-	render/imageunpack.c
-	render/imagescale.c
-	render/pathscan.c
-	render/pathfill.c
-	render/pathstroke.c
-	render/render.c
-	;
+# --------------------------------------------------------------------------
 
-if $(OSPLAT) = PPC     { Library libfitz : render/archppc.c ; }
-if $(OSPLAT) = SPARC   { Library libfitz : render/archsparc.c ; }
-if $(OSPLAT) = X86     { Library libfitz : render/archx86.c ; }
+rule UserObject
+{
+	switch $(>)
+	{
+	case *.rc :
+		WindRes $(<) : $(>) ;
 
-Library libmupdf :
-	mupdf/debug.c
-	mupdf/lex.c
-	mupdf/parse.c
-	mupdf/crypt.c
-
-	mupdf/open.c
-	mupdf/repair.c
-	mupdf/save.c
-	mupdf/xref.c
-	mupdf/stream.c
-	mupdf/doctor.c
-
-	mupdf/nametree.c
-	mupdf/outline.c
-	mupdf/annot.c
-	mupdf/pagetree.c
-
-	mupdf/store.c
-	mupdf/resources.c
-	mupdf/function.c
-	mupdf/colorspace1.c
-	mupdf/colorspace2.c
-	mupdf/xobject.c
-	mupdf/image.c
-	mupdf/pattern.c
-	mupdf/cmap.c
-	mupdf/unicode.c
-	mupdf/fontagl.c
-	mupdf/fontenc.c
-	mupdf/fontfile.c
-	mupdf/font.c
-	mupdf/type3.c
-
-	mupdf/page.c
-	mupdf/build.c
-	mupdf/interpret.c
-
-	mupdf/shade.c
-	mupdf/shade1.c
-	mupdf/shade2.c
-	mupdf/shade3.c
-	mupdf/shade4.c
-	;
+	case *.cff :
+		Cc $(<) : $(<:S=.c) ;
+		HexDump $(<:S=.c) : $(>) ;
 
-# Library libmupdf : mupdf/fontfilefc.c ;
-# Library libmupdf : mupdf/fontfilems.c ;
+	case * :
+		Echo "unknown suffix on" $(>) ;
+	}
+}
 
 rule HexDump
 {
-	DEPENDS $(<) : $(>) ;
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_SOURCE) ;
 	Clean clean : $(<) ;
 }
 
-actions HexDump
+rule WindRes
 {
-	xxd -i $(>) | sed -e 's/data_//g;s/, /,/g' > $(<)
+	Depends $(<) : $(>) ;
+	Clean clean : $(<) ;
 }
 
-HexDump data/Dingbats.c : data/Dingbats.cff ;
-HexDump data/NimbusMonL-Bold.c : data/NimbusMonL-Bold.cff ;
-HexDump data/NimbusMonL-BoldObli.c : data/NimbusMonL-BoldObli.cff ;
-HexDump data/NimbusMonL-Regu.c : data/NimbusMonL-Regu.cff ;
-HexDump data/NimbusMonL-ReguObli.c : data/NimbusMonL-ReguObli.cff ;
-HexDump data/NimbusRomNo9L-Medi.c : data/NimbusRomNo9L-Medi.cff ;
-HexDump data/NimbusRomNo9L-MediItal.c : data/NimbusRomNo9L-MediItal.cff ;
-HexDump data/NimbusRomNo9L-Regu.c : data/NimbusRomNo9L-Regu.cff ;
-HexDump data/NimbusRomNo9L-ReguItal.c : data/NimbusRomNo9L-ReguItal.cff ;
-HexDump data/NimbusSanL-Bold.c : data/NimbusSanL-Bold.cff ;
-HexDump data/NimbusSanL-BoldItal.c : data/NimbusSanL-BoldItal.cff ;
-HexDump data/NimbusSanL-Regu.c : data/NimbusSanL-Regu.cff ;
-HexDump data/NimbusSanL-ReguItal.c : data/NimbusSanL-ReguItal.cff ;
-HexDump data/StandardSymL.c : data/StandardSymL.cff ;
-HexDump data/URWChanceryL-MediItal.c : data/URWChanceryL-MediItal.cff ;
+actions HexDump { xxd -i $(>) > $(<) }
+actions WindRes { windres -i $(>) -o $(<) --include-dir=$(>:D) }
+
+
+# --------------------------------------------------------------------------
+
+SubDir TOP fitz ;
+
+Library libfitz :
+
+	base_cpudep.c
+	base_error.c
+	base_hash.c
+	base_matrix.c
+	base_memory.c
+	base_rect.c
+	base_rune.c
+
+	node_debug.c
+	node_misc1.c
+	node_misc2.c
+	node_optimize.c
+	node_path.c
+	node_text.c
+	node_tree.c
+
+	res_cmap.c
+	res_colorspace.c
+	res_font.c
+	res_image.c
+	res_shade.c
+
+	;
+
+if $(NEED_GETOPT)  = yes { Library libfitz : util_getopt.c ; }
+if $(NEED_STRLCAT) = yes { Library libfitz : util_strlcat.c ; }
+if $(NEED_STRLCPY) = yes { Library libfitz : util_strlcpy.c ; }
+if $(NEED_STRSEP)  = yes { Library libfitz : util_strsep.c ; }
+
+# --------------------------------------------------------------------------
+
+SubDir TOP stream ;
+
+Library libstream :
+
+	crypt_arc4.c
+	crypt_md5.c
+
+	obj_array.c
+	obj_dict.c
+	obj_parse.c
+	obj_print.c
+	obj_simple.c
+
+	filt_a85d.c
+	filt_a85e.c
+	filt_ahxd.c
+	filt_ahxe.c
+	filt_arc4.c
+	filt_buffer.c
+	filt_dctd.c
+	filt_dcte.c
+	filt_faxd.c
+	filt_faxdtab.c
+	filt_faxe.c
+	filt_faxetab.c
+	filt_filec.c
+	filt_filer.c
+	filt_filew.c
+	filt_flate.c
+	filt_lzwd.c
+	filt_lzwe.c
+	filt_null.c
+	filt_pipeline.c
+	filt_predict.c
+	filt_process.c
+	filt_rld.c
+	filt_rle.c
+
+	;
+
+if $(HAVE_JASPER)   = yes { Library libstream : filt_jpxd.c ; }
+if $(HAVE_JBIG2DEC) = yes { Library libstream : filt_jbig2d.c ; }
+
+# --------------------------------------------------------------------------
+
+SubDir TOP render ;
+
+Library librender :
+	glyphcache.c
+	pixmap.c
+	porterduff.c
+	meshdraw.c
+	imagedraw.c
+	imageunpack.c
+	imagescale.c
+	pathscan.c
+	pathfill.c
+	pathstroke.c
+	render.c
+	;
+
+if $(OSPLAT) = PPC     { Library librender : archppc.c ; }
+if $(OSPLAT) = SPARC   { Library librender : archsparc.c ; }
+if $(OSPLAT) = X86     { Library librender : archx86.c ; }
+
+# --------------------------------------------------------------------------
+
+SubDir TOP fonts ;
+
+Library libfonts :
+	Dingbats.cff
+	StandardSymL.cff
+	URWChanceryL-MediItal.cff
+	NimbusMonL-Bold.cff
+	NimbusMonL-BoldObli.cff
+	NimbusMonL-Regu.cff
+	NimbusMonL-ReguObli.cff
+	NimbusRomNo9L-Medi.cff
+	NimbusRomNo9L-MediItal.cff
+	NimbusRomNo9L-Regu.cff
+	NimbusRomNo9L-ReguItal.cff
+	NimbusSanL-Bold.cff
+	NimbusSanL-BoldItal.cff
+	NimbusSanL-Regu.cff
+	NimbusSanL-ReguItal.cff
+	;
+
+# --------------------------------------------------------------------------
+
+SubDir TOP mupdf ;
 
 Library libmupdf :
-	data/Dingbats.c
-	data/NimbusMonL-Bold.c
-	data/NimbusMonL-BoldObli.c
-	data/NimbusMonL-Regu.c
-	data/NimbusMonL-ReguObli.c
-	data/NimbusRomNo9L-Medi.c
-	data/NimbusRomNo9L-MediItal.c
-	data/NimbusRomNo9L-Regu.c
-	data/NimbusRomNo9L-ReguItal.c
-	data/NimbusSanL-Bold.c
-	data/NimbusSanL-BoldItal.c
-	data/NimbusSanL-Regu.c
-	data/NimbusSanL-ReguItal.c
-	data/StandardSymL.c
-	data/URWChanceryL-MediItal.c
+	pdf_annot.c
+	pdf_build.c
+	pdf_cmap.c
+	pdf_colorspace1.c
+	pdf_colorspace2.c
+	pdf_crypt.c
+	pdf_debug.c
+	pdf_doctor.c
+	pdf_font.c
+	pdf_fontagl.c
+	pdf_fontenc.c
+	pdf_fontfile.c		# use builtin fonts
+	# pdf_fontfilefc.c	# use fontconfig
+	# pdf_fontfilems.c	# scan $WINDIR/Fonts
+	pdf_function.c
+	pdf_image.c
+	pdf_interpret.c
+	pdf_lex.c
+	pdf_nametree.c
+	pdf_open.c
+	pdf_outline.c
+	pdf_page.c
+	pdf_pagetree.c
+	pdf_parse.c
+	pdf_pattern.c
+	pdf_repair.c
+	pdf_resources.c
+	pdf_save.c
+	pdf_shade.c
+	pdf_shade1.c
+	pdf_shade2.c
+	pdf_shade3.c
+	pdf_shade4.c
+	pdf_store.c
+	pdf_stream.c
+	pdf_type3.c
+	pdf_unicode.c
+	pdf_xobject.c
+	pdf_xref.c
 	;
 
+
+# --------------------------------------------------------------------------
 #
-# Applications
+# Build simple portable apps
 #
 
-LINKLIBS = -lfreetype -ljpeg -lz -lm ;
+SubDir TOP apps ;
 
-if $(OS) = MINGW
+APPLIST =
+	pdfrip
+	pdfclean
+	pdfdebug
+	pdfmerge
+	pdfselect
+	;
+
+for APP in $(APPLIST)
 {
-	rule UserObject
-	{
-		Res $(<) : $(>) ;
-	}
+	Main $(APP) : $(APP).c ;
+	LinkLibraries $(APP) : $(FITZLIBS) ;
+	InstallBin $(BINDIR) : $(APP)$(SUFEXE) ;
+}
 
-	rule Res
-	{
-		Depends $(<) : $(>) ;
-	}
+# --------------------------------------------------------------------------
+#
+# Build non-portable GUI frontend apps
+#
 
-	actions Res
-	{
-		windres -i $(>) -o $(<)
-	}
+if $(OS) = MINGW
+{
+	SubDir TOP apps windows ;
 
-	Main w32pdf : apps/w32pdf.c apps/w32res.rc ;
-	LinkLibraries w32pdf : libmupdf libfitz ;
-	LINKLIBS on w32pdf$(SUFEXE) = $(LINKLIBS) -lgdi32 -lcomdlg32 -mwindows ;
-}
+	Main ghostpdf :
+		win_main.c
+		win_res.rc
+	;
 
-if $(OS) = MACOSX
-{
-	MACPDF = apps/macpdf.app/Contents/MacOS/macpdf ;
-	Main $(MACPDF) : apps/macpdf.c ;
-	LinkLibraries $(MACPDF) : libmupdf libfitz ;
-	LINKLIBS on $(MACPDF) = $(LINKLIBS) -framework Carbon ;
-}
+	LinkLibraries ghostpdf : $(FITZLIBS) ;
 
-if $(HAVE_X11)
-{
-	Main x11pdf : apps/x11pdf.c apps/ximage.c ;
-	LinkLibraries x11pdf : libmupdf libfitz ;
-	LINKLIBS on x11pdf$(SUFEXE) = $(LINKLIBS) -lX11 -lXext ;
+	LINKLIBS on ghostpdf$(SUFEXE) =
+		$(LINKLIBS)
+		-lgdi32 -lcomdlg32 -mwindows
+		;
+
+	InstallBin $(BINDIR) : ghostpdf$(SUFEXE) ;
 }
 
-if $(HAVE_GTK)
+if $(HAVE_X11) = yes
 {
-	Main gtkpdf : apps/gtkpdf.c ;
-	CCFLAGS on apps/gtkpdf$(SUFOBJ) =
-		$(CCFLAGS) `pkg-config --cflags gtk+ gthread` ;
-	LinkLibraries gtkpdf : libmupdf libfitz ;
-	LINKLIBS on gtkpdf$(SUFEXE) =
-		$(LINKLIBS) `pkg-config --libs gtk+ gmodule gthread` ;
+	SubDir TOP apps unix ;
+	Main ghostpdf : x11pdf.c ximage.c ;
+	LinkLibraries ghostpdf : $(FITZLIBS) ;
+	LINKLIBS on ghostpdf$(SUFEXE) = $(LINKLIBS) -lX11 -lXext ;
 }
 
-Main pdfclean : apps/pdfclean.c ;
-Main pdfdebug : apps/pdfdebug.c ;
-Main pdfrip : apps/pdfrip.c ;
-Main pdfmerge : apps/pdfmerge.c ;
-Main pdfselect : apps/pdfselect.c ;
-LinkLibraries pdfclean pdfdebug pdfrip pdfmerge pdfselect : libmupdf libfitz ;
+# if $(OS) = MACOSX
+# {
+# 	SubDir TOP apps macosx ;
+# 	MACPDF = macpdf.app/Contents/MacOS/macpdf ;
+# 	Main $(MACPDF) : apps/macpdf.c ;
+# 	LinkLibraries $(MACPDF) : libmupdf libfitz ;
+# 	LINKLIBS on $(MACPDF) = $(LINKLIBS) -framework Carbon ;
+# }
+#
+# if $(HAVE_GTK) = yes
+# {
+#	SubDir TOP apps gnome ;
+#	Main gtkpdf : apps/gtkpdf.c ;
+#	CCFLAGS on apps/gtkpdf$(SUFOBJ) =
+#		$(CCFLAGS) `pkg-config --cflags gtk+ gthread` ;
+#	LinkLibraries gtkpdf : libmupdf libfitz ;
+#	LINKLIBS on gtkpdf$(SUFEXE) =
+#		$(LINKLIBS) `pkg-config --libs gtk+ gmodule gthread` ;
+# }
 
diff --git a/Jamrules b/Jamrules
new file mode 100644
index 00000000..87d76ce6
--- /dev/null
+++ b/Jamrules
@@ -0,0 +1,100 @@
+# -------------------------------------------------------------------------
+#
+# Jamrules -- the build flags for Fitz and GhostPDF
+# This file is sourced by Jamfile when making
+# Put all configuration stuff here
+#
+
+FREETYPE ?= -Ih:/package/include ;
+
+# Optional modules:
+
+HAVE_JBIG2DEC = no ;
+HAVE_JASPER = no ;
+
+# Select one of these for the GhostPDF GUI application if you are on unix
+
+HAVE_X11 = no ;
+HAVE_GTK = no ;
+
+# -------------------------------------------------------------------------
+
+# Default optimize/profile/debug compiler/linker switches
+# Basic system should be mostly SUSv3 compliant
+# These are good for GCC
+
+FLAG_CCALL = -Wall -D_XOPEN_SOURCE=600 $(FREETYPE) ;
+FLAG_CCDEBUG = -g ;
+FLAG_CCRELEASE = -O3 ;
+FLAG_CCPROFILE = -g -pg ;
+FLAG_LDPROFILE = -pg ;
+
+# Now it gets hairy...
+
+switch $(OS)
+{
+	case LINUX :
+		NEED_STRLCPY = yes ;
+		NEED_STRLCAT = yes ;
+		FLAG_LDALL += -L/usr/X11R6/lib ;
+
+		switch $(CC)-$(OSPLAT)
+		{
+		case icc-X86 :
+			FLAG_CCRELEASE = -DARCH_X86 -O3 -ip -tpp6 -xM ;
+			FLAG_CCPROFILE = -g -qp ;
+		case gcc-X86 :
+			# add -msse -msse2 when such functions exist...
+			FLAG_CCRELEASE = -DARCH_X86 -O3 -march=pentium -mmmx ;
+		}
+
+	case MACOSX :
+		FLAG_CCALL += -std=gnu99 -DHAVE_C99 ;
+		FLAG_CCRELEASE = -DARCH_PPC -faltivec -fast ;
+
+	case MINGW :
+		NEED_GETOPT = yes ;
+		NEED_STRSEP = yes ;
+		NEED_STRLCAT = yes ;
+		NEED_STRLCPY = yes ;
+		FLAG_CCALL += -std=gnu99 -DHAVE_C99 -DWIN32 ;
+		NOARSCAN = yes ;
+
+	case SOLARIS :
+		NEED_STRSEP = yes ;
+		FLAG_CCALL += -std=c89 ;
+		FLAG_CCRELEASE += -DARCH_SPARC ;
+
+	# Additional platforms go here
+
+	case * :
+		Echo "OS '$(OS)' not known by build system." ;
+		Echo "If you get errors, please edit Jamrules." ;
+		FLAG_CCALL += -std=c89 ;
+}
+
+# -------------------------------------------------------------------------
+#
+# Switch on BUILD type (profile, debug or release)
+#
+
+BUILD ?= debug ;
+
+switch $(BUILD)
+{
+	case debug :
+		Echo "Building DEBUG target" ;
+		CCFLAGS = $(FLAG_CCALL) $(FLAG_CCDEBUG) ;
+		LINKFLAGS = $(FLAG_LDALL) $(FLAG_LDDEBUG) ;
+	case release :
+		Echo "Building RELEASE target" ;
+		CCFLAGS = $(FLAG_CCALL) $(FLAG_CCRELEASE) ;
+		LINKFLAGS = $(FLAG_LDALL) $(FLAG_LDRELEASE) ;
+	case profile :
+		Echo "Building PROFILE target" ;
+		CCFLAGS = $(FLAG_CCALL) $(FLAG_CCPROFILE) ;
+		LINKFLAGS = $(FLAG_LDALL) $(FLAG_LDPROFILE) ;
+	case * :
+		Exit "Unknown BUILD target:" $(BUILD) ;
+}
+
diff --git a/TODO b/TODO
index b1653719..c7a67117 100644
--- a/TODO
+++ b/TODO
@@ -57,12 +57,16 @@ fz_optimizetree()
 	- concatenate chained transforms
 	- remove identity transforms
 
-validate ahxd pushback
-go through eof responsibility
-be more defensive of api user errors
-flate needin/needout
-
-jbig2 rewrite
-dctencode params
-dctdecode app marker
+---
+
+for filters:
+
+	validate ahxd pushback
+	go through eof responsibility
+	be more defensive of api user errors
+	flate needin/needout
+
+	jbig2 rewrite
+	dctencode params
+	dctdecode app marker
 
diff --git a/apps/gtkpdf.c b/apps/gnome/gtkpdf.c
index 07730b38..07730b38 100644
--- a/apps/gtkpdf.c
+++ b/apps/gnome/gtkpdf.c
diff --git a/apps/macpdf.app/Contents/Info.plist b/apps/macosx/macpdf.app/Contents/Info.plist
index dc789640..dc789640 100644
--- a/apps/macpdf.app/Contents/Info.plist
+++ b/apps/macosx/macpdf.app/Contents/Info.plist
diff --git a/apps/macpdf.app/Contents/PkgInfo b/apps/macosx/macpdf.app/Contents/PkgInfo
index bd04210f..bd04210f 100644
--- a/apps/macpdf.app/Contents/PkgInfo
+++ b/apps/macosx/macpdf.app/Contents/PkgInfo
diff --git a/apps/macpdf.app/Contents/Resources/English.lproj/InfoPlist.strings b/apps/macosx/macpdf.app/Contents/Resources/English.lproj/InfoPlist.strings
index ca333a5d..ca333a5d 100644
--- a/apps/macpdf.app/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/apps/macosx/macpdf.app/Contents/Resources/English.lproj/InfoPlist.strings
diff --git a/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/classes.nib b/apps/macosx/macpdf.app/Contents/Resources/English.lproj/main.nib/classes.nib
index ea58db11..ea58db11 100644
--- a/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/classes.nib
+++ b/apps/macosx/macpdf.app/Contents/Resources/English.lproj/main.nib/classes.nib
diff --git a/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/info.nib b/apps/macosx/macpdf.app/Contents/Resources/English.lproj/main.nib/info.nib
index 8d83474f..8d83474f 100644
--- a/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/info.nib
+++ b/apps/macosx/macpdf.app/Contents/Resources/English.lproj/main.nib/info.nib
diff --git a/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/objects.xib b/apps/macosx/macpdf.app/Contents/Resources/English.lproj/main.nib/objects.xib
index 6e3aad82..6e3aad82 100644
--- a/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/objects.xib
+++ b/apps/macosx/macpdf.app/Contents/Resources/English.lproj/main.nib/objects.xib
diff --git a/apps/macpdf.app/Contents/Resources/macpdf.icns b/apps/macosx/macpdf.app/Contents/Resources/macpdf.icns
index d11b8be1..d11b8be1 100644
--- a/apps/macpdf.app/Contents/Resources/macpdf.icns
+++ b/apps/macosx/macpdf.app/Contents/Resources/macpdf.icns
diff --git a/apps/macpdf.c b/apps/macosx/macpdf.c
index 5e48a4ea..5e48a4ea 100644
--- a/apps/macpdf.c
+++ b/apps/macosx/macpdf.c
diff --git a/apps/x11pdf.c b/apps/unix/x11pdf.c
index 8a9610e8..8a9610e8 100644
--- a/apps/x11pdf.c
+++ b/apps/unix/x11pdf.c
diff --git a/apps/ximage.c b/apps/unix/ximage.c
index 9f7ec064..9f7ec064 100644
--- a/apps/ximage.c
+++ b/apps/unix/ximage.c
diff --git a/apps/gswin.ico b/apps/windows/gswin.ico
index d8b41fe2..d8b41fe2 100644
--- a/apps/gswin.ico
+++ b/apps/windows/gswin.ico
diff --git a/apps/gswin16.ico b/apps/windows/gswin16.ico
index b2380853..b2380853 100644
--- a/apps/gswin16.ico
+++ b/apps/windows/gswin16.ico
diff --git a/apps/w32pdf.c b/apps/windows/win_main.c
index 69f8a483..bdb0bb64 100644
--- a/apps/w32pdf.c
+++ b/apps/windows/win_main.c
@@ -49,7 +49,7 @@ int getfilename(char *buf, int len)
     ofn.lpstrFile = buf;
     ofn.nMaxFile = len;
     ofn.lpstrInitialDir = NULL;
-    ofn.lpstrTitle = "MuPDF: Open PDF file";
+    ofn.lpstrTitle = "GhostPDF: Open PDF file";
 	ofn.lpstrFilter = "PDF Files (*.pdf)\0*.pdf\0All Files\0*\0\0";
     ofn.Flags = OFN_FILEMUSTEXIST|OFN_HIDEREADONLY;
     return GetOpenFileName(&ofn);
@@ -104,8 +104,8 @@ char *getpassword(void)
 void help()
 {
 	char *msg = \
-		"w32pdf [-b] [-pzr page/zoom/rotate] [-u password] file.pdf\n\n"
-		"key commands:\n"
+		"ghostpdf [-b] [-pzr page/zoom/rotate] [-u password] file.pdf\n\n"
+		/*"key commands:\n" */
 		"    h\tdisplay this help\n"
 		"    <\trotate left\n"
 		"    >\trotate right\n"
@@ -119,9 +119,9 @@ void help()
 		"    m\tmark page for pop-back\n"
 		"    t\tpop back to last mark\n"
 		"    123g\tgo to page 123\n"
-		"\nMuPDF is Copyright (C) 2005 artofcode\n"
+		"\nGhostPDF is Copyright (C) 2005 artofcode LLC\n"
 		;
-	MessageBoxA(hwnd, msg, "MuPDF: Usage", MB_ICONINFORMATION);
+	MessageBoxA(hwnd, msg, "GhostPDF: Usage", MB_ICONINFORMATION);
 }
 
 void usage()
@@ -137,7 +137,7 @@ void winwarn(const char *fmt, ...)
 	va_start(ap, fmt);
 	vsprintf(buf, fmt, ap);
 	va_end(ap);
-	MessageBoxA(hwnd, buf, "MuPDF: Warning", MB_ICONWARNING);
+	MessageBoxA(hwnd, buf, "GhostPDF: Warning", MB_ICONWARNING);
 }
 
 void winerror(const char *fmt, ...)
@@ -147,7 +147,7 @@ void winerror(const char *fmt, ...)
 	va_start(ap, fmt);
 	vsprintf(buf, fmt, ap);
 	va_end(ap);
-	MessageBoxA(hwnd, buf, "MuPDF: Error", MB_ICONERROR);
+	MessageBoxA(hwnd, buf, "GhostPDF: Error", MB_ICONERROR);
 	exit(1);
 }
 
@@ -207,7 +207,7 @@ void winopen()
 
 	hdc = NULL;
 
-	SetWindowTextA(hwnd, "MuPDF");
+	SetWindowTextA(hwnd, "GhostPDF");
 
 	SetCursor(arrowcurs);
 }
diff --git a/apps/w32res.rc b/apps/windows/win_res.rc
index 02facf6b..36939c02 100644
--- a/apps/w32res.rc
+++ b/apps/windows/win_res.rc
@@ -1,4 +1,4 @@
-IDI_ICONGHOST ICON "apps/gswin16.ico"
+IDI_ICONGHOST ICON "gswin16.ico"
 
 IDD_DLOGPASS DIALOG 100, 100, 204, 60
 //STYLE DS_MODALFRAME | WS_POPUP 
diff --git a/base/base_cpudep.c b/fitz/base_cpudep.c
index 0db2e331..0db2e331 100644
--- a/base/base_cpudep.c
+++ b/fitz/base_cpudep.c
diff --git a/base/base_error.c b/fitz/base_error.c
index 926c48dc..926c48dc 100644
--- a/base/base_error.c
+++ b/fitz/base_error.c
diff --git a/base/base_hash.c b/fitz/base_hash.c
index 65bc7130..65bc7130 100644
--- a/base/base_hash.c
+++ b/fitz/base_hash.c
diff --git a/base/base_matrix.c b/fitz/base_matrix.c
index 7d7097c4..7d7097c4 100644
--- a/base/base_matrix.c
+++ b/fitz/base_matrix.c
diff --git a/base/base_memory.c b/fitz/base_memory.c
index 2c2f8e0d..2c2f8e0d 100644
--- a/base/base_memory.c
+++ b/fitz/base_memory.c
diff --git a/base/base_rect.c b/fitz/base_rect.c
index 2efb11f7..2efb11f7 100644
--- a/base/base_rect.c
+++ b/fitz/base_rect.c
diff --git a/base/base_rune.c b/fitz/base_rune.c
index 4aa81df3..4aa81df3 100644
--- a/base/base_rune.c
+++ b/fitz/base_rune.c
diff --git a/base/node_debug.c b/fitz/node_debug.c
index b03d4e28..b03d4e28 100644
--- a/base/node_debug.c
+++ b/fitz/node_debug.c
diff --git a/base/node_misc1.c b/fitz/node_misc1.c
index c2d6e876..c2d6e876 100644
--- a/base/node_misc1.c
+++ b/fitz/node_misc1.c
diff --git a/base/node_misc2.c b/fitz/node_misc2.c
index f21ebf36..cd4595f4 100644
--- a/base/node_misc2.c
+++ b/fitz/node_misc2.c
@@ -161,7 +161,7 @@ fz_boundtransformnode(fz_transformnode *node, fz_matrix ctm)
  */
 
 fz_error *
-fz_newmetanode(fz_node **nodep, fz_obj *name, fz_obj *dict)
+fz_newmetanode(fz_node **nodep, void *name, void *dict)
 {
 	fz_metanode *node;
 
diff --git a/base/node_optimize.c b/fitz/node_optimize.c
index d92aa812..d92aa812 100644
--- a/base/node_optimize.c
+++ b/fitz/node_optimize.c
diff --git a/base/node_path.c b/fitz/node_path.c
index 24b4dfc8..24b4dfc8 100644
--- a/base/node_path.c
+++ b/fitz/node_path.c
diff --git a/base/node_text.c b/fitz/node_text.c
index d88e04ec..d88e04ec 100644
--- a/base/node_text.c
+++ b/fitz/node_text.c
diff --git a/base/node_tree.c b/fitz/node_tree.c
index f6874711..f6874711 100644
--- a/base/node_tree.c
+++ b/fitz/node_tree.c
diff --git a/base/res_cmap.c b/fitz/res_cmap.c
index 577ba7c0..577ba7c0 100644
--- a/base/res_cmap.c
+++ b/fitz/res_cmap.c
diff --git a/base/res_colorspace.c b/fitz/res_colorspace.c
index 65909bfe..65909bfe 100644
--- a/base/res_colorspace.c
+++ b/fitz/res_colorspace.c
diff --git a/base/res_font.c b/fitz/res_font.c
index b7367ce1..b7367ce1 100644
--- a/base/res_font.c
+++ b/fitz/res_font.c
diff --git a/base/res_image.c b/fitz/res_image.c
index dbeb1fd8..dbeb1fd8 100644
--- a/base/res_image.c
+++ b/fitz/res_image.c
diff --git a/base/res_shade.c b/fitz/res_shade.c
index 67a64e4e..67a64e4e 100644
--- a/base/res_shade.c
+++ b/fitz/res_shade.c
diff --git a/base/util_getopt.c b/fitz/util_getopt.c
index c870e206..c870e206 100644
--- a/base/util_getopt.c
+++ b/fitz/util_getopt.c
diff --git a/base/util_strlcat.c b/fitz/util_strlcat.c
index c659b73a..c659b73a 100644
--- a/base/util_strlcat.c
+++ b/fitz/util_strlcat.c
diff --git a/base/util_strlcpy.c b/fitz/util_strlcpy.c
index 73416ae1..73416ae1 100644
--- a/base/util_strlcpy.c
+++ b/fitz/util_strlcpy.c
diff --git a/base/util_strsep.c b/fitz/util_strsep.c
index e54903ce..e54903ce 100644
--- a/base/util_strsep.c
+++ b/fitz/util_strsep.c
diff --git a/data/Dingbats.cff b/fonts/Dingbats.cff
index ea81c873..ea81c873 100644
--- a/data/Dingbats.cff
+++ b/fonts/Dingbats.cff
diff --git a/data/NimbusMonL-Bold.cff b/fonts/NimbusMonL-Bold.cff
index 64737cab..64737cab 100644
--- a/data/NimbusMonL-Bold.cff
+++ b/fonts/NimbusMonL-Bold.cff
diff --git a/data/NimbusMonL-BoldObli.cff b/fonts/NimbusMonL-BoldObli.cff
index 29645992..29645992 100644
--- a/data/NimbusMonL-BoldObli.cff
+++ b/fonts/NimbusMonL-BoldObli.cff
diff --git a/data/NimbusMonL-Regu.cff b/fonts/NimbusMonL-Regu.cff
index f39a9ab9..f39a9ab9 100644
--- a/data/NimbusMonL-Regu.cff
+++ b/fonts/NimbusMonL-Regu.cff
diff --git a/data/NimbusMonL-ReguObli.cff b/fonts/NimbusMonL-ReguObli.cff
index 1cf5f15d..1cf5f15d 100644
--- a/data/NimbusMonL-ReguObli.cff
+++ b/fonts/NimbusMonL-ReguObli.cff
diff --git a/data/NimbusRomNo9L-Medi.cff b/fonts/NimbusRomNo9L-Medi.cff
index a1b3c184..a1b3c184 100644
--- a/data/NimbusRomNo9L-Medi.cff
+++ b/fonts/NimbusRomNo9L-Medi.cff
diff --git a/data/NimbusRomNo9L-MediItal.cff b/fonts/NimbusRomNo9L-MediItal.cff
index 02f69d64..02f69d64 100644
--- a/data/NimbusRomNo9L-MediItal.cff
+++ b/fonts/NimbusRomNo9L-MediItal.cff
diff --git a/data/NimbusRomNo9L-Regu.cff b/fonts/NimbusRomNo9L-Regu.cff
index 3ddca966..3ddca966 100644
--- a/data/NimbusRomNo9L-Regu.cff
+++ b/fonts/NimbusRomNo9L-Regu.cff
diff --git a/data/NimbusRomNo9L-ReguItal.cff b/fonts/NimbusRomNo9L-ReguItal.cff
index 05a430e1..05a430e1 100644
--- a/data/NimbusRomNo9L-ReguItal.cff
+++ b/fonts/NimbusRomNo9L-ReguItal.cff
diff --git a/data/NimbusSanL-Bold.cff b/fonts/NimbusSanL-Bold.cff
index 2784e4e3..2784e4e3 100644
--- a/data/NimbusSanL-Bold.cff
+++ b/fonts/NimbusSanL-Bold.cff
diff --git a/data/NimbusSanL-BoldItal.cff b/fonts/NimbusSanL-BoldItal.cff
index 6b4bdcb3..6b4bdcb3 100644
--- a/data/NimbusSanL-BoldItal.cff
+++ b/fonts/NimbusSanL-BoldItal.cff
diff --git a/data/NimbusSanL-Regu.cff b/fonts/NimbusSanL-Regu.cff
index 716df70a..716df70a 100644
--- a/data/NimbusSanL-Regu.cff
+++ b/fonts/NimbusSanL-Regu.cff
diff --git a/data/NimbusSanL-ReguItal.cff b/fonts/NimbusSanL-ReguItal.cff
index 72c13d0e..72c13d0e 100644
--- a/data/NimbusSanL-ReguItal.cff
+++ b/fonts/NimbusSanL-ReguItal.cff
diff --git a/data/StandardSymL.cff b/fonts/StandardSymL.cff
index ab1f4b50..ab1f4b50 100644
--- a/data/StandardSymL.cff
+++ b/fonts/StandardSymL.cff
diff --git a/data/URWChanceryL-MediItal.cff b/fonts/URWChanceryL-MediItal.cff
index faed6179..faed6179 100644
--- a/data/URWChanceryL-MediItal.cff
+++ b/fonts/URWChanceryL-MediItal.cff
diff --git a/include/fitz.h b/include/fitz.h
index 4c9756a0..5db0fe0d 100644
--- a/include/fitz.h
+++ b/include/fitz.h
@@ -5,17 +5,10 @@
 
 #include "fitz/sysdep.h"
 #include "fitz/cpudep.h"
-
 #include "fitz/base.h"
 #include "fitz/math.h"
 #include "fitz/geometry.h"
 #include "fitz/hash.h"
-#include "fitz/crypt.h"
-
-#include "fitz/object.h"
-
-#include "fitz/filter.h"
-#include "fitz/file.h"
 
 #include "fitz/cmap.h"
 #include "fitz/font.h"
@@ -32,3 +25,8 @@
 #include "fitz/pathscan.h"
 #include "fitz/render.h"
 
+#include "stream/crypt.h"
+#include "stream/object.h"
+#include "stream/filter.h"
+#include "stream/file.h"
+
diff --git a/include/fitz/tree.h b/include/fitz/tree.h
index 15e4bcf1..ced3b491 100644
--- a/include/fitz/tree.h
+++ b/include/fitz/tree.h
@@ -128,8 +128,8 @@ struct fz_linknode_s
 struct fz_metanode_s
 {
 	fz_node super;
-	fz_obj *name;
-	fz_obj *dict;
+	void *name;
+	void *dict;
 };
 
 struct fz_imagenode_s
@@ -150,7 +150,7 @@ fz_rect fz_boundnode(fz_node *node, fz_matrix ctm);
 void fz_dropnode(fz_node *node);
 
 /* branch nodes */
-fz_error *fz_newmetanode(fz_node **nodep, fz_obj *name, fz_obj *dict);
+fz_error *fz_newmetanode(fz_node **nodep, void *name, void *dict);
 fz_error *fz_newovernode(fz_node **nodep);
 fz_error *fz_newmasknode(fz_node **nodep);
 fz_error *fz_newblendnode(fz_node **nodep, fz_colorspace *cs, fz_blendkind b, int k, int i);
diff --git a/include/mupdf/base14.h b/include/mupdf/base14.h
index 1630d4dd..f1668d53 100644
--- a/include/mupdf/base14.h
+++ b/include/mupdf/base14.h
@@ -1,30 +1,30 @@
-extern unsigned char Dingbats_cff[];
-extern unsigned int Dingbats_cff_len;
-extern unsigned char NimbusMonL_Bold_cff[];
-extern unsigned int NimbusMonL_Bold_cff_len;
-extern unsigned char NimbusMonL_BoldObli_cff[];
-extern unsigned int NimbusMonL_BoldObli_cff_len;
-extern unsigned char NimbusMonL_Regu_cff[];
-extern unsigned int NimbusMonL_Regu_cff_len;
-extern unsigned char NimbusMonL_ReguObli_cff[];
-extern unsigned int NimbusMonL_ReguObli_cff_len;
-extern unsigned char NimbusRomNo9L_Medi_cff[];
-extern unsigned int NimbusRomNo9L_Medi_cff_len;
-extern unsigned char NimbusRomNo9L_MediItal_cff[];
-extern unsigned int NimbusRomNo9L_MediItal_cff_len;
-extern unsigned char NimbusRomNo9L_Regu_cff[];
-extern unsigned int NimbusRomNo9L_Regu_cff_len;
-extern unsigned char NimbusRomNo9L_ReguItal_cff[];
-extern unsigned int NimbusRomNo9L_ReguItal_cff_len;
-extern unsigned char NimbusSanL_Bold_cff[];
-extern unsigned int NimbusSanL_Bold_cff_len;
-extern unsigned char NimbusSanL_BoldItal_cff[];
-extern unsigned int NimbusSanL_BoldItal_cff_len;
-extern unsigned char NimbusSanL_Regu_cff[];
-extern unsigned int NimbusSanL_Regu_cff_len;
-extern unsigned char NimbusSanL_ReguItal_cff[];
-extern unsigned int NimbusSanL_ReguItal_cff_len;
-extern unsigned char StandardSymL_cff[];
-extern unsigned int StandardSymL_cff_len;
-extern unsigned char URWChanceryL_MediItal_cff[];
-extern unsigned int URWChanceryL_MediItal_cff_len;
+extern unsigned char fonts_Dingbats_cff[];
+extern unsigned int fonts_Dingbats_cff_len;
+extern unsigned char fonts_NimbusMonL_Bold_cff[];
+extern unsigned int fonts_NimbusMonL_Bold_cff_len;
+extern unsigned char fonts_NimbusMonL_BoldObli_cff[];
+extern unsigned int fonts_NimbusMonL_BoldObli_cff_len;
+extern unsigned char fonts_NimbusMonL_Regu_cff[];
+extern unsigned int fonts_NimbusMonL_Regu_cff_len;
+extern unsigned char fonts_NimbusMonL_ReguObli_cff[];
+extern unsigned int fonts_NimbusMonL_ReguObli_cff_len;
+extern unsigned char fonts_NimbusRomNo9L_Medi_cff[];
+extern unsigned int fonts_NimbusRomNo9L_Medi_cff_len;
+extern unsigned char fonts_NimbusRomNo9L_MediItal_cff[];
+extern unsigned int fonts_NimbusRomNo9L_MediItal_cff_len;
+extern unsigned char fonts_NimbusRomNo9L_Regu_cff[];
+extern unsigned int fonts_NimbusRomNo9L_Regu_cff_len;
+extern unsigned char fonts_NimbusRomNo9L_ReguItal_cff[];
+extern unsigned int fonts_NimbusRomNo9L_ReguItal_cff_len;
+extern unsigned char fonts_NimbusSanL_Bold_cff[];
+extern unsigned int fonts_NimbusSanL_Bold_cff_len;
+extern unsigned char fonts_NimbusSanL_BoldItal_cff[];
+extern unsigned int fonts_NimbusSanL_BoldItal_cff_len;
+extern unsigned char fonts_NimbusSanL_Regu_cff[];
+extern unsigned int fonts_NimbusSanL_Regu_cff_len;
+extern unsigned char fonts_NimbusSanL_ReguItal_cff[];
+extern unsigned int fonts_NimbusSanL_ReguItal_cff_len;
+extern unsigned char fonts_StandardSymL_cff[];
+extern unsigned int fonts_StandardSymL_cff_len;
+extern unsigned char fonts_URWChanceryL_MediItal_cff[];
+extern unsigned int fonts_URWChanceryL_MediItal_cff_len;
diff --git a/include/fitz/crypt.h b/include/stream/crypt.h
index 647a1eda..647a1eda 100644
--- a/include/fitz/crypt.h
+++ b/include/stream/crypt.h
diff --git a/include/fitz/file.h b/include/stream/file.h
index c87ccf5d..c87ccf5d 100644
--- a/include/fitz/file.h
+++ b/include/stream/file.h
diff --git a/include/fitz/filter.h b/include/stream/filter.h
index bb33b8eb..bb33b8eb 100644
--- a/include/fitz/filter.h
+++ b/include/stream/filter.h
diff --git a/include/fitz/object.h b/include/stream/object.h
index 34b62f59..34b62f59 100644
--- a/include/fitz/object.h
+++ b/include/stream/object.h
diff --git a/mupdf/annot.c b/mupdf/pdf_annot.c
index 055dae75..055dae75 100644
--- a/mupdf/annot.c
+++ b/mupdf/pdf_annot.c
diff --git a/mupdf/build.c b/mupdf/pdf_build.c
index 2c56e484..2c56e484 100644
--- a/mupdf/build.c
+++ b/mupdf/pdf_build.c
diff --git a/mupdf/cmap.c b/mupdf/pdf_cmap.c
index 5029ae4a..5029ae4a 100644
--- a/mupdf/cmap.c
+++ b/mupdf/pdf_cmap.c
diff --git a/mupdf/colorspace1.c b/mupdf/pdf_colorspace1.c
index e98beaa1..e98beaa1 100644
--- a/mupdf/colorspace1.c
+++ b/mupdf/pdf_colorspace1.c
diff --git a/mupdf/colorspace2.c b/mupdf/pdf_colorspace2.c
index 1574c801..1574c801 100644
--- a/mupdf/colorspace2.c
+++ b/mupdf/pdf_colorspace2.c
diff --git a/mupdf/crypt.c b/mupdf/pdf_crypt.c
index 2732256e..2732256e 100644
--- a/mupdf/crypt.c
+++ b/mupdf/pdf_crypt.c
diff --git a/mupdf/debug.c b/mupdf/pdf_debug.c
index 4704794b..4704794b 100644
--- a/mupdf/debug.c
+++ b/mupdf/pdf_debug.c
diff --git a/mupdf/doctor.c b/mupdf/pdf_doctor.c
index be683592..be683592 100644
--- a/mupdf/doctor.c
+++ b/mupdf/pdf_doctor.c
diff --git a/mupdf/font.c b/mupdf/pdf_font.c
index d92ffe50..d92ffe50 100644
--- a/mupdf/font.c
+++ b/mupdf/pdf_font.c
diff --git a/mupdf/fontagl.c b/mupdf/pdf_fontagl.c
index de4156a2..de4156a2 100644
--- a/mupdf/fontagl.c
+++ b/mupdf/pdf_fontagl.c
diff --git a/mupdf/fontenc.c b/mupdf/pdf_fontenc.c
index 7de7b5e9..7de7b5e9 100644
--- a/mupdf/fontenc.c
+++ b/mupdf/pdf_fontenc.c
diff --git a/mupdf/fontfile.c b/mupdf/pdf_fontfile.c
index e792ac15..7ca24c8f 100644
--- a/mupdf/fontfile.c
+++ b/mupdf/pdf_fontfile.c
@@ -44,21 +44,21 @@ static void loadfontdata(int i, unsigned char **d, unsigned int *l)
 {
 	switch (i)
 	{
-	case  0: *d=NimbusMonL_Regu_cff;*l=NimbusMonL_Regu_cff_len;break;
-	case  1: *d=NimbusMonL_Bold_cff;*l=NimbusMonL_Bold_cff_len;break;
-	case  2: *d=NimbusMonL_ReguObli_cff;*l=NimbusMonL_ReguObli_cff_len;break;
-	case  3: *d=NimbusMonL_BoldObli_cff;*l=NimbusMonL_BoldObli_cff_len;break;
-	case  4: *d=NimbusSanL_Regu_cff;*l=NimbusSanL_Regu_cff_len;break;
-	case  5: *d=NimbusSanL_Bold_cff;*l=NimbusSanL_Bold_cff_len;break;
-	case  6: *d=NimbusSanL_ReguItal_cff;*l=NimbusSanL_ReguItal_cff_len;break;
-	case  7: *d=NimbusSanL_BoldItal_cff;*l=NimbusSanL_BoldItal_cff_len;break;
-	case  8: *d=NimbusRomNo9L_Regu_cff;*l=NimbusRomNo9L_Regu_cff_len;break;
-	case  9: *d=NimbusRomNo9L_Medi_cff;*l=NimbusRomNo9L_Medi_cff_len;break;
-	case 10: *d=NimbusRomNo9L_ReguItal_cff;*l=NimbusRomNo9L_ReguItal_cff_len;break;
-	case 11: *d=NimbusRomNo9L_MediItal_cff;*l=NimbusRomNo9L_MediItal_cff_len;break;
-	case 12: *d=StandardSymL_cff;*l=StandardSymL_cff_len;break;
-	case 13: *d=Dingbats_cff;*l=Dingbats_cff_len;break;
-	default: *d=URWChanceryL_MediItal_cff;*l=URWChanceryL_MediItal_cff_len;break;
+	case  0: *d=fonts_NimbusMonL_Regu_cff;*l=fonts_NimbusMonL_Regu_cff_len;break;
+	case  1: *d=fonts_NimbusMonL_Bold_cff;*l=fonts_NimbusMonL_Bold_cff_len;break;
+	case  2: *d=fonts_NimbusMonL_ReguObli_cff;*l=fonts_NimbusMonL_ReguObli_cff_len;break;
+	case  3: *d=fonts_NimbusMonL_BoldObli_cff;*l=fonts_NimbusMonL_BoldObli_cff_len;break;
+	case  4: *d=fonts_NimbusSanL_Regu_cff;*l=fonts_NimbusSanL_Regu_cff_len;break;
+	case  5: *d=fonts_NimbusSanL_Bold_cff;*l=fonts_NimbusSanL_Bold_cff_len;break;
+	case  6: *d=fonts_NimbusSanL_ReguItal_cff;*l=fonts_NimbusSanL_ReguItal_cff_len;break;
+	case  7: *d=fonts_NimbusSanL_BoldItal_cff;*l=fonts_NimbusSanL_BoldItal_cff_len;break;
+	case  8: *d=fonts_NimbusRomNo9L_Regu_cff;*l=fonts_NimbusRomNo9L_Regu_cff_len;break;
+	case  9: *d=fonts_NimbusRomNo9L_Medi_cff;*l=fonts_NimbusRomNo9L_Medi_cff_len;break;
+	case 10: *d=fonts_NimbusRomNo9L_ReguItal_cff;*l=fonts_NimbusRomNo9L_ReguItal_cff_len;break;
+	case 11: *d=fonts_NimbusRomNo9L_MediItal_cff;*l=fonts_NimbusRomNo9L_MediItal_cff_len;break;
+	case 12: *d=fonts_StandardSymL_cff;*l=fonts_StandardSymL_cff_len;break;
+	case 13: *d=fonts_Dingbats_cff;*l=fonts_Dingbats_cff_len;break;
+	default: *d=fonts_URWChanceryL_MediItal_cff;*l=fonts_URWChanceryL_MediItal_cff_len;break;
 	}
 }
 
diff --git a/mupdf/fontfilefc.c b/mupdf/pdf_fontfilefc.c
index b4a92929..b4a92929 100644
--- a/mupdf/fontfilefc.c
+++ b/mupdf/pdf_fontfilefc.c
diff --git a/mupdf/fontfilems.c b/mupdf/pdf_fontfilems.c
index a5431bfb..a5431bfb 100644
--- a/mupdf/fontfilems.c
+++ b/mupdf/pdf_fontfilems.c
diff --git a/mupdf/function.c b/mupdf/pdf_function.c
index 2cedefba..2cedefba 100644
--- a/mupdf/function.c
+++ b/mupdf/pdf_function.c
diff --git a/mupdf/image.c b/mupdf/pdf_image.c
index 4fd6643c..4fd6643c 100644
--- a/mupdf/image.c
+++ b/mupdf/pdf_image.c
diff --git a/mupdf/interpret.c b/mupdf/pdf_interpret.c
index d4b2b2be..d4b2b2be 100644
--- a/mupdf/interpret.c
+++ b/mupdf/pdf_interpret.c
diff --git a/mupdf/lex.c b/mupdf/pdf_lex.c
index 36e7f50a..36e7f50a 100644
--- a/mupdf/lex.c
+++ b/mupdf/pdf_lex.c
diff --git a/mupdf/nametree.c b/mupdf/pdf_nametree.c
index 706c0e50..706c0e50 100644
--- a/mupdf/nametree.c
+++ b/mupdf/pdf_nametree.c
diff --git a/mupdf/open.c b/mupdf/pdf_open.c
index 34caa862..34caa862 100644
--- a/mupdf/open.c
+++ b/mupdf/pdf_open.c
diff --git a/mupdf/outline.c b/mupdf/pdf_outline.c
index c41d96f5..c41d96f5 100644
--- a/mupdf/outline.c
+++ b/mupdf/pdf_outline.c
diff --git a/mupdf/page.c b/mupdf/pdf_page.c
index 994657e3..994657e3 100644
--- a/mupdf/page.c
+++ b/mupdf/pdf_page.c
diff --git a/mupdf/pagetree.c b/mupdf/pdf_pagetree.c
index 315c2bd2..315c2bd2 100644
--- a/mupdf/pagetree.c
+++ b/mupdf/pdf_pagetree.c
diff --git a/mupdf/parse.c b/mupdf/pdf_parse.c
index 9217f0af..9217f0af 100644
--- a/mupdf/parse.c
+++ b/mupdf/pdf_parse.c
diff --git a/mupdf/pattern.c b/mupdf/pdf_pattern.c
index 76b52034..76b52034 100644
--- a/mupdf/pattern.c
+++ b/mupdf/pdf_pattern.c
diff --git a/mupdf/repair.c b/mupdf/pdf_repair.c
index e533d826..e533d826 100644
--- a/mupdf/repair.c
+++ b/mupdf/pdf_repair.c
diff --git a/mupdf/resources.c b/mupdf/pdf_resources.c
index 73d7cc8a..73d7cc8a 100644
--- a/mupdf/resources.c
+++ b/mupdf/pdf_resources.c
diff --git a/mupdf/save.c b/mupdf/pdf_save.c
index 344d942c..344d942c 100644
--- a/mupdf/save.c
+++ b/mupdf/pdf_save.c
diff --git a/mupdf/shade.c b/mupdf/pdf_shade.c
index 9c31c599..9c31c599 100644
--- a/mupdf/shade.c
+++ b/mupdf/pdf_shade.c
diff --git a/mupdf/shade1.c b/mupdf/pdf_shade1.c
index f25616bd..f25616bd 100644
--- a/mupdf/shade1.c
+++ b/mupdf/pdf_shade1.c
diff --git a/mupdf/shade2.c b/mupdf/pdf_shade2.c
index 4af9e056..4af9e056 100644
--- a/mupdf/shade2.c
+++ b/mupdf/pdf_shade2.c
diff --git a/mupdf/shade3.c b/mupdf/pdf_shade3.c
index 59cfaed2..59cfaed2 100644
--- a/mupdf/shade3.c
+++ b/mupdf/pdf_shade3.c
diff --git a/mupdf/shade4.c b/mupdf/pdf_shade4.c
index dfc821a2..dfc821a2 100644
--- a/mupdf/shade4.c
+++ b/mupdf/pdf_shade4.c
diff --git a/mupdf/store.c b/mupdf/pdf_store.c
index d46cd628..d46cd628 100644
--- a/mupdf/store.c
+++ b/mupdf/pdf_store.c
diff --git a/mupdf/stream.c b/mupdf/pdf_stream.c
index 01958853..01958853 100644
--- a/mupdf/stream.c
+++ b/mupdf/pdf_stream.c
diff --git a/mupdf/type3.c b/mupdf/pdf_type3.c
index 5927b8ba..5927b8ba 100644
--- a/mupdf/type3.c
+++ b/mupdf/pdf_type3.c
diff --git a/mupdf/unicode.c b/mupdf/pdf_unicode.c
index ccfd3f30..ccfd3f30 100644
--- a/mupdf/unicode.c
+++ b/mupdf/pdf_unicode.c
diff --git a/mupdf/xobject.c b/mupdf/pdf_xobject.c
index 473a1485..473a1485 100644
--- a/mupdf/xobject.c
+++ b/mupdf/pdf_xobject.c
diff --git a/mupdf/xref.c b/mupdf/pdf_xref.c
index 01b3dbf8..01b3dbf8 100644
--- a/mupdf/xref.c
+++ b/mupdf/pdf_xref.c
diff --git a/stream/filt_dctd.c b/stream/filt_dctd.c
index 750f7893..ebdf2f65 100644
--- a/stream/filt_dctd.c
+++ b/stream/filt_dctd.c
@@ -1,6 +1,6 @@
 #include <fitz.h>
 
-#include "dctc.h"
+#include "filt_dctc.h"
 
 typedef struct fz_dctd_s fz_dctd;
 
diff --git a/stream/filt_dcte.c b/stream/filt_dcte.c
index 547721b4..74f6bbd3 100644
--- a/stream/filt_dcte.c
+++ b/stream/filt_dcte.c
@@ -1,6 +1,6 @@
 #include <fitz.h>
 
-#include "dctc.h"
+#include "filt_dctc.h"
 
 typedef struct fz_dcte_s fz_dcte;
 
diff --git a/stream/filt_faxd.c b/stream/filt_faxd.c
index d8686a08..ade56c73 100644
--- a/stream/filt_faxd.c
+++ b/stream/filt_faxd.c
@@ -1,7 +1,7 @@
 #include <fitz.h>
 
-#include "faxd.h"
-#include "faxc.h"
+#include "filt_faxd.h"
+#include "filt_faxc.h"
 
 enum
 {
diff --git a/stream/filt_faxdtab.c b/stream/filt_faxdtab.c
index 8e387d03..6efcf053 100644
--- a/stream/filt_faxdtab.c
+++ b/stream/filt_faxdtab.c
@@ -4,7 +4,7 @@
 /* as the files scfetab.c and scfdgen.c from which it was derived. */
 /* Consult those files for the licensing terms and conditions. */
 
-#include "faxd.h"
+#include "filt_faxd.h"
 
 /* White decoding table. */
 const cfd_node cf_white_decode[] = {
diff --git a/stream/filt_faxe.c b/stream/filt_faxe.c
index e96c5ace..c9155e01 100644
--- a/stream/filt_faxe.c
+++ b/stream/filt_faxe.c
@@ -1,7 +1,7 @@
 #include <fitz.h>
 
-#include "faxe.h"
-#include "faxc.h"
+#include "filt_faxe.h"
+#include "filt_faxc.h"
 
 /* TODO: honor Rows param */
 
diff --git a/stream/filt_faxetab.c b/stream/filt_faxetab.c
index 409039f4..34914c2d 100644
--- a/stream/filt_faxetab.c
+++ b/stream/filt_faxetab.c
@@ -1,6 +1,6 @@
 /* Tables for CCITTFaxEncode filter */
 
-#include "faxe.h"
+#include "filt_faxe.h"
 
 /* Define the end-of-line code. */
 const cfe_code cf_run_eol = {1, 12};