diff --git a/src/Makefile.sources b/src/Makefile.sources
index 7c42e793e..8732e2a02 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -62,7 +62,7 @@ cairo_private = \
 	cairo-cache-private.h \
 	cairo-clip-inline.h \
 	cairo-clip-private.h \
-	cairo-combsort-private.h \
+	cairo-combsort-inline.h \
 	cairo-compiler-private.h \
 	cairo-compositor-private.h \
 	cairo-contour-private.h \
diff --git a/src/cairo-bentley-ottmann-rectangular.c b/src/cairo-bentley-ottmann-rectangular.c
index aec7ae417..b69d42540 100644
--- a/src/cairo-bentley-ottmann-rectangular.c
+++ b/src/cairo-bentley-ottmann-rectangular.c
@@ -40,7 +40,7 @@
 
 #include "cairo-boxes-private.h"
 #include "cairo-error-private.h"
-#include "cairo-combsort-private.h"
+#include "cairo-combsort-inline.h"
 #include "cairo-list-private.h"
 #include "cairo-traps-private.h"
 
diff --git a/src/cairo-bentley-ottmann-rectilinear.c b/src/cairo-bentley-ottmann-rectilinear.c
index 1edeeb525..7c0be69b7 100644
--- a/src/cairo-bentley-ottmann-rectilinear.c
+++ b/src/cairo-bentley-ottmann-rectilinear.c
@@ -39,7 +39,7 @@
 #include "cairoint.h"
 
 #include "cairo-boxes-private.h"
-#include "cairo-combsort-private.h"
+#include "cairo-combsort-inline.h"
 #include "cairo-error-private.h"
 #include "cairo-traps-private.h"
 
diff --git a/src/cairo-bentley-ottmann.c b/src/cairo-bentley-ottmann.c
index a075b404f..38fe46341 100644
--- a/src/cairo-bentley-ottmann.c
+++ b/src/cairo-bentley-ottmann.c
@@ -40,7 +40,7 @@
 
 #include "cairo-error-private.h"
 #include "cairo-freelist-private.h"
-#include "cairo-combsort-private.h"
+#include "cairo-combsort-inline.h"
 #include "cairo-traps-private.h"
 
 #define DEBUG_PRINT_STATE 0
diff --git a/src/cairo-botor-scan-converter.c b/src/cairo-botor-scan-converter.c
index c5b1c3fa9..dc1ae6b1c 100644
--- a/src/cairo-botor-scan-converter.c
+++ b/src/cairo-botor-scan-converter.c
@@ -45,7 +45,7 @@
 #include "cairo-error-private.h"
 #include "cairo-list-private.h"
 #include "cairo-freelist-private.h"
-#include "cairo-combsort-private.h"
+#include "cairo-combsort-inline.h"
 
 #include <setjmp.h>
 
diff --git a/src/cairo-boxes-intersect.c b/src/cairo-boxes-intersect.c
index dd4c2410f..96ae66334 100644
--- a/src/cairo-boxes-intersect.c
+++ b/src/cairo-boxes-intersect.c
@@ -41,7 +41,7 @@
 
 #include "cairo-boxes-private.h"
 #include "cairo-error-private.h"
-#include "cairo-combsort-private.h"
+#include "cairo-combsort-inline.h"
 #include "cairo-list-private.h"
 
 #include <setjmp.h>
diff --git a/src/cairo-combsort-private.h b/src/cairo-combsort-inline.h
similarity index 100%
rename from src/cairo-combsort-private.h
rename to src/cairo-combsort-inline.h
diff --git a/src/cairo-contour.c b/src/cairo-contour.c
index ac3998b88..a8d6927a9 100644
--- a/src/cairo-contour.c
+++ b/src/cairo-contour.c
@@ -40,7 +40,7 @@
 
 #include "cairo-error-private.h"
 #include "cairo-freelist-private.h"
-#include "cairo-combsort-private.h"
+#include "cairo-combsort-inline.h"
 #include "cairo-contour-private.h"
 
 void
diff --git a/src/cairo-polygon-intersect.c b/src/cairo-polygon-intersect.c
index 71d56d7af..c900c89dd 100644
--- a/src/cairo-polygon-intersect.c
+++ b/src/cairo-polygon-intersect.c
@@ -40,7 +40,7 @@
 
 #include "cairo-error-private.h"
 #include "cairo-freelist-private.h"
-#include "cairo-combsort-private.h"
+#include "cairo-combsort-inline.h"
 
 typedef cairo_point_t cairo_bo_point32_t;
 
diff --git a/src/cairo-polygon-reduce.c b/src/cairo-polygon-reduce.c
index f18e234da..87580705c 100644
--- a/src/cairo-polygon-reduce.c
+++ b/src/cairo-polygon-reduce.c
@@ -40,7 +40,7 @@
 
 #include "cairo-error-private.h"
 #include "cairo-freelist-private.h"
-#include "cairo-combsort-private.h"
+#include "cairo-combsort-inline.h"
 
 typedef cairo_point_t cairo_bo_point32_t;
 
diff --git a/src/cairo-recording-surface.c b/src/cairo-recording-surface.c
index 2904c186d..11a847ca2 100644
--- a/src/cairo-recording-surface.c
+++ b/src/cairo-recording-surface.c
@@ -81,7 +81,7 @@
 #include "cairo-array-private.h"
 #include "cairo-analysis-surface-private.h"
 #include "cairo-clip-private.h"
-#include "cairo-combsort-private.h"
+#include "cairo-combsort-inline.h"
 #include "cairo-composite-rectangles-private.h"
 #include "cairo-default-context-private.h"
 #include "cairo-error-private.h"
diff --git a/src/cairo-rectangular-scan-converter.c b/src/cairo-rectangular-scan-converter.c
index b4214c88d..e353b34e8 100644
--- a/src/cairo-rectangular-scan-converter.c
+++ b/src/cairo-rectangular-scan-converter.c
@@ -33,7 +33,7 @@
 
 #include "cairoint.h"
 
-#include "cairo-combsort-private.h"
+#include "cairo-combsort-inline.h"
 #include "cairo-error-private.h"
 #include "cairo-freelist-private.h"
 #include "cairo-list-private.h"
diff --git a/src/cairo-surface-observer.c b/src/cairo-surface-observer.c
index 6d57bf6fa..d5039938b 100644
--- a/src/cairo-surface-observer.c
+++ b/src/cairo-surface-observer.c
@@ -38,7 +38,7 @@
 #include "cairo-surface-observer-private.h"
 
 #include "cairo-array-private.h"
-#include "cairo-combsort-private.h"
+#include "cairo-combsort-inline.h"
 #include "cairo-composite-rectangles-private.h"
 #include "cairo-error-private.h"
 #include "cairo-image-surface-private.h"