summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-10-17 02:14:18 -0400
committerMatthias Clasen <mclasen@redhat.com>2011-10-17 02:14:39 -0400
commit2f71118e785be41953765d048a7d03718a94e619 (patch)
treec5859b1ee04313e4ad0bc61430d1e0313495dc89
parenteb125665d8ad11c22457b4ec5062ede6594b8d89 (diff)
More include cleanups
-rw-r--r--glib/gconvert.c2
-rw-r--r--glib/grand.c1
-rw-r--r--glib/gstrfuncs.c1
-rw-r--r--glib/gthread-win32.c4
4 files changed, 1 insertions, 7 deletions
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 324fb0861..aa64203de 100644
--- 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 4c0e0b4e9..1a998930a 100644
--- 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 67af593cd..b9b4cab64 100644
--- 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 38c600e2c..96c6a1c30 100644
--- 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", \