diff --git a/src/cairo-composite-rectangles-private.h b/src/cairo-composite-rectangles-private.h
index dd5bd4156..f0553ab0b 100644
--- a/src/cairo-composite-rectangles-private.h
+++ b/src/cairo-composite-rectangles-private.h
@@ -38,6 +38,7 @@
 #define CAIRO_COMPOSITE_RECTANGLES_PRIVATE_H
 
 #include "cairo-types-private.h"
+#include "cairo-error-private.h"
 
 CAIRO_BEGIN_DECLS
 
diff --git a/src/cairo-pattern-private.h b/src/cairo-pattern-private.h
index 647eb0b93..46a8ad6e7 100644
--- a/src/cairo-pattern-private.h
+++ b/src/cairo-pattern-private.h
@@ -36,6 +36,7 @@
 #ifndef CAIRO_PATTERN_PRIVATE_H
 #define CAIRO_PATTERN_PRIVATE_H
 
+#include "cairo-error-private.h"
 #include "cairo-types-private.h"
 #include "cairo-list-private.h"
 
diff --git a/src/cairo-pdf-operators-private.h b/src/cairo-pdf-operators-private.h
index 48ae6b5c1..6e1ae1833 100644
--- a/src/cairo-pdf-operators-private.h
+++ b/src/cairo-pdf-operators-private.h
@@ -43,6 +43,7 @@
 #define CAIRO_PDF_OPERATORS_H
 
 #include "cairo-compiler-private.h"
+#include "cairo-error-private.h"
 #include "cairo-types-private.h"
 
 /* The glyph buffer size is based on the expected maximum glyphs in a
diff --git a/src/cairo-rtree-private.h b/src/cairo-rtree-private.h
index 191c85871..11079e7ed 100644
--- a/src/cairo-rtree-private.h
+++ b/src/cairo-rtree-private.h
@@ -38,6 +38,7 @@
 #define CAIRO_RTREE_PRIVATE_H
 
 #include "cairo-compiler-private.h"
+#include "cairo-error-private.h"
 #include "cairo-types-private.h"
 
 #include "cairo-freelist-private.h"
diff --git a/src/cairo-surface-observer-private.h b/src/cairo-surface-observer-private.h
index 522be6a80..7383a7379 100644
--- a/src/cairo-surface-observer-private.h
+++ b/src/cairo-surface-observer-private.h
@@ -36,6 +36,8 @@
 #ifndef CAIRO_SURFACE_SNAPSHOT_PRIVATE_H
 #define CAIRO_SURFACE_SNAPSHOT_PRIVATE_H
 
+#include "cairoint.h" /* cairo_surface_backend_t */
+
 #include "cairo-device-private.h"
 #include "cairo-surface-private.h"
 
diff --git a/src/cairo-surface-snapshot-private.h b/src/cairo-surface-snapshot-private.h
index 7e0ace186..0b1c8d34b 100644
--- a/src/cairo-surface-snapshot-private.h
+++ b/src/cairo-surface-snapshot-private.h
@@ -36,6 +36,8 @@
 #ifndef CAIRO_SURFACE_SNAPSHOT_PRIVATE_H
 #define CAIRO_SURFACE_SNAPSHOT_PRIVATE_H
 
+#include "cairoint.h" /* for cairo_surface_backend_t */
+
 #include "cairo-surface-private.h"
 
 struct _cairo_surface_snapshot {
diff --git a/src/cairo-surface-subsurface-private.h b/src/cairo-surface-subsurface-private.h
index 2109a13e8..ada09a171 100644
--- a/src/cairo-surface-subsurface-private.h
+++ b/src/cairo-surface-subsurface-private.h
@@ -36,6 +36,8 @@
 #ifndef CAIRO_SURFACE_SUBSURFACE_PRIVATE_H
 #define CAIRO_SURFACE_SUBSURFACE_PRIVATE_H
 
+#include "cairoint.h" /* for cairo_surface_backend_t */
+
 #include "cairo-surface-private.h"
 
 struct _cairo_surface_subsurface {