Index: daemon/gvfsbackendnetwork.c
===================================================================
--- daemon/gvfsbackendnetwork.c	(revision 2099)
+++ daemon/gvfsbackendnetwork.c	(working copy)
@@ -25,9 +25,8 @@
 #include <config.h>
 
 #include <string.h>
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gurifuncs.h>
+#include <glib.h>
 #include <gio/gio.h>
 #include <gconf/gconf-client.h>
 
Index: daemon/mount.c
===================================================================
--- daemon/mount.c	(revision 2099)
+++ daemon/mount.c	(working copy)
@@ -33,7 +33,6 @@
 #include "gmountoperationdbus.h"
 #include "gvfsdaemonprotocol.h"
 #include "gdbusutils.h"
-#include <glib/gurifuncs.h>
 #include <gio/gio.h>
 
 typedef struct {
Index: daemon/gvfsbackenddnssd.c
===================================================================
--- daemon/gvfsbackenddnssd.c	(revision 2099)
+++ daemon/gvfsbackenddnssd.c	(working copy)
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gurifuncs.h>
 #include <gio/gio.h>
 
 #include <avahi-client/client.h>
Index: daemon/gvfsdaemonutils.c
===================================================================
--- daemon/gvfsdaemonutils.c	(revision 2099)
+++ daemon/gvfsdaemonutils.c	(working copy)
@@ -31,7 +31,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include <glib/gthread.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 
 #include <gio/gio.h>
Index: daemon/gvfsbackendcomputer.c
===================================================================
--- daemon/gvfsbackendcomputer.c	(revision 2099)
+++ daemon/gvfsbackendcomputer.c	(working copy)
@@ -36,7 +36,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gio/gunixmounts.h>
-#include <glib/gurifuncs.h>
+#include <glib.h>
 
 #include "gvfsbackendcomputer.h"
 #include "gvfsmonitor.h"
Index: daemon/gvfsbackendburn.c
===================================================================
--- daemon/gvfsbackendburn.c	(revision 2099)
+++ daemon/gvfsbackendburn.c	(working copy)
@@ -36,7 +36,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gio/gunixmounts.h>
-#include <glib/gurifuncs.h>
+#include <glib.h>
 
 #include "gvfsbackendburn.h"
 #include "gvfsmonitor.h"
Index: daemon/gvfsbackendtrash.c
===================================================================
--- daemon/gvfsbackendtrash.c	(revision 2099)
+++ daemon/gvfsbackendtrash.c	(working copy)
@@ -35,7 +35,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gio/gunixmounts.h>
-#include <glib/gurifuncs.h>
+#include <glib.h>
 
 #include "gvfsbackendtrash.h"
 #include "gvfsmonitor.h"
Index: client/gvfsuriutils.h
===================================================================
--- client/gvfsuriutils.h	(revision 2099)
+++ client/gvfsuriutils.h	(working copy)
@@ -24,7 +24,6 @@
 #define __G_VFS_URI_UTILS_H__
 
 #include <glib.h>
-#include <glib/gurifuncs.h>
 
 G_BEGIN_DECLS
 
Index: client/gvfsfusedaemon.c
===================================================================
--- client/gvfsfusedaemon.c	(revision 2099)
+++ client/gvfsfusedaemon.c	(working copy)
@@ -38,11 +38,8 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gprintf.h>
 #include <gio/gio.h>
 
-#include <glib/gurifuncs.h>
-
 /* stuff from common/ */
 #include <gdaemonmount.h>
 #include <gvfsdaemonprotocol.h>
