Index: gobject/gsourceclosure.c
===================================================================
--- gobject/gsourceclosure.c	(revision 5777)
+++ gobject/gsourceclosure.c	(working copy)
@@ -16,6 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#include "config.h"
 
 #include "gsourceclosure.h"
 #include "gboxed.h"
Index: gobject/gtypeplugin.c
===================================================================
--- gobject/gtypeplugin.c	(revision 5777)
+++ gobject/gtypeplugin.c	(working copy)
@@ -16,8 +16,10 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include	"gtypeplugin.h"
-#include	"gobjectalias.h"
+#include "config.h"
+
+#include "gtypeplugin.h"
+#include "gobjectalias.h"
 
 
 
Index: gobject/gobjectnotifyqueue.c
===================================================================
--- gobject/gobjectnotifyqueue.c	(revision 5777)
+++ gobject/gobjectnotifyqueue.c	(working copy)
@@ -19,8 +19,10 @@
 #ifndef __G_OBJECT_NOTIFY_QUEUE_H__
 #define __G_OBJECT_NOTIFY_QUEUE_H__
 
-#include        <string.h> /* memset */
-#include        <glib-object.h>
+#include "config.h"
+
+#include <string.h> /* memset */
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
Index: gobject/testgobject.c
===================================================================
--- gobject/testgobject.c	(revision 5777)
+++ gobject/testgobject.c	(working copy)
@@ -16,12 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#include "config.h"
 
 #include <string.h>
 
 #undef	G_LOG_DOMAIN
 #define	G_LOG_DOMAIN "TestObject"
-#include	<glib-object.h>
+#include <glib-object.h>
 
 /* --- TestIface --- */
 #define TEST_TYPE_IFACE           (test_iface_get_type ())
Index: gobject/gvaluetransform.c
===================================================================
--- gobject/gvaluetransform.c	(revision 5777)
+++ gobject/gvaluetransform.c	(working copy)
@@ -16,11 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include        <string.h>
+#include "config.h"
 
-#include        "gvalue.h"
-#include        "genums.h"
-#include	"gobjectalias.h"
+#include <string.h>
+
+#include "gvalue.h"
+#include "genums.h"
+#include "gobjectalias.h"
 
 
 /* same type transforms
Index: gobject/gobject-query.c
===================================================================
--- gobject/gobject-query.c	(revision 5777)
+++ gobject/gobject-query.c	(working copy)
@@ -16,18 +16,18 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include	"../config.h"
+#include "config.h"
 
-#include        <glib-object.h>
+#include <glib-object.h>
 
-#include	<glib/gprintf.h>
-#include	<stdlib.h>
-#include	<string.h>
+#include <glib/gprintf.h>
+#include <stdlib.h>
+#include <string.h>
 #ifdef HAVE_UNISTD_H
-#include	<unistd.h>
+#include <unistd.h>
 #endif
-#include	<sys/stat.h>
-#include	<fcntl.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 static gchar *indent_inc = NULL;
 static guint spacing = 1;
Index: gobject/gsignal.c
===================================================================
--- gobject/gsignal.c	(revision 5777)
+++ gobject/gsignal.c	(working copy)
@@ -26,19 +26,19 @@
 
 #include <config.h>
 
-#include        "gsignal.h"
+#include <string.h>
+#include <signal.h>
 
-#include        "gbsearcharray.h"
-#include        "gvaluecollector.h"
-#include	"gvaluetypes.h"
-#include	"gboxed.h"
-#include	"gobject.h"
-#include	"genums.h"
+#include "gsignal.h"
 
-#include	"gobjectalias.h"
+#include "gbsearcharray.h"
+#include "gvaluecollector.h"
+#include "gvaluetypes.h"
+#include "gboxed.h"
+#include "gobject.h"
+#include "genums.h"
 
-#include	<string.h> 
-#include	<signal.h>
+#include "gobjectalias.h"
 
 
 /* pre allocation configurations
Index: gobject/gtypemodule.c
===================================================================
--- gobject/gtypemodule.c	(revision 5777)
+++ gobject/gtypemodule.c	(working copy)
@@ -16,6 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#include "config.h"
 
 #include <stdlib.h>
 
Index: gobject/genums.c
===================================================================
--- gobject/genums.c	(revision 5777)
+++ gobject/genums.c	(working copy)
@@ -20,15 +20,17 @@
 /*
  * MT safe
  */
+ 
+#include "config.h"
 
-#include        <string.h>
+#include <string.h>
 
-#include	"genums.h"
+#include "genums.h"
 
-#include	"gvalue.h"
-#include	"gvaluecollector.h"
+#include "gvalue.h"
+#include "gvaluecollector.h"
 
-#include	"gobjectalias.h"
+#include "gobjectalias.h"
 
 
 /* --- prototypes --- */
Index: gobject/gparamspecs.c
===================================================================
--- gobject/gparamspecs.c	(revision 5777)
+++ gobject/gparamspecs.c	(working copy)
@@ -21,14 +21,15 @@
  * MT safe
  */
 
-#include	"../config.h"
+#include "config.h"
 
-#include	"gparamspecs.h"
+#include <string.h>
 
-#include	"gvaluecollector.h"
-#include	"gvaluearray.h"
-#include	"gobjectalias.h"
-#include	<string.h>
+#include "gparamspecs.h"
+
+#include "gvaluecollector.h"
+#include "gvaluearray.h"
+#include "gobjectalias.h"
 
 #define	G_FLOAT_EPSILON		(1e-30)
 #define	G_DOUBLE_EPSILON	(1e-90)
Index: gobject/gparam.c
===================================================================
--- gobject/gparam.c	(revision 5777)
+++ gobject/gparam.c	(working copy)
@@ -20,13 +20,15 @@
 /*
  * MT safe
  */
+#include "config.h"
 
-#include	"gparam.h"
-#include        "gparamspecs.h"
+#include <string.h>
 
-#include	"gvaluecollector.h"
-#include	"gobjectalias.h"
-#include	<string.h>
+#include "gparam.h"
+#include "gparamspecs.h"
+
+#include "gvaluecollector.h"
+#include "gobjectalias.h"
 
 
 
Index: gobject/gboxed.c
===================================================================
--- gobject/gboxed.c	(revision 5777)
+++ gobject/gboxed.c	(working copy)
@@ -16,17 +16,20 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include	"gboxed.h"
+#include "config.h"
 
-#include	"gbsearcharray.h"
-#include	"gvalue.h"
-#include	"gvaluearray.h"
-#include	"gclosure.h"
-#include	"gvaluecollector.h"
+#include <string.h>
 
-#include	"gobjectalias.h"
+#include "gboxed.h"
+
+#include "gbsearcharray.h"
+#include "gvalue.h"
+#include "gvaluearray.h"
+#include "gclosure.h"
+#include "gvaluecollector.h"
+
+#include "gobjectalias.h"
 
-#include <string.h>
 
 /* --- typedefs & structures --- */
 typedef struct
@@ -36,7 +39,6 @@ typedef struct
   GBoxedFreeFunc free;
 } BoxedNode;
 
-
 /* --- prototypes --- */
 static gint	boxed_nodes_cmp		(gconstpointer	p1,
 					 gconstpointer	p2);
Index: gobject/gvaluetypes.c
===================================================================
--- gobject/gvaluetypes.c	(revision 5777)
+++ gobject/gvaluetypes.c	(working copy)
@@ -20,19 +20,21 @@
 /*
  * MT safe
  */
+#include "config.h"
 
-#include	"gvaluetypes.h"
+#include <string.h>
+#include <stdlib.h>	/* qsort() */
 
-#include	"gvaluecollector.h"
+#include "gvaluetypes.h"
+
+#include "gvaluecollector.h"
 
 #include "gobject.h"
 #include "gparam.h"
 #include "gboxed.h"
 #include "genums.h"
 
-#include	"gobjectalias.h"
-#include	<string.h>
-#include	<stdlib.h>	/* qsort() */
+#include "gobjectalias.h"
 
 
 /* --- value functions --- */
Index: gobject/gobject.c
===================================================================
--- gobject/gobject.c	(revision 5777)
+++ gobject/gobject.c	(working copy)
@@ -16,24 +16,27 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include	"gobject.h"
-#include        <glib/gdatasetprivate.h>
+#include "config.h"
+
+#include <string.h>
+#include <signal.h>
+#include <glib/gdatasetprivate.h>
+
+#include "gobject.h"
 
 /*
  * MT safe with regards to reference counting.
  */
 
-#include	"gvaluecollector.h"
-#include	"gsignal.h"
-#include	"gparamspecs.h"
-#include	"gvaluetypes.h"
-#include	<string.h>
-#include	<signal.h>
+#include "gvaluecollector.h"
+#include "gsignal.h"
+#include "gparamspecs.h"
+#include "gvaluetypes.h"
 
-#include	"gobjectalias.h"
+#include "gobjectalias.h"
 
 /* This should be included after gobjectalias.h (or pltcheck.sh will fail) */
-#include	"gobjectnotifyqueue.c"
+#include "gobjectnotifyqueue.c"
 
 
 #define	PREALLOC_CPARAMS	(8)
Index: gobject/gvaluearray.c
===================================================================
--- gobject/gvaluearray.c	(revision 5777)
+++ gobject/gvaluearray.c	(working copy)
@@ -21,12 +21,13 @@
  * MT safe
  */
 
-#include <config.h>
+#include "config.h"
 
-#include	"gvaluearray.h"
-#include 	"gobjectalias.h"
-#include	<string.h>
-#include	<stdlib.h>	/* qsort() */
+#include <string.h>
+#include <stdlib.h>	/* qsort() */
+
+#include "gvaluearray.h"
+#include "gobjectalias.h"
 
 #ifdef	DISABLE_MEM_POOLS
 #  define	GROUP_N_VALUES	(1)	/* power of 2 !! */
Index: gobject/gclosure.c
===================================================================
--- gobject/gclosure.c	(revision 5777)
+++ gobject/gclosure.c	(working copy)
@@ -17,15 +17,18 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include	"gclosure.h"
+#include "config.h"
+
+#include <string.h>
+
+#include "gclosure.h"
 
 /*
  * MT safe with regards to reference counting.
  */
 
-#include	"gvalue.h"
-#include 	"gobjectalias.h"
-#include	<string.h>
+#include "gvalue.h"
+#include "gobjectalias.h"
 
 
 #define	CLOSURE_MAX_REF_COUNT		((1 << 15) - 1)
Index: gobject/gvalue.c
===================================================================
--- gobject/gvalue.c	(revision 5777)
+++ gobject/gvalue.c	(working copy)
@@ -20,6 +20,7 @@
 /*
  * FIXME: MT-safety
  */
+#include "config.h"
 
 #include <string.h>
 
Index: gobject/gtype.c
===================================================================
--- gobject/gtype.c	(revision 5777)
+++ gobject/gtype.c	(working copy)
@@ -16,19 +16,21 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include        <config.h>
-#include	"gtype.h"
+#include "config.h"
+
+#include <string.h>
+
+#include "gtype.h"
 
 /*
  * MT safe
  */
 
-#include	"gtypeplugin.h"
-#include	"gvaluecollector.h"
-#include	"gbsearcharray.h"
-#include	<string.h>
+#include "gtypeplugin.h"
+#include "gvaluecollector.h"
+#include "gbsearcharray.h"
 
-#include	"gobjectalias.h"
+#include "gobjectalias.h"
 
 /* NOTE: some functions (some internal variants and exported ones)
  * invalidate data portions of the TypeNodes. if external functions/callbacks
Index: gobject/glib-genmarshal.c
===================================================================
--- gobject/glib-genmarshal.c	(revision 5777)
+++ gobject/glib-genmarshal.c	(working copy)
@@ -16,22 +16,22 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include	"config.h"
+#include "config.h"
 
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "GLib-Genmarshal"
-#include	<glib.h>
+#include <glib.h>
 
-#include	<glib/gprintf.h>
-#include	<stdlib.h>
-#include	<fcntl.h>
-#include	<string.h>
-#include	<errno.h>
+#include <glib/gprintf.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
 #ifdef HAVE_UNISTD_H
-#include	<unistd.h>
+#include <unistd.h>
 #endif
-#include	<sys/types.h>
-#include	<sys/stat.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #ifdef G_OS_WIN32
 #include <io.h>
@@ -599,7 +599,7 @@ main (int   argc,
       char *argv[])
 {
   const gchar *gobject_marshallers[] = {
-#include	"gmarshal.strings"
+#include "gmarshal.strings"
   };
   GScanner *scanner;
   GSList *slist, *files = NULL;
