diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0ba9d803..589b7ec7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,251 +1,262 @@
-libvips/arithmetic/abs.c
-libvips/arithmetic/complex.c
-libvips/arithmetic/invert.c
-libvips/arithmetic/multiply.c
-libvips/arithmetic/round.c
-libvips/arithmetic/subtract.c
-libvips/arithmetic/min.c
-libvips/arithmetic/unaryconst.c
-libvips/arithmetic/avg.c
-libvips/arithmetic/max.c
-libvips/arithmetic/statistic.c
-libvips/arithmetic/divide.c
-libvips/arithmetic/stats.c
-libvips/arithmetic/binary.c
-libvips/arithmetic/deviate.c
-libvips/arithmetic/relational.c
-libvips/arithmetic/measure.c
-libvips/arithmetic/remainder.c
-libvips/arithmetic/unary.c
-libvips/arithmetic/math.c
-libvips/arithmetic/arithmetic.c
-libvips/arithmetic/add.c
-libvips/arithmetic/math2.c
 libvips/arithmetic/linear.c
-libvips/arithmetic/boolean.c
+libvips/arithmetic/avg.c
+libvips/arithmetic/divide.c
+libvips/arithmetic/measure.c
+libvips/arithmetic/stats.c
+libvips/arithmetic/math2.c
+libvips/arithmetic/round.c
+libvips/arithmetic/deviate.c
+libvips/arithmetic/unary.c
+libvips/arithmetic/unaryconst.c
+libvips/arithmetic/add.c
+libvips/arithmetic/hist_find_ndim.c
+libvips/arithmetic/arithmetic.c
+libvips/arithmetic/multiply.c
+libvips/arithmetic/min.c
+libvips/arithmetic/complex.c
+libvips/arithmetic/hist_find_indexed.c
+libvips/arithmetic/invert.c
+libvips/arithmetic/hist_find.c
+libvips/arithmetic/remainder.c
+libvips/arithmetic/math.c
+libvips/arithmetic/abs.c
+libvips/arithmetic/relational.c
+libvips/arithmetic/project.c
+libvips/arithmetic/binary.c
 libvips/arithmetic/sign.c
+libvips/arithmetic/subtract.c
+libvips/arithmetic/statistic.c
+libvips/arithmetic/profile.c
+libvips/arithmetic/boolean.c
+libvips/arithmetic/max.c
 libvips/cimg/cimg_dispatch.c
-libvips/colour/scRGB2sRGB.c
-libvips/colour/XYZ2scRGB.c
-libvips/colour/Lab2XYZ.c
-libvips/colour/LCh2Lab.c
-libvips/colour/LCh2UCS.c
-libvips/colour/dE00.c
-libvips/colour/scRGB2XYZ.c
-libvips/colour/icc_transform.c
-libvips/colour/dECMC.c
-libvips/colour/colour.c
-libvips/colour/rad2float.c
-libvips/colour/sRGB2scRGB.c
-libvips/colour/UCS2LCh.c
-libvips/colour/Lab2LabQ.c
+libvips/colour/dE76.c
 libvips/colour/colourspace.c
-libvips/colour/Lab2LabS.c
-libvips/colour/LabS2LabQ.c
 libvips/colour/Lab2LCh.c
+libvips/colour/LabS2LabQ.c
+libvips/colour/sRGB2scRGB.c
 libvips/colour/Yxy2XYZ.c
+libvips/colour/LCh2Lab.c
+libvips/colour/dE00.c
+libvips/colour/LabQ2Lab.c
+libvips/colour/Lab2XYZ.c
+libvips/colour/rad2float.c
+libvips/colour/Lab2LabQ.c
+libvips/colour/colour.c
 libvips/colour/LabQ2sRGB.c
+libvips/colour/XYZ2Lab.c
+libvips/colour/UCS2LCh.c
+libvips/colour/scRGB2XYZ.c
+libvips/colour/LabQ2LabS.c
+libvips/colour/LabS2Lab.c
 libvips/colour/float2rad.c
 libvips/colour/XYZ2Yxy.c
-libvips/colour/dE76.c
-libvips/colour/XYZ2Lab.c
-libvips/colour/LabQ2LabS.c
-libvips/colour/LabQ2Lab.c
-libvips/colour/LabS2Lab.c
-libvips/conversion/rot.c
-libvips/conversion/conversion.c
-libvips/conversion/grid.c
-libvips/conversion/recomb.c
-libvips/conversion/flatten.c
-libvips/conversion/replicate.c
-libvips/conversion/bandary.c
-libvips/conversion/subsample.c
-libvips/conversion/cache.c
-libvips/conversion/join.c
-libvips/conversion/extract.c
-libvips/conversion/wrap.c
-libvips/conversion/zoom.c
-libvips/conversion/bandbool.c
-libvips/conversion/ifthenelse.c
-libvips/conversion/tilecache.c
+libvips/colour/Lab2LabS.c
+libvips/colour/icc_transform.c
+libvips/colour/LCh2UCS.c
+libvips/colour/XYZ2scRGB.c
+libvips/colour/dECMC.c
+libvips/colour/scRGB2sRGB.c
 libvips/conversion/flip.c
-libvips/conversion/bandjoin.c
-libvips/conversion/copy.c
-libvips/conversion/cast.c
-libvips/conversion/sequential.c
-libvips/conversion/embed.c
-libvips/conversion/insert.c
-libvips/conversion/msb.c
 libvips/conversion/bandmean.c
-libvips/conversion/im_falsecolour.c
+libvips/conversion/gammacorrect.c
+libvips/conversion/falsecolour.c
+libvips/conversion/wrap.c
+libvips/conversion/bandary.c
+libvips/conversion/msb.c
+libvips/conversion/subsample.c
+libvips/conversion/cast.c
 libvips/conversion/scale.c
-libvips/convolution/im_fastcor.c
-libvips/convolution/im_aconv.c
-libvips/convolution/im_sharpen.c
-libvips/convolution/convol_dispatch.c
+libvips/conversion/conversion.c
+libvips/conversion/flatten.c
+libvips/conversion/extract.c
+libvips/conversion/bandjoin.c
+libvips/conversion/bandbool.c
+libvips/conversion/copy.c
+libvips/conversion/rot.c
+libvips/conversion/replicate.c
+libvips/conversion/zoom.c
+libvips/conversion/join.c
+libvips/conversion/grid.c
+libvips/conversion/insert.c
+libvips/conversion/tilecache.c
+libvips/conversion/embed.c
+libvips/conversion/cache.c
+libvips/conversion/ifthenelse.c
+libvips/conversion/recomb.c
+libvips/conversion/sequential.c
 libvips/convolution/im_conv.c
-libvips/convolution/im_addgnoise.c
+libvips/convolution/im_fastcor.c
 libvips/convolution/im_contrast_surface.c
-libvips/convolution/im_aconvsep.c
-libvips/convolution/im_spcor.c
 libvips/convolution/im_compass.c
-libvips/convolution/im_conv_f.c
+libvips/convolution/convolution.c
+libvips/convolution/im_spcor.c
+libvips/convolution/conv.c
 libvips/convolution/im_gradcor.c
+libvips/convolution/im_conv_f.c
+libvips/convolution/im_aconvsep.c
+libvips/convolution/convol_dispatch.c
+libvips/convolution/im_aconv.c
+libvips/convolution/im_addgnoise.c
+libvips/convolution/im_sharpen.c
 libvips/create/other_dispatch.c
-libvips/create/zone.c
-libvips/create/sines.c
-libvips/create/black.c
 libvips/create/gaussnoise.c
-libvips/create/create.c
-libvips/create/eye.c
-libvips/create/text.c
-libvips/create/xyz.c
+libvips/create/grey.c
 libvips/create/im_benchmark.c
 libvips/create/point.c
-libvips/create/grey.c
-libvips/foreign/jpeg2vips.c
-libvips/foreign/radiance.c
-libvips/foreign/vips2jpeg.c
-libvips/foreign/openexrload.c
-libvips/foreign/vipssave.c
+libvips/create/xyz.c
+libvips/create/eye.c
+libvips/create/create.c
+libvips/create/sines.c
+libvips/create/black.c
+libvips/create/zone.c
+libvips/create/buildlut.c
+libvips/create/tonelut.c
+libvips/create/invertlut.c
+libvips/create/text.c
+libvips/create/identity.c
+libvips/dummy.c
 libvips/foreign/rawsave.c
-libvips/foreign/csvsave.c
-libvips/foreign/radsave.c
-libvips/foreign/rawload.c
-libvips/foreign/vips2tiff.c
-libvips/foreign/fits.c
-libvips/foreign/matlab.c
-libvips/foreign/csvload.c
-libvips/foreign/jpegload.c
-libvips/foreign/magickload.c
-libvips/foreign/matload.c
-libvips/foreign/tiff2vips.c
-libvips/foreign/openexr2vips.c
-libvips/foreign/foreign.c
-libvips/foreign/jpegsave.c
-libvips/foreign/dzsave.c
-libvips/foreign/openslide2vips.c
-libvips/foreign/analyze2vips.c
-libvips/foreign/ppmsave.c
-libvips/foreign/tiffsave.c
-libvips/foreign/fitssave.c
-libvips/foreign/csv.c
-libvips/foreign/pngload.c
-libvips/foreign/fitsload.c
-libvips/foreign/vipsload.c
-libvips/foreign/vipspng.c
+libvips/foreign/radload.c
 libvips/foreign/tiffload.c
 libvips/foreign/magick2vips.c
+libvips/foreign/ppmsave.c
+libvips/foreign/vipsload.c
+libvips/foreign/pngload.c
+libvips/foreign/analyze2vips.c
+libvips/foreign/webpsave.c
+libvips/foreign/jpeg2vips.c
+libvips/foreign/radiance.c
+libvips/foreign/matrixsave.c
+libvips/foreign/webpload.c
+libvips/foreign/openexrload.c
+libvips/foreign/tiffsave.c
+libvips/foreign/dzsave.c
+libvips/foreign/vips2webp.c
 libvips/foreign/analyzeload.c
+libvips/foreign/jpegsave.c
+libvips/foreign/vips2jpeg.c
 libvips/foreign/ppm.c
-libvips/foreign/openslideload.c
-libvips/foreign/pngsave.c
-libvips/foreign/radload.c
+libvips/foreign/fitsload.c
 libvips/foreign/ppmload.c
-libvips/freq_filt/fmask4th.c
-libvips/freq_filt/im_disp_ps.c
-libvips/freq_filt/fmaskcir.c
-libvips/freq_filt/im_fractsurf.c
-libvips/freq_filt/im_invfft.c
-libvips/freq_filt/im_freqflt.c
-libvips/freq_filt/freq_dispatch.c
-libvips/freq_filt/im_freq_mask.c
+libvips/foreign/csvload.c
+libvips/foreign/magickload.c
+libvips/foreign/webp2vips.c
+libvips/foreign/openslideload.c
+libvips/foreign/csvsave.c
+libvips/foreign/jpegload.c
+libvips/foreign/rawload.c
+libvips/foreign/openexr2vips.c
+libvips/foreign/tiff2vips.c
+libvips/foreign/csv.c
+libvips/foreign/matload.c
+libvips/foreign/fitssave.c
+libvips/foreign/radsave.c
+libvips/foreign/vipssave.c
+libvips/foreign/fits.c
+libvips/foreign/openslide2vips.c
+libvips/foreign/pngsave.c
+libvips/foreign/vips2tiff.c
+libvips/foreign/foreign.c
+libvips/foreign/vipspng.c
+libvips/foreign/matrixload.c
+libvips/foreign/matlab.c
 libvips/freq_filt/im_phasecor_fft.c
-libvips/freq_filt/im_invfftr.c
+libvips/freq_filt/im_freqflt.c
+libvips/freq_filt/im_fractsurf.c
+libvips/freq_filt/im_freq_mask.c
+libvips/freq_filt/freq_dispatch.c
+libvips/freq_filt/im_disp_ps.c
 libvips/freq_filt/im_fwfft.c
-libvips/histograms_lut/im_hsp.c
-libvips/histograms_lut/tone.c
-libvips/histograms_lut/im_histspec.c
-libvips/histograms_lut/im_mpercent.c
-libvips/histograms_lut/im_stdif.c
-libvips/histograms_lut/hist_dispatch.c
-libvips/histograms_lut/im_heq.c
-libvips/histograms_lut/im_histnD.c
-libvips/histograms_lut/im_invertlut.c
-libvips/histograms_lut/im_histindexed.c
-libvips/histograms_lut/im_buildlut.c
-libvips/histograms_lut/im_project.c
-libvips/histograms_lut/im_identity.c
-libvips/histograms_lut/im_maplut.c
-libvips/histograms_lut/im_histeq.c
-libvips/histograms_lut/im_lhisteq.c
-libvips/histograms_lut/im_gammacorrect.c
-libvips/histograms_lut/im_histgr.c
-libvips/histograms_lut/im_histplot.c
-libvips/histograms_lut/im_hist.c
-libvips/inplace/im_draw_smudge.c
-libvips/inplace/im_draw_circle.c
-libvips/inplace/im_draw_rect.c
-libvips/inplace/im_draw_mask.c
-libvips/inplace/draw.c
+libvips/freq_filt/im_invfftr.c
+libvips/freq_filt/fmaskcir.c
+libvips/freq_filt/fmask4th.c
+libvips/freq_filt/im_invfft.c
+libvips/histogram/hist_local.c
+libvips/histogram/stdif.c
+libvips/histogram/hist_match.c
+libvips/histogram/hist_ismonotonic.c
+libvips/histogram/hist_plot.c
+libvips/histogram/percent.c
+libvips/histogram/maplut.c
+libvips/histogram/hist_norm.c
+libvips/histogram/hist_cum.c
+libvips/histogram/hist_unary.c
+libvips/histogram/hist_equal.c
+libvips/histogram/histogram.c
 libvips/inplace/im_draw_point.c
-libvips/inplace/flood.c
-libvips/inplace/im_draw_image.c
 libvips/inplace/im_draw_line.c
+libvips/inplace/im_draw_rect.c
+libvips/inplace/im_draw_image.c
+libvips/inplace/draw.c
+libvips/inplace/flood.c
+libvips/inplace/im_draw_circle.c
+libvips/inplace/im_draw_mask.c
+libvips/inplace/im_draw_smudge.c
 libvips/inplace/inplace_dispatch.c
-libvips/iofuncs/window.c
-libvips/iofuncs/base64.c
-libvips/iofuncs/type.c
-libvips/iofuncs/memory.c
-libvips/iofuncs/vips.c
-libvips/iofuncs/init.c
-libvips/iofuncs/enumtypes.c
-libvips/iofuncs/cache.c
-libvips/iofuncs/buffer.c
-libvips/iofuncs/sinkmemory.c
-libvips/iofuncs/rect.c
-libvips/iofuncs/buf.c
-libvips/iofuncs/system.c
-libvips/iofuncs/threadpool.c
-libvips/iofuncs/operation.c
-libvips/iofuncs/header.c
 libvips/iofuncs/vector.c
-libvips/iofuncs/semaphore.c
-libvips/iofuncs/error.c
+libvips/iofuncs/operation.c
 libvips/iofuncs/sinkdisc.c
-libvips/iofuncs/sink.c
-libvips/iofuncs/generate.c
-libvips/iofuncs/region.c
-libvips/iofuncs/mapfile.c
-libvips/iofuncs/image.c
-libvips/iofuncs/util.c
+libvips/iofuncs/vips.c
+libvips/iofuncs/buffer.c
+libvips/iofuncs/enumtypes.c
+libvips/iofuncs/semaphore.c
 libvips/iofuncs/sinkscreen.c
+libvips/iofuncs/window.c
+libvips/iofuncs/sinkmemory.c
+libvips/iofuncs/header.c
+libvips/iofuncs/type.c
+libvips/iofuncs/image.c
+libvips/iofuncs/system.c
+libvips/iofuncs/region.c
+libvips/iofuncs/sink.c
+libvips/iofuncs/error.c
+libvips/iofuncs/util.c
+libvips/iofuncs/buf.c
+libvips/iofuncs/base64.c
+libvips/iofuncs/generate.c
+libvips/iofuncs/mapfile.c
+libvips/iofuncs/rect.c
+libvips/iofuncs/init.c
 libvips/iofuncs/object.c
+libvips/iofuncs/threadpool.c
+libvips/iofuncs/memory.c
+libvips/iofuncs/cache.c
 libvips/morphology/im_cntlines.c
+libvips/morphology/morph_dispatch.c
 libvips/morphology/im_rank_image.c
-libvips/morphology/im_label_regions.c
 libvips/morphology/morphology.c
 libvips/morphology/im_zerox.c
-libvips/morphology/im_profile.c
-libvips/morphology/morph_dispatch.c
+libvips/morphology/im_label_regions.c
 libvips/morphology/im_rank.c
-libvips/mosaicing/im_tbmosaic.c
-libvips/mosaicing/im_avgdxdy.c
-libvips/mosaicing/im_tbcalcon.c
-libvips/mosaicing/im_tbmerge.c
-libvips/mosaicing/im_lrcalcon.c
-libvips/mosaicing/im_clinear.c
-libvips/mosaicing/im_remosaic.c
-libvips/mosaicing/im_maxpos_subpel.c
-libvips/mosaicing/im_chkpair.c
-libvips/mosaicing/im_initialize.c
-libvips/mosaicing/im_align_bands.c
 libvips/mosaicing/mosaic1.c
-libvips/mosaicing/im_lrmerge.c
-libvips/mosaicing/im_lrmosaic.c
-libvips/mosaicing/im_improve.c
-libvips/mosaicing/mosaicing_dispatch.c
+libvips/mosaicing/im_clinear.c
 libvips/mosaicing/match.c
+libvips/mosaicing/mosaicing_dispatch.c
+libvips/mosaicing/im_improve.c
+libvips/mosaicing/im_tbmosaic.c
+libvips/mosaicing/im_tbmerge.c
 libvips/mosaicing/global_balance.c
-libvips/resample/interpolate.c
+libvips/mosaicing/im_align_bands.c
+libvips/mosaicing/im_lrmerge.c
+libvips/mosaicing/im_initialize.c
+libvips/mosaicing/im_avgdxdy.c
+libvips/mosaicing/im_maxpos_subpel.c
+libvips/mosaicing/im_lrmosaic.c
+libvips/mosaicing/im_lrcalcon.c
+libvips/mosaicing/im_chkpair.c
+libvips/mosaicing/im_remosaic.c
+libvips/mosaicing/im_tbcalcon.c
+libvips/resample/quadratic.c
+libvips/resample/shrink.c
 libvips/resample/resample.c
 libvips/resample/transform.c
-libvips/resample/shrink.c
-libvips/resample/quadratic.c
 libvips/resample/affine.c
+libvips/resample/interpolate.c
+libvips/resample/similarity.c
+libvips/video/video_dispatch.c
 libvips/video/im_video_test.c
 libvips/video/im_video_v4l1.c
-libvips/video/video_dispatch.c
 tools/edvips.c
 tools/find_mosaic.c
 tools/header.c
@@ -257,96 +268,99 @@ libvipsCC/VError.cc
 libvipsCC/VImage.cc
 libvipsCC/vipsc++.cc
 libvipsCC/VMask.cc
-libvips/cimg/dummy2.cc
-libvips/arithmetic/unaryconst.h
 libvips/arithmetic/binary.h
+libvips/arithmetic/unaryconst.h
 libvips/arithmetic/parithmetic.h
-libvips/arithmetic/unary.h
 libvips/arithmetic/statistic.h
+libvips/arithmetic/unary.h
+libvipsCC/include/vips/VImage.h
+libvipsCC/include/vips/vipscpp.h
 libvipsCC/include/vips/VDisplay.h
 libvipsCC/include/vips/VError.h
-libvipsCC/include/vips/VImage.h
 libvipsCC/include/vips/vipsc++.h
-libvipsCC/include/vips/vipscpp.h
 libvipsCC/include/vips/VMask.h
+libvips/cimg/CImg.h
 libvips/colour/pcolour.h
 libvips/conversion/pconversion.h
 libvips/conversion/bandary.h
+libvips/convolution/pconvolution.h
 libvips/create/point.h
 libvips/create/pcreate.h
-libvips/foreign/csv.h
-libvips/foreign/tiff.h
-libvips/foreign/analyze2vips.h
-libvips/foreign/jpeg.h
-libvips/foreign/fits.h
 libvips/foreign/dbh.h
-libvips/foreign/openslide2vips.h
-libvips/foreign/magick.h
-libvips/foreign/ppm.h
 libvips/foreign/matlab.h
+libvips/foreign/jpeg.h
+libvips/foreign/analyze2vips.h
 libvips/foreign/vipspng.h
+libvips/foreign/ppm.h
+libvips/foreign/csv.h
 libvips/foreign/openexr2vips.h
+libvips/foreign/openslide2vips.h
 libvips/foreign/radiance.h
-libvips/include/vips/deprecated.h
-libvips/include/vips/histograms_lut.h
-libvips/include/vips/conversion.h
-libvips/include/vips/vips.h
-libvips/include/vips/private.h
-libvips/include/vips/vips7compat.h
-libvips/include/vips/debug.h
-libvips/include/vips/memory.h
-libvips/include/vips/operation.h
-libvips/include/vips/basic.h
-libvips/include/vips/image.h
-libvips/include/vips/error.h
-libvips/include/vips/internal.h
-libvips/include/vips/inlines.h
-libvips/include/vips/cimg_funcs.h
-libvips/include/vips/dispatch.h
-libvips/include/vips/interpolate.h
-libvips/include/vips/intl.h
-libvips/include/vips/thread.h
-libvips/include/vips/resample.h
-libvips/include/vips/semaphore.h
-libvips/include/vips/transform.h
-libvips/include/vips/util.h
-libvips/include/vips/version.h
-libvips/include/vips/morphology.h
-libvips/include/vips/generate.h
-libvips/include/vips/enumtypes.h
-libvips/include/vips/region.h
-libvips/include/vips/vector.h
-libvips/include/vips/format.h
-libvips/include/vips/threadpool.h
-libvips/include/vips/colour.h
+libvips/foreign/magick.h
+libvips/foreign/tiff.h
+libvips/foreign/fits.h
+libvips/foreign/webp.h
+libvips/histogram/hist_unary.h
+libvips/histogram/phistogram.h
 libvips/include/vips/create.h
-libvips/include/vips/video.h
-libvips/include/vips/type.h
 libvips/include/vips/mosaicing.h
-libvips/include/vips/almostdeprecated.h
-libvips/include/vips/convolution.h
-libvips/include/vips/object.h
-libvips/include/vips/buf.h
-libvips/include/vips/foreign.h
-libvips/include/vips/mask.h
-libvips/include/vips/header.h
+libvips/include/vips/semaphore.h
 libvips/include/vips/freq_filt.h
-libvips/include/vips/arithmetic.h
-libvips/include/vips/rect.h
-libvips/include/vips/relational.h
+libvips/include/vips/cimg_funcs.h
+libvips/include/vips/operation.h
+libvips/include/vips/vips.h
+libvips/include/vips/memory.h
+libvips/include/vips/buf.h
+libvips/include/vips/dispatch.h
+libvips/include/vips/vips7compat.h
+libvips/include/vips/conversion.h
+libvips/include/vips/basic.h
 libvips/include/vips/inplace.h
+libvips/include/vips/relational.h
+libvips/include/vips/mask.h
+libvips/include/vips/rect.h
+libvips/include/vips/generate.h
+libvips/include/vips/arithmetic.h
+libvips/include/vips/version.h
+libvips/include/vips/util.h
+libvips/include/vips/almostdeprecated.h
+libvips/include/vips/colour.h
+libvips/include/vips/threadpool.h
+libvips/include/vips/vector.h
+libvips/include/vips/histogram.h
+libvips/include/vips/morphology.h
+libvips/include/vips/error.h
+libvips/include/vips/transform.h
+libvips/include/vips/region.h
+libvips/include/vips/header.h
+libvips/include/vips/image.h
+libvips/include/vips/intl.h
+libvips/include/vips/video.h
+libvips/include/vips/enumtypes.h
+libvips/include/vips/thread.h
+libvips/include/vips/convolution.h
+libvips/include/vips/debug.h
+libvips/include/vips/interpolate.h
+libvips/include/vips/private.h
+libvips/include/vips/format.h
+libvips/include/vips/object.h
+libvips/include/vips/deprecated.h
+libvips/include/vips/inlines.h
+libvips/include/vips/foreign.h
+libvips/include/vips/resample.h
+libvips/include/vips/internal.h
+libvips/include/vips/type.h
 libvips/inplace/draw.h
-libvips/iofuncs/base64.h
 libvips/iofuncs/sink.h
-libvips/mosaicing/merge.h
-libvips/mosaicing/mosaic.h
+libvips/iofuncs/base64.h
 libvips/mosaicing/global_balance.h
+libvips/mosaicing/mosaic.h
+libvips/mosaicing/merge.h
 libvips/resample/presample.h
 libvips/resample/templates.h
 libvips/video/im_video_v4l1.h
-swig/vipsCC/VImage.h
 libvips/cimg/cimg.cpp
 libvips/resample/vsqbs.cpp
-libvips/resample/bicubic.cpp
-libvips/resample/lbb.cpp
 libvips/resample/nohalo.cpp
+libvips/resample/lbb.cpp
+libvips/resample/bicubic.cpp