diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index 803bfb507..39938bf58 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -53,7 +53,7 @@ enum_state_free (gpointer data)
   g_slice_free (EnumState, state);
 }
 
-EnumState *
+static EnumState *
 enum_state_new (gboolean is_flags)
 {
   EnumState *state;
diff --git a/gobject/gparam.c b/gobject/gparam.c
index 22f72b2e7..8b4e4550e 100644
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -28,7 +28,7 @@
 #include "gparam.h"
 #include "gparamspecs.h"
 #include "gvaluecollector.h"
-
+#include "gtype-private.h"
 
 /**
  * SECTION:gparamspec
diff --git a/gobject/gvalue.c b/gobject/gvalue.c
index 5fc765442..fcadab9e4 100644
--- a/gobject/gvalue.c
+++ b/gobject/gvalue.c
@@ -28,6 +28,7 @@
 #include "gvalue.h"
 #include "gvaluecollector.h"
 #include "gbsearcharray.h"
+#include "gtype-private.h"
 
 
 /**
diff --git a/gobject/testgobject.c b/gobject/testgobject.c
index ac6bc2635..2afd8aaaa 100644
--- a/gobject/testgobject.c
+++ b/gobject/testgobject.c
@@ -320,7 +320,7 @@ struct _DerivedObjectPrivate
 };
 static void derived_object_class_init (DerivedObjectClass *class);
 static void derived_object_init       (DerivedObject      *dobject);
-GType
+static GType
 derived_object_get_type (void)
 {
   static GType derived_object_type = 0;