More include cleanups

diff --git a/glib/gconvert.c b/glib/gconvert.c
index 324fb08..aa64203 100644 (file)
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -44,12 +44,10 @@
 #include "gconvert.h"
 
 #include "gcharset.h"
-#include "gprintfint.h"
 #include "gslist.h"
 #include "gstrfuncs.h"
 #include "gtestutils.h"
 #include "gthread.h"
-#include "gthreadprivate.h"
 #include "gunicode.h"
 #include "gfileutils.h"
 

diff --git a/glib/grand.c b/glib/grand.c
index 4c0e0b4..1a99893 100644 (file)
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -54,7 +54,6 @@
 #include "gmem.h"
 #include "gtestutils.h"
 #include "gthread.h"
-#include "gthreadprivate.h"
 
 #ifdef G_OS_WIN32
 #include <process.h>           /* For getpid() */

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 67af593..b9b4cab 100644 (file)
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -50,7 +50,6 @@
 #include "gprintf.h"
 #include "gprintfint.h"
 #include "glibintl.h"
-#include "gthreadprivate.h"
 
 
 /**

diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
index 38c600e..96c6a1c 100644 (file)
--- a/glib/gthread-win32.c
+++ b/glib/gthread-win32.c
@@ -42,6 +42,7 @@
 
 #include "config.h"
 
+#include "glib.h"
 #include "gthread.h"
 #include "gthreadprivate.h"
 #include "gslice.h"
@@ -416,9 +417,6 @@ g_private_replace (GPrivate *key,
 
 /* {{{1 GThread */
 
-#include "glib.h"
-#include "gthreadprivate.h"
-
 #define win32_check_for_error(what) G_STMT_START{                      \
   if (!(what))                                                         \
     g_error ("file %s: line %d (%s): error %s during %s",              \