diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 40afea4d8..429fff48a 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -2,12 +2,16 @@ EXTRA_LTLIBRARIES = libcairoboilerplate.la
 
 libcairoboilerplate_la_SOURCES =\
 cairo-boilerplate.c	\
-cairo-quartz-boilerplate.c	\
 cairo-boilerplate.h	\
 xmalloc.c		\
 xmalloc.h
 libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
 
+if CAIRO_HAS_QUARTZ_SURFACE
+libcairoboilerplate_la_SOURCES += cairo-quartz-boilerplate.c
+libcairoboilerplate_la_SOURCES += cairo-quartz-boilerplate-private.h
+endif
+
 if CAIRO_HAS_BEOS_SURFACE
 libcairoboilerplate_la_SOURCES += cairo-test-beos.cpp cairo-test-beos.h
 # BeOS system headers trigger this warning
diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index 109f75b7f..208f53a4b 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -25,7 +25,10 @@
  */
 
 #include "cairo-boilerplate.h"
-#include "cairo-boilerplate-private.h"
+
+#if CAIRO_HAS_QUARTZ_SURFACE
+#include "cairo-quartz-boilerplate-private.h"
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/boilerplate/cairo-boilerplate-private.h b/boilerplate/cairo-quartz-boilerplate-private.h
similarity index 91%
rename from boilerplate/cairo-boilerplate-private.h
rename to boilerplate/cairo-quartz-boilerplate-private.h
index a5230851b..ef5ea2cfe 100644
--- a/boilerplate/cairo-boilerplate-private.h
+++ b/boilerplate/cairo-quartz-boilerplate-private.h
@@ -24,10 +24,8 @@
  * Author: Carl D. Worth <cworth@cworth.org>
  */
 
-#ifndef _CAIRO_BOILERPLATE_PRIVATE_H_
-#define _CAIRO_BOILERPLATE_PRIVATE_H_
-
-#if CAIRO_HAS_QUARTZ_SURFACE
+#ifndef _CAIRO_QUARTZ_BOILERPLATE_PRIVATE_H_
+#define _CAIRO_QUARTZ_BOILERPLATE_PRIVATE_H_
 
 cairo_surface_t *
 _cairo_quartz_boilerplate_create_surface (const char		*name,
@@ -40,6 +38,4 @@ _cairo_quartz_boilerplate_create_surface (const char		*name,
 void
 _cairo_quartz_boilerplate_cleanup (void *closure);
 
-#endif /* CAIRO_HAS_QUARTZ_SURFACE */
-
 #endif
diff --git a/boilerplate/cairo-quartz-boilerplate.c b/boilerplate/cairo-quartz-boilerplate.c
index 8cf6a5c53..369b2da4b 100644
--- a/boilerplate/cairo-quartz-boilerplate.c
+++ b/boilerplate/cairo-quartz-boilerplate.c
@@ -25,9 +25,7 @@
  */
 
 #include "cairo-boilerplate.h"
-#include "cairo-boilerplate-private.h"
-
-#if CAIRO_HAS_QUARTZ_SURFACE
+#include "cairo-quartz-boilerplate-private.h"
 
 #include <cairo-quartz.h>
 
@@ -60,5 +58,3 @@ _cairo_quartz_boilerplate_cleanup (void *closure)
 {
     /* nothing */
 }
-#endif
-