fix up gtk-doc

fix various problems: - out of date IGNORE in doc/reference/Makefile.am - name clashes between private .h and public
2013-06-17 20:16:20 +01:00 · 2013-06-17 20:16:20 +01:00 · 2fd2fd58f7
parent 4c0ace34f0
commit 2fd2fd58f7
80 changed files with 147 additions and 120 deletions
--- 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
--- 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>
--- 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 \
--- 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
--- 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 ) \
--- a/libvips/arithmetic/parithmetic.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*/


--- 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 ) \
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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 \
--- 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.
 */
--- 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 )
--- 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;
--- 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;
--- 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;
--- 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
--- 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, ... )
--- 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;
--- 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;
--- 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;
--- 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.
 */
--- 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.
 */
--- a/libvips/colour/pcolour.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*/

--- 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.
 */
--- 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;
--- 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;
--- 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;
--- 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 \
--- 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 ) \
--- 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;
--- 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;
--- 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
--- 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;
--- 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;
--- 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"

--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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"

--- a/libvips/conversion/pconversion.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*/


--- 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;
--- 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;
--- 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;
--- 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;
--- 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.
 *
--- 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;
--- 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:
 *
--- 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;
--- 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;
--- 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 \
--- 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;
--- 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
--- 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 {
--- 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;
--- 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;
--- a/libvips/create/pcreate.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*/


--- 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 );
--- 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*/
--- 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 {
--- 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;
--- 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;
--- 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;
--- 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 \
--- 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;
--- a/libvips/resample/presample.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*/


--- 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:

--- 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 );

--- 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;