diff --git a/src/cairo-surface-backend-private.h b/src/cairo-surface-backend-private.h
index cdcd3f8cf..03468cc7b 100644
--- a/src/cairo-surface-backend-private.h
+++ b/src/cairo-surface-backend-private.h
@@ -38,6 +38,9 @@
 #ifndef CAIRO_SURFACE_BACKEND_PRIVATE_H
 #define CAIRO_SURFACE_BACKEND_PRIVATE_H
 
+#include "cairo-compiler-private.h"
+#include "cairo-error-private.h"
+
 CAIRO_BEGIN_DECLS
 
 struct _cairo_surface_backend {
diff --git a/src/test-compositor-surface-private.h b/src/test-compositor-surface-private.h
index 47e2a4326..491f241ba 100644
--- a/src/test-compositor-surface-private.h
+++ b/src/test-compositor-surface-private.h
@@ -40,6 +40,9 @@
 
 #include "test-compositor-surface.h"
 
+#include "cairo-compiler-private.h"
+#include "cairo-compositor-private.h"
+
 CAIRO_BEGIN_DECLS
 
 cairo_private cairo_surface_t *