From f13d5612116de1e968764721fbc60b8e1d378430 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 5 Sep 2010 00:23:03 -0400
Subject: [PATCH] More header inclusion cleanup

---
 glib/gatomic-gcc.c |  2 +-
 glib/gatomic.c     |  2 +-
 glib/gerror.c      |  4 +++-
 glib/giounix.c     | 10 +++++++---
 glib/gprintf.c     |  1 -
 glib/gslice.c      | 15 +++++++++------
 glib/gspawn.c      |  7 ++++++-
 glib/gunidecomp.c  |  3 ++-
 glib/gutils.c      | 10 +++++++++-
 9 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/glib/gatomic-gcc.c b/glib/gatomic-gcc.c
index 6d2ac2276..9f28ceeca 100644
--- a/glib/gatomic-gcc.c
+++ b/glib/gatomic-gcc.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "glib.h"
+#include "gatomic.h"
 
 gint
 g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
diff --git a/glib/gatomic.c b/glib/gatomic.c
index ae290ecad..845c86686 100644
--- a/glib/gatomic.c
+++ b/glib/gatomic.c
@@ -27,7 +27,7 @@
 #include <sched.h>
 #endif
 
-#include "glib.h"
+#include "gatomic.h"
 #include "gthreadprivate.h"
 
 /**
diff --git a/glib/gerror.c b/glib/gerror.c
index 4e4c3e77a..1f3973910 100644
--- a/glib/gerror.c
+++ b/glib/gerror.c
@@ -26,8 +26,10 @@
 
 #include "config.h"
 
-#include "glib.h"
+#include "gerror.h"
 
+#include "gstrfuncs.h"
+#include "gtestutils.h"
 
 /**
  * g_error_new_valist:
diff --git a/glib/giounix.c b/glib/giounix.c
index 9d6364dae..e5e095fac 100644
--- a/glib/giounix.c
+++ b/glib/giounix.c
@@ -24,10 +24,10 @@
  * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GLib Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-/* 
+/*
  * MT safe
  */
 
@@ -43,7 +43,11 @@
 #include <string.h>
 #include <fcntl.h>
 
-#include "glib.h"
+#include "giochannel.h"
+
+#include "gerror.h"
+#include "gfileutils.h"
+#include "gtestutils.h"
 
 /*
  * Unix IO Channels
diff --git a/glib/gprintf.c b/glib/gprintf.c
index 06fb6cb2b..7ef15d3d8 100644
--- a/glib/gprintf.c
+++ b/glib/gprintf.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "glib.h"
 #include "gprintf.h"
 #include "gprintfint.h"
 
diff --git a/glib/gslice.c b/glib/gslice.c
index 7b6a9b796..cc6817010 100644
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include "gslice.h"
-
 #if     defined HAVE_POSIX_MEMALIGN && defined POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS
 #  define HAVE_COMPLIANT_POSIX_MEMALIGN 1
 #endif
@@ -32,10 +30,7 @@
 #include <stdlib.h>             /* posix_memalign() */
 #include <string.h>
 #include <errno.h>
-#include "gmem.h"               /* gslice.h */
-#include "gthreadprivate.h"
-#include "glib.h"
-#include "glib_trace.h"
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>             /* sysconf() */
 #endif
@@ -46,6 +41,14 @@
 
 #include <stdio.h>              /* fputs/fprintf */
 
+#include "gslice.h"
+
+#include "gmem.h"               /* gslice.h */
+#include "gutils.h"
+#include "gtestutils.h"
+#include "gthread.h"
+#include "gthreadprivate.h"
+#include "glib_trace.h"
 
 /* the GSlice allocator is split up into 4 layers, roughly modelled after the slab
  * allocator and magazine extensions as outlined in:
diff --git a/glib/gspawn.c b/glib/gspawn.c
index c2b814efa..0f8a0a616 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -41,7 +41,12 @@
 #include <sys/resource.h>
 #endif /* HAVE_SYS_RESOURCE_H */
 
-#include "glib.h"
+#include "gspawn.h"
+
+#include "gmem.h"
+#include "gstring.h"
+#include "gtestutils.h"
+#include "gutils.h"
 #include "glibintl.h"
 
 static gint g_execute (const gchar  *file,
diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c
index 607ceb662..0bd7ced2c 100644
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -23,8 +23,9 @@
 
 #include <stdlib.h>
 
-#include "glib.h"
+#include "gunicode.h"
 #include "gunidecomp.h"
+#include "gmem.h"
 #include "gunicomp.h"
 #include "gunicodeprivate.h"
 
diff --git a/glib/gutils.c b/glib/gutils.c
index a5794e681..e28f6f3a9 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -57,9 +57,17 @@
  */
 #define	G_IMPLEMENT_INLINES 1
 #define	__G_UTILS_C__
-#include "glib.h"
+#include "gutils.h"
+
+#include "gfileutils.h"
+#include "ghash.h"
+#include "gslist.h"
 #include "gprintfint.h"
+#include "gthread.h"
 #include "gthreadprivate.h"
+#include "gtestutils.h"
+#include "gunicode.h"
+#include "gstrfuncs.h"
 #include "glibintl.h"
 
 #ifdef	MAXPATHLEN