From 57fa18345fdaf97ecdb1b09202f7116f41335b76 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@imendio.com>
Date: Fri, 14 Mar 2008 20:38:58 +0000
Subject: [PATCH] gdk/gdkspawn.h gtk/gtkbuilderprivate.h
 gtk/gtkfilechoosersettings.c

2008-03-14  Michael Natterer  <mitch@imendio.com>

	* gdk/gdkspawn.h
	* gtk/gtkbuilderprivate.h
	* gtk/gtkfilechoosersettings.c
	* gtk/gtksearchenginesimple.c
	* gtk/tests/liststore.c
	* gtk/tests/treestore.c: remove single-file includes of GLib
	headers or replace them by <glib.h> where needed.


svn path=/trunk/; revision=19877
---
 ChangeLog                    | 10 ++++++++++
 gdk/gdkspawn.h               |  1 -
 gtk/gtkbuilderprivate.h      |  3 ---
 gtk/gtkfilechoosersettings.c |  2 +-
 gtk/gtksearchenginesimple.c  |  2 --
 gtk/tests/liststore.c        |  1 -
 gtk/tests/treestore.c        |  1 -
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d14ff7b94..e48fc2dc93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-14  Michael Natterer  <mitch@imendio.com>
+
+	* gdk/gdkspawn.h
+	* gtk/gtkbuilderprivate.h
+	* gtk/gtkfilechoosersettings.c
+	* gtk/gtksearchenginesimple.c
+	* gtk/tests/liststore.c
+	* gtk/tests/treestore.c: remove single-file includes of GLib
+	headers or replace them by <glib.h> where needed.
+
 2008-03-14  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkadjustment.c: coding style cleanup.
diff --git a/gdk/gdkspawn.h b/gdk/gdkspawn.h
index 72901010d3..745a1f806b 100644
--- a/gdk/gdkspawn.h
+++ b/gdk/gdkspawn.h
@@ -23,7 +23,6 @@
 #define __GDK_SPAWN_H__
 
 #include <gdk/gdkscreen.h>
-#include <glib/gspawn.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkbuilderprivate.h b/gtk/gtkbuilderprivate.h
index 07d20e6d0d..a1d9eb41e3 100644
--- a/gtk/gtkbuilderprivate.h
+++ b/gtk/gtkbuilderprivate.h
@@ -21,9 +21,6 @@
 #ifndef __GTK_BUILDER_PRIVATE_H__
 #define __GTK_BUILDER_PRIVATE_H__
 
-#include <glib/gmarkup.h>
-#include <glib/gslist.h>
-
 #include <glib-object.h>
 #include "gtkbuilder.h"
 
diff --git a/gtk/gtkfilechoosersettings.c b/gtk/gtkfilechoosersettings.c
index c5a3e05367..072df1e6a2 100644
--- a/gtk/gtkfilechoosersettings.c
+++ b/gtk/gtkfilechoosersettings.c
@@ -32,7 +32,7 @@
 #include <config.h>
 #include <errno.h>
 #include <string.h>
-#include <glib/gkeyfile.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include "gtkfilechoosersettings.h"
 #include "gtkalias.h"
diff --git a/gtk/gtksearchenginesimple.c b/gtk/gtksearchenginesimple.c
index d8d9f2641c..f6c596c6cc 100644
--- a/gtk/gtksearchenginesimple.c
+++ b/gtk/gtksearchenginesimple.c
@@ -39,8 +39,6 @@
 
 #include <string.h>
 
-#include <glib/gstrfuncs.h>
-
 #define BATCH_SIZE 500
 
 typedef struct 
diff --git a/gtk/tests/liststore.c b/gtk/tests/liststore.c
index 27bd87b9d6..588f725f3d 100644
--- a/gtk/tests/liststore.c
+++ b/gtk/tests/liststore.c
@@ -25,7 +25,6 @@
  *  - Needs analysis with the code coverage tool once it is there.
  */
 
-#include <glib/gtestutils.h>
 #include <gtk/gtk.h>
 
 static inline gboolean
diff --git a/gtk/tests/treestore.c b/gtk/tests/treestore.c
index 37a98da047..e3a85c92fe 100644
--- a/gtk/tests/treestore.c
+++ b/gtk/tests/treestore.c
@@ -28,7 +28,6 @@
  *  - And we also need tests for creating these child levels, etc.
  */
 
-#include <glib/gtestutils.h>
 #include <gtk/gtk.h>
 
 static inline gboolean