diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 64872d31..9a629961 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -59,7 +59,62 @@ EXTRA_HFILES=
 
 # Header files to ignore when scanning. Use base file name, no paths
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=merge.h debug.h internal.h intl.h CImg.h im_video_v4l1.h global_balance.h dbh.h base64.h templates.h mosaic.h deprecated.h thread.h private.h internal.h almostdeprecated.h inlines.h struct.h disp.h vector.h
+
+# we only want to document public API, so have all .h files not in
+# libvips/include in here ... and a few from libvips/include as well
+
+IGNORE_VIPS_INCLUDE = \
+	almostdeprecated.h \
+	cimg_funcs.h \
+	deprecated.h \
+	vips7compat.h \
+	dispatch.h \
+	enumtypes.h \
+	internal.h \
+	thread.h \
+	intl.h \
+	format.h \
+	mask.h \
+	private.h \
+	video.h
+
+# ignore all .h files in libvips/*, theese are internal
+IGNORE_VIPS_C = \
+	binary.h \
+	parithmetic.h \
+	statistic.h \
+	unaryconst.h \
+	unary.h \
+	CImg.h \
+	pcolour.h \
+	bandary.h \
+	pconversion.h \
+	pcreate.h \
+	point.h \
+	analyze2vips.h \
+	csv.h \
+	dbh.h \
+	fits.h \
+	jpeg.h \
+	magick.h \
+	matlab.h \
+	openexr2vips.h \
+	openslide2vips.h \
+	ppm.h \
+	radiance.h \
+	tiff.h \
+	vipspng.h \
+	draw.h \
+	base64.h \
+	sink.h \
+	global_balance.h \
+	merge.h \
+	mosaic.h \
+	presample.h \
+	templates.h \
+	im_video_v4l1.h
+
+IGNORE_HFILES = $(IGNORE_VIPS_INCLUDE) $(IGNORE_VIPS_C)
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/doc/reference/libvips-docs.sgml.in b/doc/reference/libvips-docs.sgml.in
index fd528ebf..7bed71d3 100644
--- a/doc/reference/libvips-docs.sgml.in
+++ b/doc/reference/libvips-docs.sgml.in
@@ -41,12 +41,10 @@
     <xi:include href="xml/histograms_lut.xml"/>
     <xi:include href="xml/inplace.xml"/>
     <xi:include href="xml/interpolate.xml"/>
-    <xi:include href="xml/mask.xml"/>
     <xi:include href="xml/morphology.xml"/>
     <xi:include href="xml/mosaicing.xml"/>
     <xi:include href="xml/create.xml"/>
     <xi:include href="xml/resample.xml"/>
-    <xi:include href="xml/video.xml"/>
   </chapter>
 
   <chapter>
diff --git a/libvips/arithmetic/Makefile.am b/libvips/arithmetic/Makefile.am
index 9082ff17..1d8799c0 100644
--- a/libvips/arithmetic/Makefile.am
+++ b/libvips/arithmetic/Makefile.am
@@ -18,7 +18,7 @@ libarithmetic_la_SOURCES = \
 	subtract.c \
 	math.c \
 	arithmetic.c \
-	arithmetic.h \
+	parithmetic.h \
 	binary.c \
 	binary.h \
 	unary.c \
diff --git a/libvips/arithmetic/arithmetic.c b/libvips/arithmetic/arithmetic.c
index 560804f3..2bdd6800 100644
--- a/libvips/arithmetic/arithmetic.c
+++ b/libvips/arithmetic/arithmetic.c
@@ -52,7 +52,7 @@
 
 #include <vips/vips.h>
 
-#include "arithmetic.h"
+#include "parithmetic.h"
 
 /** 
  * SECTION: arithmetic
diff --git a/libvips/arithmetic/binary.h b/libvips/arithmetic/binary.h
index ea18eed5..78974547 100644
--- a/libvips/arithmetic/binary.h
+++ b/libvips/arithmetic/binary.h
@@ -33,13 +33,11 @@
 
 #include <vips/vips.h>
 
-#include "arithmetic.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /*__cplusplus*/
 
-#include "arithmetic.h"
+#include "parithmetic.h"
 
 #define VIPS_TYPE_BINARY (vips_binary_get_type())
 #define VIPS_BINARY( obj ) \
diff --git a/libvips/arithmetic/arithmetic.h b/libvips/arithmetic/parithmetic.h
similarity index 94%
rename from libvips/arithmetic/arithmetic.h
rename to libvips/arithmetic/parithmetic.h
index cb521d90..4fe431cb 100644
--- a/libvips/arithmetic/arithmetic.h
+++ b/libvips/arithmetic/parithmetic.h
@@ -28,12 +28,8 @@
 
  */
 
-/* We don't want to get confused with the arithmetic.h in include, put an
- * extra _ in there.
- */
-
-#ifndef VIPS__ARITHMETIC_H
-#define VIPS__ARITHMETIC_H
+#ifndef VIPS_PARITHMETIC_H
+#define VIPS_PARITHMETIC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -118,6 +114,6 @@ VipsVector *vips_arithmetic_get_program( VipsArithmeticClass *klass,
 }
 #endif /*__cplusplus*/
 
-#endif /*VIPS__ARITHMETIC_H*/
+#endif /*VIPS_PARITHMETIC_H*/
 
 
diff --git a/libvips/arithmetic/unary.h b/libvips/arithmetic/unary.h
index 9c7c9df4..ce3850bf 100644
--- a/libvips/arithmetic/unary.h
+++ b/libvips/arithmetic/unary.h
@@ -35,7 +35,7 @@
 extern "C" {
 #endif /*__cplusplus*/
 
-#include "arithmetic.h"
+#include "parithmetic.h"
 
 #define VIPS_TYPE_UNARY (vips_unary_get_type())
 #define VIPS_UNARY( obj ) \
diff --git a/libvips/colour/LCh2Lab.c b/libvips/colour/LCh2Lab.c
index 689ed8bc..7e646fd9 100644
--- a/libvips/colour/LCh2Lab.c
+++ b/libvips/colour/LCh2Lab.c
@@ -50,7 +50,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourSpace VipsLCh2Lab;
 typedef VipsColourSpaceClass VipsLCh2LabClass;
diff --git a/libvips/colour/LCh2UCS.c b/libvips/colour/LCh2UCS.c
index 5697aee2..5b5bed0f 100644
--- a/libvips/colour/LCh2UCS.c
+++ b/libvips/colour/LCh2UCS.c
@@ -44,7 +44,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourSpace VipsLCh2CMC;
 typedef VipsColourSpaceClass VipsLCh2CMCClass;
diff --git a/libvips/colour/Lab2LCh.c b/libvips/colour/Lab2LCh.c
index 1415ab62..74228147 100644
--- a/libvips/colour/Lab2LCh.c
+++ b/libvips/colour/Lab2LCh.c
@@ -44,7 +44,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourSpace VipsLab2LCh;
 typedef VipsColourSpaceClass VipsLab2LChClass;
diff --git a/libvips/colour/Lab2LabQ.c b/libvips/colour/Lab2LabQ.c
index 8099add5..82e68bc1 100644
--- a/libvips/colour/Lab2LabQ.c
+++ b/libvips/colour/Lab2LabQ.c
@@ -69,7 +69,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourCode VipsLab2LabQ;
 typedef VipsColourCodeClass VipsLab2LabQClass;
diff --git a/libvips/colour/Lab2LabS.c b/libvips/colour/Lab2LabS.c
index 765f6890..c489a863 100644
--- a/libvips/colour/Lab2LabS.c
+++ b/libvips/colour/Lab2LabS.c
@@ -46,7 +46,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourCode VipsLab2LabS;
 typedef VipsColourCodeClass VipsLab2LabSClass;
diff --git a/libvips/colour/Lab2XYZ.c b/libvips/colour/Lab2XYZ.c
index 1e1bc352..f5ed6c1a 100644
--- a/libvips/colour/Lab2XYZ.c
+++ b/libvips/colour/Lab2XYZ.c
@@ -59,7 +59,7 @@
 #include <vips/vips.h>
 #include <vips/debug.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef struct _VipsLab2XYZ {
 	VipsColourSpace parent_instance;
diff --git a/libvips/colour/LabQ2Lab.c b/libvips/colour/LabQ2Lab.c
index d0b5ce6c..111ed67a 100644
--- a/libvips/colour/LabQ2Lab.c
+++ b/libvips/colour/LabQ2Lab.c
@@ -56,7 +56,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourCode VipsLabQ2Lab;
 typedef VipsColourCodeClass VipsLabQ2LabClass;
diff --git a/libvips/colour/LabQ2LabS.c b/libvips/colour/LabQ2LabS.c
index 140ade07..4df0b2b5 100644
--- a/libvips/colour/LabQ2LabS.c
+++ b/libvips/colour/LabQ2LabS.c
@@ -48,7 +48,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourCode VipsLabQ2LabS;
 typedef VipsColourCodeClass VipsLabQ2LabSClass;
diff --git a/libvips/colour/LabQ2sRGB.c b/libvips/colour/LabQ2sRGB.c
index 8540d82f..a7052408 100644
--- a/libvips/colour/LabQ2sRGB.c
+++ b/libvips/colour/LabQ2sRGB.c
@@ -62,7 +62,7 @@
 #include <vips/vips.h>
 #include <vips/internal.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourCode VipsLabQ2sRGB;
 typedef VipsColourCodeClass VipsLabQ2sRGBClass;
diff --git a/libvips/colour/LabS2Lab.c b/libvips/colour/LabS2Lab.c
index 301446e8..fd326362 100644
--- a/libvips/colour/LabS2Lab.c
+++ b/libvips/colour/LabS2Lab.c
@@ -42,7 +42,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourCode VipsLabS2Lab;
 typedef VipsColourCodeClass VipsLabS2LabClass;
diff --git a/libvips/colour/LabS2LabQ.c b/libvips/colour/LabS2LabQ.c
index 872de99f..6d55e5ff 100644
--- a/libvips/colour/LabS2LabQ.c
+++ b/libvips/colour/LabS2LabQ.c
@@ -53,7 +53,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourCode VipsLabS2LabQ;
 typedef VipsColourCodeClass VipsLabS2LabQClass;
diff --git a/libvips/colour/Makefile.am b/libvips/colour/Makefile.am
index 57fcc3a0..c47ccc90 100644
--- a/libvips/colour/Makefile.am
+++ b/libvips/colour/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libcolour.la
 
 libcolour_la_SOURCES = \
 	colour.c \
-	colour.h \
+	pcolour.h \
 	colourspace.c \
 	dE76.c \
 	dE00.c \
diff --git a/libvips/colour/UCS2LCh.c b/libvips/colour/UCS2LCh.c
index 884184c9..37953a92 100644
--- a/libvips/colour/UCS2LCh.c
+++ b/libvips/colour/UCS2LCh.c
@@ -50,7 +50,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 /* Arrays for lookup tables for the inverse function.
  */
diff --git a/libvips/colour/XYZ2Lab.c b/libvips/colour/XYZ2Lab.c
index cc198eef..6b61e0ba 100644
--- a/libvips/colour/XYZ2Lab.c
+++ b/libvips/colour/XYZ2Lab.c
@@ -58,7 +58,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 #ifndef HAVE_CBRT
 #define cbrt( X ) pow( (X), 1.0 / 3.0 )
diff --git a/libvips/colour/XYZ2Yxy.c b/libvips/colour/XYZ2Yxy.c
index 51ce8a43..fa2e0c18 100644
--- a/libvips/colour/XYZ2Yxy.c
+++ b/libvips/colour/XYZ2Yxy.c
@@ -47,7 +47,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourSpace VipsXYZ2Yxy;
 typedef VipsColourSpaceClass VipsXYZ2YxyClass;
diff --git a/libvips/colour/XYZ2scRGB.c b/libvips/colour/XYZ2scRGB.c
index c58f2f77..1b2e4ac6 100644
--- a/libvips/colour/XYZ2scRGB.c
+++ b/libvips/colour/XYZ2scRGB.c
@@ -41,7 +41,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourSpace VipsXYZ2scRGB;
 typedef VipsColourSpaceClass VipsXYZ2scRGBClass;
diff --git a/libvips/colour/Yxy2XYZ.c b/libvips/colour/Yxy2XYZ.c
index 5ed302c5..ecf40e18 100644
--- a/libvips/colour/Yxy2XYZ.c
+++ b/libvips/colour/Yxy2XYZ.c
@@ -47,7 +47,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourSpace VipsYxy2XYZ;
 typedef VipsColourSpaceClass VipsYxy2XYZClass;
diff --git a/libvips/colour/colour.c b/libvips/colour/colour.c
index 4e44a5fc..cbf177e1 100644
--- a/libvips/colour/colour.c
+++ b/libvips/colour/colour.c
@@ -44,7 +44,7 @@
 #include <vips/vips.h>
 #include <vips/internal.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 /**
  * SECTION: colour
diff --git a/libvips/colour/colourspace.c b/libvips/colour/colourspace.c
index 5c3836d2..42d1feb1 100644
--- a/libvips/colour/colourspace.c
+++ b/libvips/colour/colourspace.c
@@ -47,7 +47,7 @@
 #include <vips/vips.h>
 #include <vips/internal.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 static int
 vips_scRGB2RGB16( VipsImage *in, VipsImage **out, ... )
diff --git a/libvips/colour/dE00.c b/libvips/colour/dE00.c
index ab29d8b1..9148797d 100644
--- a/libvips/colour/dE00.c
+++ b/libvips/colour/dE00.c
@@ -42,7 +42,7 @@
 #include <vips/vips.h>
 #include <vips/debug.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef struct _VipsdE00 {
 	VipsColourDifference parent_instance;
diff --git a/libvips/colour/dE76.c b/libvips/colour/dE76.c
index 660041e8..162ce908 100644
--- a/libvips/colour/dE76.c
+++ b/libvips/colour/dE76.c
@@ -47,7 +47,7 @@
 #include <vips/vips.h>
 #include <vips/debug.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef struct _VipsdE76 {
 	VipsColourDifference parent_instance;
diff --git a/libvips/colour/dECMC.c b/libvips/colour/dECMC.c
index a9047595..bf60647d 100644
--- a/libvips/colour/dECMC.c
+++ b/libvips/colour/dECMC.c
@@ -40,7 +40,7 @@
 #include <vips/vips.h>
 #include <vips/debug.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef struct _VipsdECMC {
 	VipsColourDifference parent_instance;
diff --git a/libvips/colour/float2rad.c b/libvips/colour/float2rad.c
index 71554ef3..d777c8cd 100644
--- a/libvips/colour/float2rad.c
+++ b/libvips/colour/float2rad.c
@@ -111,7 +111,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 /* Begin copy-paste from Radiance sources.
  */
diff --git a/libvips/colour/icc_transform.c b/libvips/colour/icc_transform.c
index 39b32385..0bd7530c 100644
--- a/libvips/colour/icc_transform.c
+++ b/libvips/colour/icc_transform.c
@@ -80,7 +80,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 /* Call lcms with up to this many pixels at once.
  */
diff --git a/libvips/colour/colour.h b/libvips/colour/pcolour.h
similarity index 97%
rename from libvips/colour/colour.h
rename to libvips/colour/pcolour.h
index 9852ce0c..71828744 100644
--- a/libvips/colour/colour.h
+++ b/libvips/colour/pcolour.h
@@ -28,12 +28,8 @@
 
  */
 
-/* We don't want to get confused with the colour.h in include, put an
- * extra _ in there.
- */
-
-#ifndef VIPS__COLOUR_H
-#define VIPS__COLOUR_H
+#ifndef VIPS_PCOLOUR_H
+#define VIPS_PCOLOUR_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -208,5 +204,5 @@ void vips__pythagoras_line( VipsColour *colour,
 }
 #endif /*__cplusplus*/
 
-#endif /*VIPS__COLOUR_H*/
+#endif /*VIPS_PCOLOUR_H*/
 
diff --git a/libvips/colour/rad2float.c b/libvips/colour/rad2float.c
index f4d74f1b..54ed611e 100644
--- a/libvips/colour/rad2float.c
+++ b/libvips/colour/rad2float.c
@@ -111,7 +111,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 /* Begin copy-paste from Radiance sources.
  */
diff --git a/libvips/colour/sRGB2scRGB.c b/libvips/colour/sRGB2scRGB.c
index d1456a92..7762d0c4 100644
--- a/libvips/colour/sRGB2scRGB.c
+++ b/libvips/colour/sRGB2scRGB.c
@@ -52,7 +52,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourCode VipssRGB2scRGB;
 typedef VipsColourCodeClass VipssRGB2scRGBClass;
diff --git a/libvips/colour/scRGB2XYZ.c b/libvips/colour/scRGB2XYZ.c
index d5fe4c36..7cc764db 100644
--- a/libvips/colour/scRGB2XYZ.c
+++ b/libvips/colour/scRGB2XYZ.c
@@ -47,7 +47,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef VipsColourSpace VipsscRGB2XYZ;
 typedef VipsColourSpaceClass VipsscRGB2XYZClass;
diff --git a/libvips/colour/scRGB2sRGB.c b/libvips/colour/scRGB2sRGB.c
index 13d4aaf2..0a07ef13 100644
--- a/libvips/colour/scRGB2sRGB.c
+++ b/libvips/colour/scRGB2sRGB.c
@@ -64,7 +64,7 @@
 
 #include <vips/vips.h>
 
-#include "colour.h"
+#include "pcolour.h"
 
 typedef struct _VipsscRGB2sRGB {
 	VipsColourCode parent_instance;
diff --git a/libvips/conversion/Makefile.am b/libvips/conversion/Makefile.am
index a5dc4e81..47b7f026 100644
--- a/libvips/conversion/Makefile.am
+++ b/libvips/conversion/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libconversion.la
 
 libconversion_la_SOURCES = \
 	conversion.c \
-	conversion.h \
+	pconversion.h \
 	tilecache.c \
 	sequential.c \
 	flatten.c \
diff --git a/libvips/conversion/bandary.h b/libvips/conversion/bandary.h
index a11b1f83..cd7eed68 100644
--- a/libvips/conversion/bandary.h
+++ b/libvips/conversion/bandary.h
@@ -35,7 +35,7 @@
 extern "C" {
 #endif /*__cplusplus*/
 
-#include "conversion.h"
+#include "pconversion.h"
 
 #define VIPS_TYPE_BANDARY (vips_bandary_get_type())
 #define VIPS_BANDARY( obj ) \
diff --git a/libvips/conversion/cache.c b/libvips/conversion/cache.c
index b8335d28..e91d6123 100644
--- a/libvips/conversion/cache.c
+++ b/libvips/conversion/cache.c
@@ -48,7 +48,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsCache {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/cast.c b/libvips/conversion/cast.c
index 1828286d..84746321 100644
--- a/libvips/conversion/cast.c
+++ b/libvips/conversion/cast.c
@@ -94,7 +94,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsCast {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/conversion.c b/libvips/conversion/conversion.c
index 56fcece7..df67835d 100644
--- a/libvips/conversion/conversion.c
+++ b/libvips/conversion/conversion.c
@@ -47,7 +47,7 @@
 #include <vips/vips.h>
 #include <vips/internal.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 /** 
  * SECTION: conversion
diff --git a/libvips/conversion/copy.c b/libvips/conversion/copy.c
index 6bc6ba1f..57c58f69 100644
--- a/libvips/conversion/copy.c
+++ b/libvips/conversion/copy.c
@@ -93,7 +93,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsCopy {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/embed.c b/libvips/conversion/embed.c
index b90dd743..9e0dacb7 100644
--- a/libvips/conversion/embed.c
+++ b/libvips/conversion/embed.c
@@ -72,7 +72,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsEmbed {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/extract.c b/libvips/conversion/extract.c
index 25f74d8a..e99ee5ef 100644
--- a/libvips/conversion/extract.c
+++ b/libvips/conversion/extract.c
@@ -83,7 +83,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 #include "bandary.h"
 
diff --git a/libvips/conversion/flatten.c b/libvips/conversion/flatten.c
index 6926bc53..3b16673d 100644
--- a/libvips/conversion/flatten.c
+++ b/libvips/conversion/flatten.c
@@ -49,7 +49,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsFlatten {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/flip.c b/libvips/conversion/flip.c
index e2cd3ac5..824e1f8f 100644
--- a/libvips/conversion/flip.c
+++ b/libvips/conversion/flip.c
@@ -63,7 +63,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsFlip {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/grid.c b/libvips/conversion/grid.c
index 17c34306..de5d45ef 100644
--- a/libvips/conversion/grid.c
+++ b/libvips/conversion/grid.c
@@ -48,7 +48,7 @@
 
 #include <vips/vips.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsGrid {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/ifthenelse.c b/libvips/conversion/ifthenelse.c
index aae045c3..3f2cbd66 100644
--- a/libvips/conversion/ifthenelse.c
+++ b/libvips/conversion/ifthenelse.c
@@ -71,7 +71,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsIfthenelse {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/insert.c b/libvips/conversion/insert.c
index 69e81336..15ab5197 100644
--- a/libvips/conversion/insert.c
+++ b/libvips/conversion/insert.c
@@ -74,7 +74,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsInsert {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/join.c b/libvips/conversion/join.c
index af513e16..3f125680 100644
--- a/libvips/conversion/join.c
+++ b/libvips/conversion/join.c
@@ -67,7 +67,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsJoin {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/msb.c b/libvips/conversion/msb.c
index 97a123e3..4eadae1e 100644
--- a/libvips/conversion/msb.c
+++ b/libvips/conversion/msb.c
@@ -52,7 +52,7 @@
 
 #include <vips/vips.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 #include "bandary.h"
 
diff --git a/libvips/conversion/conversion.h b/libvips/conversion/pconversion.h
similarity index 91%
rename from libvips/conversion/conversion.h
rename to libvips/conversion/pconversion.h
index a3ab8f2b..d94d7ae4 100644
--- a/libvips/conversion/conversion.h
+++ b/libvips/conversion/pconversion.h
@@ -28,12 +28,8 @@
 
  */
 
-/* We don't want to get confused with the conversion.h in include, put an
- * extra _ in there.
- */
-
-#ifndef VIPS__CONVERSION_H
-#define VIPS__CONVERSION_H
+#ifndef VIPS_PCONVERSION_H
+#define VIPS_PCONVERSION_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -76,6 +72,6 @@ GType vips_conversion_get_type( void );
 }
 #endif /*__cplusplus*/
 
-#endif /*VIPS__CONVERSION_H*/
+#endif /*VIPS_PCONVERSION_H*/
 
 
diff --git a/libvips/conversion/recomb.c b/libvips/conversion/recomb.c
index ddfc79e3..a1f093ab 100644
--- a/libvips/conversion/recomb.c
+++ b/libvips/conversion/recomb.c
@@ -52,7 +52,7 @@
 
 #include <vips/vips.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsRecomb {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/replicate.c b/libvips/conversion/replicate.c
index fd1c4e4e..8d0ec6ff 100644
--- a/libvips/conversion/replicate.c
+++ b/libvips/conversion/replicate.c
@@ -54,7 +54,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsReplicate {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/rot.c b/libvips/conversion/rot.c
index 32134234..2288e563 100644
--- a/libvips/conversion/rot.c
+++ b/libvips/conversion/rot.c
@@ -72,7 +72,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsRot {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/scale.c b/libvips/conversion/scale.c
index 41f390f7..bc74fe78 100644
--- a/libvips/conversion/scale.c
+++ b/libvips/conversion/scale.c
@@ -57,7 +57,7 @@
 
 #include <vips/vips.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsScale {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/sequential.c b/libvips/conversion/sequential.c
index ce12f765..3f732442 100644
--- a/libvips/conversion/sequential.c
+++ b/libvips/conversion/sequential.c
@@ -62,7 +62,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 /* Stall threads that run ahead for up to this long, in seconds.
  *
diff --git a/libvips/conversion/subsample.c b/libvips/conversion/subsample.c
index 51cd708c..45f58643 100644
--- a/libvips/conversion/subsample.c
+++ b/libvips/conversion/subsample.c
@@ -50,7 +50,7 @@
 
 #include <vips/vips.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsSubsample {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/tilecache.c b/libvips/conversion/tilecache.c
index 61c7675f..529d0f6c 100644
--- a/libvips/conversion/tilecache.c
+++ b/libvips/conversion/tilecache.c
@@ -75,7 +75,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 /* A tile in cache can be in one of three states:
  *
diff --git a/libvips/conversion/wrap.c b/libvips/conversion/wrap.c
index dd41e7d3..c85ed6c6 100644
--- a/libvips/conversion/wrap.c
+++ b/libvips/conversion/wrap.c
@@ -46,7 +46,7 @@
 
 #include <vips/vips.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsWrap {
 	VipsConversion parent_instance;
diff --git a/libvips/conversion/zoom.c b/libvips/conversion/zoom.c
index 39b65571..07ae476e 100644
--- a/libvips/conversion/zoom.c
+++ b/libvips/conversion/zoom.c
@@ -80,7 +80,7 @@
 
 #include <vips/vips.h>
 
-#include "conversion.h"
+#include "pconversion.h"
 
 typedef struct _VipsZoom {
 	VipsConversion parent_instance;
diff --git a/libvips/create/Makefile.am b/libvips/create/Makefile.am
index 124f289c..0622b980 100644
--- a/libvips/create/Makefile.am
+++ b/libvips/create/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libcreate.la
 
 libcreate_la_SOURCES = \
 	create.c \
-	create.h \
+	pcreate.h \
 	point.c \
 	point.h \
 	eye.c \
diff --git a/libvips/create/black.c b/libvips/create/black.c
index 438ea526..0081a2cf 100644
--- a/libvips/create/black.c
+++ b/libvips/create/black.c
@@ -61,7 +61,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "create.h"
+#include "pcreate.h"
 
 typedef struct _VipsBlack {
 	VipsCreate parent_instance;
diff --git a/libvips/create/create.c b/libvips/create/create.c
index d98e05f9..5da204a6 100644
--- a/libvips/create/create.c
+++ b/libvips/create/create.c
@@ -47,7 +47,7 @@
 #include <vips/vips.h>
 #include <vips/internal.h>
 
-#include "create.h"
+#include "pcreate.h"
 
 /** 
  * SECTION: create
diff --git a/libvips/create/eye.c b/libvips/create/eye.c
index 3df1fa9b..73562bf0 100644
--- a/libvips/create/eye.c
+++ b/libvips/create/eye.c
@@ -58,7 +58,7 @@
 
 #include <vips/vips.h>
 
-#include "create.h"
+#include "pcreate.h"
 #include "point.h"
 
 typedef struct _VipsEye {
diff --git a/libvips/create/gaussnoise.c b/libvips/create/gaussnoise.c
index 2811055d..035063a9 100644
--- a/libvips/create/gaussnoise.c
+++ b/libvips/create/gaussnoise.c
@@ -59,7 +59,7 @@
 
 #include <vips/vips.h>
 
-#include "create.h"
+#include "pcreate.h"
 
 typedef struct _VipsGaussnoise {
 	VipsCreate parent_instance;
diff --git a/libvips/create/grey.c b/libvips/create/grey.c
index 4fc2d8d1..656204cf 100644
--- a/libvips/create/grey.c
+++ b/libvips/create/grey.c
@@ -65,7 +65,7 @@
 
 #include <vips/vips.h>
 
-#include "create.h"
+#include "pcreate.h"
 #include "point.h"
 
 typedef VipsPoint VipsGrey;
diff --git a/libvips/create/create.h b/libvips/create/pcreate.h
similarity index 91%
rename from libvips/create/create.h
rename to libvips/create/pcreate.h
index aab62414..05df4a92 100644
--- a/libvips/create/create.h
+++ b/libvips/create/pcreate.h
@@ -28,12 +28,8 @@
 
  */
 
-/* We don't want to get confused with the create.h in include, put an
- * extra _ in there.
- */
-
-#ifndef VIPS__CREATE_H
-#define VIPS__CREATE_H
+#ifndef VIPS_PCREATE_H
+#define VIPS_PCREATE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -74,6 +70,6 @@ GType vips_create_get_type( void );
 }
 #endif /*__cplusplus*/
 
-#endif /*VIPS__CREATE_H*/
+#endif /*VIPS_PCREATE_H*/
 
 
diff --git a/libvips/create/point.c b/libvips/create/point.c
index 294b9508..0e03e515 100644
--- a/libvips/create/point.c
+++ b/libvips/create/point.c
@@ -58,7 +58,7 @@
 
 #include <vips/vips.h>
 
-#include "create.h"
+#include "pcreate.h"
 #include "point.h"
 
 G_DEFINE_ABSTRACT_TYPE( VipsPoint, vips_point, VIPS_TYPE_CREATE );
diff --git a/libvips/create/point.h b/libvips/create/point.h
index e0681859..f92d4973 100644
--- a/libvips/create/point.h
+++ b/libvips/create/point.h
@@ -28,12 +28,8 @@
 
  */
 
-/* We don't want to get confused with the point.h in include, put an
- * extra _ in there.
- */
-
-#ifndef VIPS__POINT_H
-#define VIPS__POINT_H
+#ifndef VIPS_POINT_H
+#define VIPS_POINT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -77,4 +73,4 @@ GType vips_point_get_type( void );
 }
 #endif /*__cplusplus*/
 
-#endif /*VIPS__POINT_H*/
+#endif /*VIPS_POINT_H*/
diff --git a/libvips/create/sines.c b/libvips/create/sines.c
index aefd1653..70d789cc 100644
--- a/libvips/create/sines.c
+++ b/libvips/create/sines.c
@@ -57,7 +57,7 @@
 
 #include <vips/vips.h>
 
-#include "create.h"
+#include "pcreate.h"
 #include "point.h"
 
 typedef struct _VipsSines {
diff --git a/libvips/create/text.c b/libvips/create/text.c
index 7352c808..6677fdda 100644
--- a/libvips/create/text.c
+++ b/libvips/create/text.c
@@ -56,7 +56,7 @@
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
 
-#include "create.h"
+#include "pcreate.h"
 
 typedef struct _VipsText {
 	VipsCreate parent_instance;
diff --git a/libvips/create/xyz.c b/libvips/create/xyz.c
index e8924f15..b50fad65 100644
--- a/libvips/create/xyz.c
+++ b/libvips/create/xyz.c
@@ -52,7 +52,7 @@
 #include <vips/internal.h>
 #include <vips/debug.h>
 
-#include "create.h"
+#include "pcreate.h"
 
 typedef struct _VipsXyz {
 	VipsCreate parent_instance;
diff --git a/libvips/create/zone.c b/libvips/create/zone.c
index 31b84b46..fdb6ab09 100644
--- a/libvips/create/zone.c
+++ b/libvips/create/zone.c
@@ -58,7 +58,7 @@
 
 #include <vips/vips.h>
 
-#include "create.h"
+#include "pcreate.h"
 #include "point.h"
 
 typedef VipsPoint VipsZone;
diff --git a/libvips/resample/Makefile.am b/libvips/resample/Makefile.am
index 8599054a..4831c471 100644
--- a/libvips/resample/Makefile.am
+++ b/libvips/resample/Makefile.am
@@ -8,7 +8,7 @@ libresample_la_SOURCES = \
 	affine.c \
 	quadratic.c \
 	resample.c \
-	resample.h \
+	presample.h \
 	shrink.c \
 	interpolate.c \
 	transform.c \
@@ -22,7 +22,7 @@ else
 
 libresample_la_SOURCES = \
 	resample.c \
-	resample.h \
+	presample.h \
 	shrink.c \
 	affine.c \
 	interpolate.c \
diff --git a/libvips/resample/affine.c b/libvips/resample/affine.c
index 7fbec5ad..5fc9ea8f 100644
--- a/libvips/resample/affine.c
+++ b/libvips/resample/affine.c
@@ -129,7 +129,7 @@
 #include <vips/internal.h>
 #include <vips/transform.h>
 
-#include "resample.h"
+#include "presample.h"
 
 typedef struct _VipsAffine {
 	VipsResample parent_instance;
diff --git a/libvips/resample/resample.h b/libvips/resample/presample.h
similarity index 91%
rename from libvips/resample/resample.h
rename to libvips/resample/presample.h
index ac1eb673..fc678930 100644
--- a/libvips/resample/resample.h
+++ b/libvips/resample/presample.h
@@ -28,12 +28,8 @@
 
  */
 
-/* We don't want to get confused with the resample.h in include, put an
- * extra _ in there.
- */
-
-#ifndef VIPS__RESAMPLE_H
-#define VIPS__RESAMPLE_H
+#ifndef VIPS_PRESAMPLE_H
+#define VIPS_PRESAMPLE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -73,6 +69,6 @@ GType vips_resample_get_type( void );
 }
 #endif /*__cplusplus*/
 
-#endif /*VIPS__RESAMPLE_H*/
+#endif /*VIPS_PRESAMPLE_H*/
 
 
diff --git a/libvips/resample/quadratic.c b/libvips/resample/quadratic.c
index 3cb59aa3..baf7c6b6 100644
--- a/libvips/resample/quadratic.c
+++ b/libvips/resample/quadratic.c
@@ -51,7 +51,7 @@
 #include <vips/vips.h>
 #include <vips/debug.h>
 
-#include "resample.h"
+#include "presample.h"
 
 /* The transform we compute:
 
diff --git a/libvips/resample/resample.c b/libvips/resample/resample.c
index 5e45eb9c..dcdecbd8 100644
--- a/libvips/resample/resample.c
+++ b/libvips/resample/resample.c
@@ -50,7 +50,7 @@
 #include <vips/vips.h>
 #include <vips/internal.h>
 
-#include "resample.h"
+#include "presample.h"
 
 G_DEFINE_ABSTRACT_TYPE( VipsResample, vips_resample, VIPS_TYPE_OPERATION );
 
diff --git a/libvips/resample/shrink.c b/libvips/resample/shrink.c
index c1b03139..cff50c7c 100644
--- a/libvips/resample/shrink.c
+++ b/libvips/resample/shrink.c
@@ -86,7 +86,7 @@
 #include <vips/vips.h>
 #include <vips/debug.h>
 
-#include "resample.h"
+#include "presample.h"
 
 typedef struct _VipsShrink {
 	VipsResample parent_instance;