diff --git a/gio/tests/network-address.c b/gio/tests/network-address.c
index 43521d78d..42b60792f 100644
--- a/gio/tests/network-address.c
+++ b/gio/tests/network-address.c
@@ -32,6 +32,7 @@ static ParseTest tests[] =
 {
   { "www.gnome.org", "www.gnome.org", 1234, -1 },
   { "www.gnome.org:8080", "www.gnome.org", 8080, -1 },
+  { "www.gnome.org:http", "www.gnome.org", 80, -1 },
   { "[2001:db8::1]", "2001:db8::1", 1234, -1 },
   { "[2001:db8::1]:888", "2001:db8::1", 888, -1 },
   { "[hostname", NULL, 0, G_IO_ERROR_INVALID_ARGUMENT },
@@ -44,7 +45,7 @@ static ParseTest tests[] =
 static void
 test_parse (gconstpointer d)
 {
-  ParseTest *test = d;
+  const ParseTest *test = d;
   GNetworkAddress *address;
   GError *error;
 
diff --git a/glib/pcre/Makefile.am b/glib/pcre/Makefile.am
index ecc059c40..826f318dd 100644
--- a/glib/pcre/Makefile.am
+++ b/glib/pcre/Makefile.am
@@ -38,17 +38,12 @@ libpcre_la_SOURCES = \
 	pcre_fullinfo.c \
 	pcre_get.c \
 	pcre_globals.c \
-	pcre_info.c \
-	pcre_maketables.c \
 	pcre_newline.c \
 	pcre_ord2utf8.c \
-	pcre_refcount.c \
 	pcre_study.c \
 	pcre_tables.c \
 	pcre_try_flipped.c \
 	pcre_ucp_searchfuncs.c \
-	pcre_valid_utf8.c \
-	pcre_version.c \
 	pcre_xclass.c \
 	pcre.h \
 	pcre_internal.h \
diff --git a/glib/pcre/pcre_internal.h b/glib/pcre/pcre_internal.h
index a1a06d471..320a7e7a9 100644
--- a/glib/pcre/pcre_internal.h
+++ b/glib/pcre/pcre_internal.h
@@ -1764,7 +1764,7 @@ extern BOOL          _pcre_is_newline(USPTR, int, USPTR, int *, BOOL);
 extern int           _pcre_ord2utf8(int, uschar *);
 extern real_pcre    *_pcre_try_flipped(const real_pcre *, real_pcre *,
                        const pcre_study_data *, pcre_study_data *);
-extern int           _pcre_valid_utf8(USPTR, int);
+#define              _pcre_valid_utf8(u, i) TRUE
 extern BOOL          _pcre_was_newline(USPTR, int, USPTR, int *, BOOL);
 extern BOOL          _pcre_xclass(int, const uschar *);