Index: modules/bzip2-method.c
===================================================================
--- modules/bzip2-method.c	(revision 5522)
+++ modules/bzip2-method.c	(working copy)
@@ -24,8 +24,7 @@
 
 #include <config.h>
 
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-handle.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libgnomevfs/gnome-vfs-module.h>
Index: modules/test-method.c
===================================================================
--- modules/test-method.c	(revision 5522)
+++ modules/test-method.c	(working copy)
@@ -37,7 +37,7 @@
 #include <config.h>
 
 #include <glib/gi18n-lib.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-cancellable-ops.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-module.h>
Index: modules/gzip-method.c
===================================================================
--- modules/gzip-method.c	(revision 5522)
+++ modules/gzip-method.c	(working copy)
@@ -23,9 +23,7 @@
 
 #include <config.h>
 
-#include <glib/galloca.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libgnomevfs/gnome-vfs-module.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
Index: libgnomevfs/gnome-vfs-async-job-map.c
===================================================================
--- libgnomevfs/gnome-vfs-async-job-map.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-async-job-map.c	(working copy)
@@ -24,8 +24,7 @@
 #include "gnome-vfs-async-job-map.h"
 
 #include "gnome-vfs-job.h"
-#include <glib/ghash.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 /* job map bits guarded by this lock */
 static GStaticRecMutex async_job_map_lock = G_STATIC_REC_MUTEX_INIT;
Index: libgnomevfs/gnome-vfs-mime-magic.c
===================================================================
--- libgnomevfs/gnome-vfs-mime-magic.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-mime-magic.c	(working copy)
@@ -35,12 +35,7 @@
 #include <wchar.h>
 #endif
 
-#include <glib/garray.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gthread.h>
-#include <glib/gutils.h>
-#include <glib/gunicode.h>
+#include <glib.h>
 
 enum {
 	GNOME_VFS_TEXT_SNIFF_LENGTH = 256
Index: libgnomevfs/gnome-vfs-file-info.c
===================================================================
--- libgnomevfs/gnome-vfs-file-info.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-file-info.c	(working copy)
@@ -25,9 +25,7 @@
 #include <config.h>
 #include "gnome-vfs-file-info.h"
 
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gthread.h>
+#include <glib.h>
 #include <string.h>
 
 /* Mutex for making GnomeVFSFileInfo ref's/unref's atomic */
Index: libgnomevfs/gnome-vfs-drive.c
===================================================================
--- libgnomevfs/gnome-vfs-drive.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-drive.c	(working copy)
@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <glib/gthread.h>
+#include <glib.h>
 
 #include "gnome-vfs-drive.h"
 #include "gnome-vfs-volume-monitor-private.h"
Index: libgnomevfs/gnome-vfs-mime-magic.h
===================================================================
--- libgnomevfs/gnome-vfs-mime-magic.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-mime-magic.h	(working copy)
@@ -1,7 +1,7 @@
 #ifndef GNOME_VFS_MIME_MAGIC_H
 #define GNOME_VFS_MIME_MAGIC_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: libgnomevfs/gnome-vfs-cancellation.h
===================================================================
--- libgnomevfs/gnome-vfs-cancellation.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-cancellation.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef GNOME_VFS_CANCELLATION_H
 #define GNOME_VFS_CANCELLATION_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: libgnomevfs/gnome-vfs-private-utils.c
===================================================================
--- libgnomevfs/gnome-vfs-private-utils.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-private-utils.c	(working copy)
@@ -33,8 +33,7 @@
 #include "gnome-vfs-ops.h"
 #include "gnome-vfs-uri.h"
 #include <errno.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <gconf/gconf-client.h>
 #include <stdlib.h>
 #include <string.h>
Index: libgnomevfs/gnome-vfs-socket.c
===================================================================
--- libgnomevfs/gnome-vfs-socket.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-socket.c	(working copy)
@@ -29,8 +29,7 @@
 #include <config.h>
 #include "gnome-vfs-socket.h"
 
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 struct GnomeVFSSocket {
 	GnomeVFSSocketImpl *impl;
Index: libgnomevfs/gnome-vfs-mime-utils.h
===================================================================
--- libgnomevfs/gnome-vfs-mime-utils.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-mime-utils.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef GNOME_VFS_MIME_UTILS_H
 #define GNOME_VFS_MIME_UTILS_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: libgnomevfs/gnome-vfs-handle.c
===================================================================
--- libgnomevfs/gnome-vfs-handle.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-handle.c	(working copy)
@@ -26,7 +26,7 @@
 #include "gnome-vfs-handle-private.h"
 #include "gnome-vfs-method.h"
 
-#include <glib/gmessages.h>
+#include <glib.h>
 
 struct GnomeVFSHandle {
 	/* URI of the file being accessed through the handle.  */
Index: libgnomevfs/gnome-vfs-socket.h
===================================================================
--- libgnomevfs/gnome-vfs-socket.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-socket.h	(working copy)
@@ -29,7 +29,7 @@
 #ifndef GNOME_VFS_SOCKET_H
 #define GNOME_VFS_SOCKET_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-cancellation.h>
 #include <libgnomevfs/gnome-vfs-file-size.h>
 #include <libgnomevfs/gnome-vfs-result.h>
Index: libgnomevfs/gnome-vfs-volume-monitor-private.h
===================================================================
--- libgnomevfs/gnome-vfs-volume-monitor-private.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-volume-monitor-private.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef GNOME_VFS_VOLUME_MONITOR_PRIVATE_H
 #define GNOME_VFS_VOLUME_MONITOR_PRIVATE_H
 
-#include <glib/gthread.h>
+#include <glib.h>
 #include "gnome-vfs-volume-monitor.h"
 
 #ifdef USE_DAEMON
Index: libgnomevfs/gnome-vfs-job.c
===================================================================
--- libgnomevfs/gnome-vfs-job.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-job.c	(working copy)
@@ -35,8 +35,7 @@
 #include "gnome-vfs-private-utils.h"
 #include "gnome-vfs-module-callback-private.h"
 #include <errno.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <libgnomevfs/gnome-vfs-cancellable-ops.h>
 #include <libgnomevfs/gnome-vfs-context.h>
Index: libgnomevfs/gnome-vfs-async-ops.c
===================================================================
--- libgnomevfs/gnome-vfs-async-ops.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-async-ops.c	(working copy)
@@ -28,8 +28,7 @@
 #include "gnome-vfs-job.h"
 #include "gnome-vfs-job-queue.h"
 #include "gnome-vfs-job-limit.h"
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <unistd.h>
 
 /**
Index: libgnomevfs/gnome-vfs-async-ops.h
===================================================================
--- libgnomevfs/gnome-vfs-async-ops.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-async-ops.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef GNOME_VFS_ASYNC_OPS_H
 #define GNOME_VFS_ASYNC_OPS_H
 
-#include <glib/giochannel.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-file-info.h>
 #include <libgnomevfs/gnome-vfs-find-directory.h>
 #include <libgnomevfs/gnome-vfs-handle.h>
Index: libgnomevfs/gnome-vfs-cancellable-ops.c
===================================================================
--- libgnomevfs/gnome-vfs-cancellable-ops.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-cancellable-ops.c	(working copy)
@@ -32,8 +32,7 @@
 #include "gnome-vfs-utils.h"
 #include "gnome-vfs-handle-private.h"
 
-#include <glib/gmessages.h>
-#include <glib/gutils.h>
+#include <glib.h>
 #include <string.h>
 
 GnomeVFSResult
Index: libgnomevfs/gnome-vfs-parse-ls.c
===================================================================
--- libgnomevfs/gnome-vfs-parse-ls.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-parse-ls.c	(working copy)
@@ -29,9 +29,7 @@
 #include "gnome-vfs-parse-ls.h"
 
 #include <glib/gi18n-lib.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <sys/types.h>
 #include <grp.h>
 #include <pwd.h>
Index: libgnomevfs/gnome-vfs-parse-ls.h
===================================================================
--- libgnomevfs/gnome-vfs-parse-ls.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-parse-ls.h	(working copy)
@@ -30,7 +30,7 @@
 
 #include <sys/stat.h>
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: libgnomevfs/gnome-vfs-socket-buffer.c
===================================================================
--- libgnomevfs/gnome-vfs-socket-buffer.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-socket-buffer.c	(working copy)
@@ -30,8 +30,7 @@
 #include "gnome-vfs-socket-buffer.h"
 
 #include <string.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 
 #define BUFFER_SIZE 4096
Index: libgnomevfs/gnome-vfs-ops.c
===================================================================
--- libgnomevfs/gnome-vfs-ops.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-ops.c	(working copy)
@@ -27,7 +27,7 @@
 #include "gnome-vfs-cancellable-ops.h"
 #include "gnome-vfs-handle-private.h"
 #include "gnome-vfs-private-utils.h"
-#include <glib/gmessages.h>
+#include <glib.h>
 
 /**
  * gnome_vfs_open:
Index: libgnomevfs/gnome-vfs-init.c
===================================================================
--- libgnomevfs/gnome-vfs-init.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-init.c	(working copy)
@@ -37,11 +37,7 @@
 #include "gnome-vfs-module-callback-private.h"
 
 #include <errno.h>
-#include <glib/gmessages.h>
-#include <glib/gfileutils.h>
-#include <glib/gi18n-lib.h>
-#include <glib/gtypes.h>
-#include <glib/gstdio.h>
+#include <glib.h>
 
 #ifdef USE_DAEMON
 #ifndef DBUS_API_SUBJECT_TO_CHANGE
Index: libgnomevfs/gnome-vfs-init.h
===================================================================
--- libgnomevfs/gnome-vfs-init.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-init.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef GNOME_VFS_INIT_H
 #define GNOME_VFS_INIT_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: libgnomevfs/gnome-vfs-result.c
===================================================================
--- libgnomevfs/gnome-vfs-result.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-result.c	(working copy)
@@ -29,7 +29,7 @@
 #include <config.h>
 #include "gnome-vfs-result.h"
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <errno.h>
 #ifndef G_OS_WIN32
Index: libgnomevfs/gnome-vfs-result.h
===================================================================
--- libgnomevfs/gnome-vfs-result.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-result.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef GNOME_VFS_RESULT_H
 #define GNOME_VFS_RESULT_H
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: libgnomevfs/gnome-vfs-standard-callbacks.h
===================================================================
--- libgnomevfs/gnome-vfs-standard-callbacks.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-standard-callbacks.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef GNOME_VFS_STANDARD_CALLBACKS_H
 #define GNOME_VFS_STANDARD_CALLBACKS_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 
 G_BEGIN_DECLS
Index: libgnomevfs/gnome-vfs-uri.c
===================================================================
--- libgnomevfs/gnome-vfs-uri.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-uri.c	(working copy)
@@ -30,10 +30,7 @@
 #include "gnome-vfs-private-utils.h"
 #include "gnome-vfs-transform.h"
 #include "gnome-vfs-utils.h"
-#include <glib/ghash.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gstring.h>
+#include <glib.h>
 #include <stdio.h>
 #include <string.h>
 
Index: libgnomevfs/gnome-vfs-directory.c
===================================================================
--- libgnomevfs/gnome-vfs-directory.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-directory.c	(working copy)
@@ -27,8 +27,7 @@
 #include "gnome-vfs-cancellable-ops.h"
 #include "gnome-vfs-method.h"
 #include "gnome-vfs-ops.h"
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #define VFS_MAXIMUM_SYMBOLIC_LINK_DEPTH 256
 
Index: libgnomevfs/gnome-vfs-uri.h
===================================================================
--- libgnomevfs/gnome-vfs-uri.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-uri.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef GNOME_VFS_URI_H
 #define GNOME_VFS_URI_H
 
-#include <glib/glist.h>
+#include <glib.h>
 #include <glib-object.h> /* For GType */
 
 G_BEGIN_DECLS
Index: libgnomevfs/gnome-vfs-volume.c
===================================================================
--- libgnomevfs/gnome-vfs-volume.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-volume.c	(working copy)
@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <glib/gthread.h>
+#include <glib.h>
 
 #include "gnome-vfs-volume.h"
 #include "gnome-vfs-volume-monitor-private.h"
Index: libgnomevfs/gnome-vfs-configuration.c
===================================================================
--- libgnomevfs/gnome-vfs-configuration.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-configuration.c	(working copy)
@@ -26,7 +26,6 @@
 
 #include <errno.h>
 #include <glib.h>
-#include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 #include "gnome-vfs-private.h"
 #ifdef G_OS_WIN32
Index: libgnomevfs/gnome-vfs-directory.h
===================================================================
--- libgnomevfs/gnome-vfs-directory.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-directory.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef GNOME_VFS_DIRECTORY_H
 #define GNOME_VFS_DIRECTORY_H
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-file-info.h>
 
 G_BEGIN_DECLS
Index: libgnomevfs/gnome-vfs-configuration.h
===================================================================
--- libgnomevfs/gnome-vfs-configuration.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-configuration.h	(working copy)
@@ -24,8 +24,7 @@
 #ifndef GNOME_VFS_CONFIGURATION_H
 #define GNOME_VFS_CONFIGURATION_H
 
-#include <glib/gtypes.h>
-#include <glib/glist.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: libgnomevfs/gnome-vfs-mime-info.h
===================================================================
--- libgnomevfs/gnome-vfs-mime-info.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-mime-info.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef GNOME_VFS_MIME_INFO_H
 #define GNOME_VFS_MIME_INFO_H
 
-#include <glib/glist.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-result.h>
 
 G_BEGIN_DECLS
Index: libgnomevfs/gnome-vfs-inet-connection.c
===================================================================
--- libgnomevfs/gnome-vfs-inet-connection.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-inet-connection.c	(working copy)
@@ -27,8 +27,7 @@
 #include "gnome-vfs-resolve.h"
 
 #include <errno.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <string.h>
 /* Keep <sys/types.h> above the network includes for FreeBSD. */
 #include <sys/types.h>
Index: libgnomevfs/gnome-vfs-ssl.c
===================================================================
--- libgnomevfs/gnome-vfs-ssl.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-ssl.c	(working copy)
@@ -34,7 +34,7 @@
 
 #include "gnome-vfs-private-utils.h"
 #include "gnome-vfs-resolve.h"
-#include <glib/gmem.h>
+#include <glib.h>
 #include <string.h>
 
 #ifdef HAVE_OPENSSL
Index: libgnomevfs/gnome-vfs-xfer.c
===================================================================
--- libgnomevfs/gnome-vfs-xfer.c	(revision 5522)
+++ libgnomevfs/gnome-vfs-xfer.c	(working copy)
@@ -41,8 +41,7 @@
 #include "gnome-vfs-ops.h"
 #include "gnome-vfs-utils.h"
 #include "gnome-vfs-private-utils.h"
-#include <glib/gstrfuncs.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <string.h>
 #include <sys/time.h>
 
Index: libgnomevfs/gnome-vfs-utils.h
===================================================================
--- libgnomevfs/gnome-vfs-utils.h	(revision 5522)
+++ libgnomevfs/gnome-vfs-utils.h	(working copy)
@@ -27,7 +27,7 @@
 #ifndef GNOME_VFS_UTILS_H
 #define GNOME_VFS_UTILS_H
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-file-size.h>
 #include <libgnomevfs/gnome-vfs-result.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
Index: test/test-long-cancel.c
===================================================================
--- test/test-long-cancel.c	(revision 5522)
+++ test/test-long-cancel.c	(working copy)
@@ -46,7 +46,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <glib/gmain.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 
Index: test/test-mime.c
===================================================================
--- test/test-mime.c	(revision 5522)
+++ test/test-mime.c	(working copy)
@@ -34,8 +34,7 @@
 
 #include <sys/stat.h>
 
-#include <glib/gstrfuncs.h>
-#include <glib/gutils.h>
+#include <glib.h>
 
 static gboolean
 is_good_scheme_char (char c)
Index: test/test-seek.c
===================================================================
--- test/test-seek.c	(revision 5522)
+++ test/test-seek.c	(working copy)
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include <errno.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <stdio.h>
Index: test/test-acl.c
===================================================================
--- test/test-acl.c	(revision 5522)
+++ test/test-acl.c	(working copy)
@@ -27,8 +27,7 @@
 #endif
 
 
-#include <glib/gstrfuncs.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include <libgnomevfs/gnome-vfs.h>
 
Index: test/test-uri.c
===================================================================
--- test/test-uri.c	(revision 5522)
+++ test/test-uri.c	(working copy)
@@ -27,8 +27,7 @@
 
 #include <config.h>
 
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnomevfs/gnome-vfs-private-utils.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
Index: test/test-escape.c
===================================================================
--- test/test-escape.c	(revision 5522)
+++ test/test-escape.c	(working copy)
@@ -24,8 +24,7 @@
 
 #include <config.h>
 
-#include <glib/gstrfuncs.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <signal.h>
Index: test/test-symlinks.c
===================================================================
--- test/test-symlinks.c	(revision 5522)
+++ test/test-symlinks.c	(working copy)
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include <glib/gmain.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
Index: test/test-find-directory.c
===================================================================
--- test/test-find-directory.c	(revision 5522)
+++ test/test-find-directory.c	(working copy)
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-find-directory.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
Index: test/test-queue.c
===================================================================
--- test/test-queue.c	(revision 5522)
+++ test/test-queue.c	(working copy)
@@ -33,8 +33,7 @@
 
 #include <config.h>
 
-#include <glib/glist.h>
-#include <glib/gmain.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
 #include <libgnomevfs/gnome-vfs-job-limit.h>
 #include <libgnomevfs/gnome-vfs-init.h>
Index: test/test-info.c
===================================================================
--- test/test-info.c	(revision 5522)
+++ test/test-info.c	(working copy)
@@ -24,7 +24,7 @@
 
 #include <config.h>
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <stdio.h>
Index: test/test-ssl.c
===================================================================
--- test/test-ssl.c	(revision 5522)
+++ test/test-ssl.c	(working copy)
@@ -24,7 +24,7 @@
 
 #include <config.h>
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnomevfs/gnome-vfs-socket-buffer.h>
 #include <libgnomevfs/gnome-vfs-socket.h>
Index: test/test-channel.c
===================================================================
--- test/test-channel.c	(revision 5522)
+++ test/test-channel.c	(working copy)
@@ -23,10 +23,7 @@
 
 #include <config.h>
 
-#include <glib/gconvert.h> /* workaround for bug in giochannel.h */
-#include <glib/giochannel.h>
-#include <glib/gmain.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <stdio.h>
Index: test/test-async.c
===================================================================
--- test/test-async.c	(revision 5522)
+++ test/test-async.c	(working copy)
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include <glib/gmain.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <stdio.h>
