11 files changed, 13 insertions, 21 deletions
diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj
index f4e6f228..b541347a 100644
--- a/platform/win32/libmupdf.vcproj
+++ b/platform/win32/libmupdf.vcproj
@@ -1145,7 +1145,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\fitz\colorspace-impl.h"
+				RelativePath="..\..\source\fitz\colorspace-imp.h"
 				>
 			</File>
 			<File
@@ -1281,7 +1281,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\fitz\font-impl.h"
+				RelativePath="..\..\source\fitz\font-imp.h"
 				>
 			</File>
 			<File
diff --git a/source/fitz/bidi-impl.h b/source/fitz/bidi-imp.h
index 08749879..cb0f8871 100644
--- a/source/fitz/bidi-impl.h
+++ b/source/fitz/bidi-imp.h
@@ -22,8 +22,6 @@
     ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE SOFTWARE.
 */
 
-#include "mupdf/fitz.h"
-
 /* Bidirectional Character Types
  * as defined by the Unicode Bidirectional Algorithm Table 3-7.
  * The list of bidirectional character types here is not grouped the
diff --git a/source/fitz/bidi-std.c b/source/fitz/bidi-std.c
index 1f88bdee..792db71b 100644
--- a/source/fitz/bidi-std.c
+++ b/source/fitz/bidi-std.c
@@ -4,7 +4,7 @@
 
 // Bidi include file
 #include "mupdf/fitz.h"
-#include "bidi-impl.h"
+#include "bidi-imp.h"
 
 #ifndef TRUE
 #define TRUE (1)
diff --git a/source/fitz/bidi.c b/source/fitz/bidi.c
index 6f011310..4436b615 100644
--- a/source/fitz/bidi.c
+++ b/source/fitz/bidi.c
@@ -35,7 +35,7 @@
  */
 
 #include "mupdf/fitz.h"
-#include "bidi-impl.h" /* standard bidi code interface */
+#include "bidi-imp.h" /* standard bidi code interface */
 
 /*
  * Macros...
diff --git a/source/fitz/colorspace-impl.h b/source/fitz/colorspace-imp.h
index 1ce2e167..4d3f8825 100644
--- a/source/fitz/colorspace-impl.h
+++ b/source/fitz/colorspace-imp.h
@@ -1,5 +1,5 @@
-#ifndef MUPDF_FITZ_COLORSPACE_IMPL_H
-#define MUPDF_FITZ_COLORSPACE_IMPL_H
+#ifndef MUPDF_FITZ_COLORSPACE_IMP_H
+#define MUPDF_FITZ_COLORSPACE_IMP_H
 
 struct fz_colorspace_s
 {
diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c
index 0842c7f1..828054c0 100644
--- a/source/fitz/colorspace.c
+++ b/source/fitz/colorspace.c
@@ -1,6 +1,6 @@
 #include "mupdf/fitz.h"
 
-#include "colorspace-impl.h"
+#include "colorspace-imp.h"
 
 #define SLOWCMYK
 
diff --git a/source/fitz/font-impl.h b/source/fitz/font-imp.h
index 231940ed..59ae628e 100644
--- a/source/fitz/font-impl.h
+++ b/source/fitz/font-imp.h
@@ -1,11 +1,5 @@
-#ifndef MUPDF_FITZ_FONT_IMPL_H
-#define MUPDF_FITZ_FONT_IMPL_H
-
-#include "mupdf/fitz/font.h"
-
-/* forward declaration for circular dependency */
-struct fz_device_s;
-struct fz_display_list_s;
+#ifndef MUPDF_FITZ_FONT_IMP_H
+#define MUPDF_FITZ_FONT_IMP_H
 
 struct fz_font_s
 {
diff --git a/source/fitz/font.c b/source/fitz/font.c
index e3ae4d7d..92642ec0 100644
--- a/source/fitz/font.c
+++ b/source/fitz/font.c
@@ -1,6 +1,6 @@
 #include "mupdf/fitz.h"
 
-#include "font-impl.h"
+#include "font-imp.h"
 
 #include <ft2build.h>
 #include "hb.h"
diff --git a/source/pdf/pdf-colorspace.c b/source/pdf/pdf-colorspace.c
index 05c54b31..a1fd8140 100644
--- a/source/pdf/pdf-colorspace.c
+++ b/source/pdf/pdf-colorspace.c
@@ -1,6 +1,6 @@
 #include "mupdf/pdf.h"
 
-#include "../fitz/colorspace-impl.h"
+#include "../fitz/colorspace-imp.h"
 
 /* ICCBased */
 
diff --git a/source/pdf/pdf-font.c b/source/pdf/pdf-font.c
index 133462d6..5b5c7735 100644
--- a/source/pdf/pdf-font.c
+++ b/source/pdf/pdf-font.c
@@ -1,6 +1,6 @@
 #include "mupdf/pdf.h"
 
-#include "../fitz/font-impl.h"
+#include "../fitz/font-imp.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
diff --git a/source/pdf/pdf-type3.c b/source/pdf/pdf-type3.c
index 3992ebbc..ede5a5ee 100644
--- a/source/pdf/pdf-type3.c
+++ b/source/pdf/pdf-type3.c
@@ -1,6 +1,6 @@
 #include "mupdf/pdf.h"
 
-#include "../fitz/font-impl.h"
+#include "../fitz/font-imp.h"
 
 static void
 pdf_run_glyph_func(fz_context *ctx, void *doc, void *rdb, fz_buffer *contents, fz_device *dev, const fz_matrix *ctm, void *gstate, int nested_depth)