diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index a55412a6e..ddac552e1 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -95,3 +95,5 @@ INCLUDES =					\
 
 CLEANFILES =					\
 	$(EXTRA_LTLIBRARIES)
+
+check test: libcairoboilerplate.la
diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index 792dee455..b9438a2c6 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -68,21 +68,6 @@
 #include <ctype.h>
 #include <assert.h>
 
-/* This is copied from cairoint.h. That makes it painful to keep in
- * sync, but the slim stuff makes cairoint.h "hard" to include when
- * not actually building the cairo library itself. Fortunately, since
- * we're checking all these values, we do have a safeguard for keeping
- * them in sync.
- */
-typedef enum cairo_internal_surface_type {
-    CAIRO_INTERNAL_SURFACE_TYPE_META = 0x1000,
-    CAIRO_INTERNAL_SURFACE_TYPE_PAGINATED,
-    CAIRO_INTERNAL_SURFACE_TYPE_ANALYSIS,
-    CAIRO_INTERNAL_SURFACE_TYPE_TEST_META,
-    CAIRO_INTERNAL_SURFACE_TYPE_TEST_FALLBACK,
-    CAIRO_INTERNAL_SURFACE_TYPE_TEST_PAGINATED
-} cairo_internal_surface_type_t;
-
 const char *
 cairo_boilerplate_content_name (cairo_content_t content)
 {