diff --git a/src/cairo-fontconfig-private.h b/src/cairo-fontconfig-private.h
index 7e29f692a..ea873abe7 100644
--- a/src/cairo-fontconfig-private.h
+++ b/src/cairo-fontconfig-private.h
@@ -42,6 +42,8 @@
 #ifndef _CAIRO_FONTCONFIG_PRIVATE_H
 #define _CAIRO_FONTCONFIG_PRIVATE_H
 
+#include "cairo.h"
+
 #if CAIRO_HAS_FC_FONT
 #include <fontconfig/fontconfig.h>
 #include <fontconfig/fcfreetype.h>
diff --git a/src/cairo-skia.h b/src/cairo-skia.h
index 033ba6d7e..f62823522 100644
--- a/src/cairo-skia.h
+++ b/src/cairo-skia.h
@@ -39,7 +39,7 @@
 
 #include "cairo.h"
 
-#ifdef CAIRO_HAS_SKIA_SURFACE
+#if CAIRO_HAS_SKIA_SURFACE
 
 CAIRO_BEGIN_DECLS
 
diff --git a/src/glew/GL/glew.h b/src/glew/GL/glew.h
index cd38410c0..86e060093 100644
--- a/src/glew/GL/glew.h
+++ b/src/glew/GL/glew.h
@@ -29,6 +29,8 @@
 ** THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+//#include "cairo.h" /* keep distcheck happy */
+
 /*
  * Mesa 3-D graphics library
  * Version:  7.0
diff --git a/src/glew/GL/glxew.h b/src/glew/GL/glxew.h
index a29030da3..d3933cd16 100644
--- a/src/glew/GL/glxew.h
+++ b/src/glew/GL/glxew.h
@@ -29,6 +29,8 @@
 ** THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+//#include "cairo.h" /* keep distcheck happy */
+
 /*
  * Mesa 3-D graphics library
  * Version:  7.0
diff --git a/test/api-special-cases.c b/test/api-special-cases.c
index 42e3bd875..63eb5d0fb 100644
--- a/test/api-special-cases.c
+++ b/test/api-special-cases.c
@@ -206,7 +206,8 @@ test_cairo_surface_set_mime_data (cairo_surface_t *surface)
 
     status = cairo_surface_set_mime_data (surface,
                                           mimetype,
-                                          (const unsigned char *) data, strlen (data),
+                                          (const unsigned char *) data,
+					  strlen (data),
                                           NULL, NULL);
     return status ? CAIRO_TEST_SUCCESS : CAIRO_TEST_ERROR;
 }
@@ -216,7 +217,7 @@ test_cairo_surface_get_mime_data (cairo_surface_t *surface)
 {
     const char *mimetype = "text/x-uri";
     const unsigned char *data;
-    unsigned int length;
+    unsigned long length;
 
     cairo_surface_get_mime_data (surface, mimetype, &data, &length);
     return data == NULL && length == 0 ? CAIRO_TEST_SUCCESS : CAIRO_TEST_ERROR;