From ca7dee5949185cd43a1f71c4e2b15987a0cc3160 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sat, 4 Sep 2010 18:04:34 +0100
Subject: [PATCH] Build fixes for the fall-out of the inclusion changes

---
 glib/gbacktrace.c | 3 +++
 glib/gchecksum.c  | 1 +
 glib/gdataset.c   | 1 +
 glib/gdatetime.c  | 3 +++
 glib/gdatetime.h  | 2 +-
 glib/gdir.c       | 1 +
 glib/ghash.c      | 1 +
 glib/ghostutils.c | 1 +
 glib/giochannel.c | 1 +
 glib/gpoll.c      | 1 +
 glib/grand.c      | 1 +
 glib/gscanner.c   | 1 +
 glib/gshell.c     | 1 +
 13 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index 26d10ac..55457e2 100644
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -65,7 +65,10 @@
 #  undef STRICT
 #endif
 
+#include "gbacktrace.h"
+
 #include "gtypes.h"
+#include "gmain.h"
 #include "gprintfint.h"
 
 
diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index 7d17bc7..b0d10c1 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -25,6 +25,7 @@
 #include "gchecksum.h"
 
 #include "gmem.h"
+#include "gstrfuncs.h"
 #include "gtestutils.h"
 #include "gtypes.h"
 #include "glibintl.h"
diff --git a/glib/gdataset.c b/glib/gdataset.c
index b25f6f5..9a3e8f9 100644
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -39,6 +39,7 @@
 #include "gdatasetprivate.h"
 #include "ghash.h"
 #include "gquark.h"
+#include "gstrfuncs.h"
 #include "gtestutils.h"
 #include "gthread.h"
 #include "glib_trace.h"
diff --git a/glib/gdatetime.c b/glib/gdatetime.c
index 4772d49..83d2785 100644
--- a/glib/gdatetime.c
+++ b/glib/gdatetime.c
@@ -53,6 +53,9 @@
 #include "gdatetime.h"
 
 #include "gatomic.h"
+#include "gfileutils.h"
+#include "gmain.h"
+#include "gstrfuncs.h"
 #include "gtestutils.h"
 #include "glibintl.h"
 
diff --git a/glib/gdatetime.h b/glib/gdatetime.h
index 315f558..7a052cb 100644
--- a/glib/gdatetime.h
+++ b/glib/gdatetime.h
@@ -25,7 +25,7 @@
 #define __G_DATE_TIME_H__
 
 #include <time.h>
-#include <gtypes.h>
+#include <glib/gtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/glib/gdir.c b/glib/gdir.c
index 78b8661..15aeb4c 100644
--- a/glib/gdir.c
+++ b/glib/gdir.c
@@ -38,6 +38,7 @@
 
 #include "gconvert.h"
 #include "gfileutils.h"
+#include "gstrfuncs.h"
 #include "gtestutils.h"
 #include "glibintl.h"
 
diff --git a/glib/ghash.c b/glib/ghash.c
index e344676..5f2df05 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -34,6 +34,7 @@
 
 #include "ghash.h"
 
+#include "gatomic.h"
 #include "gtestutils.h"
 
 
diff --git a/glib/ghostutils.c b/glib/ghostutils.c
index 796d51c..c036195 100644
--- a/glib/ghostutils.c
+++ b/glib/ghostutils.c
@@ -26,6 +26,7 @@
 #include "ghostutils.h"
 
 #include "garray.h"
+#include "gmem.h"
 #include "gstring.h"
 #include "gstrfuncs.h"
 #include "glibintl.h"
diff --git a/glib/giochannel.c b/glib/giochannel.c
index ea38813..fb7fd0a 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -44,6 +44,7 @@
 
 #include "giochannel.h"
 
+#include "gstrfuncs.h"
 #include "gtestutils.h"
 #include "glibintl.h"
 
diff --git a/glib/gpoll.c b/glib/gpoll.c
index 554e354..003b011 100644
--- a/glib/gpoll.c
+++ b/glib/gpoll.c
@@ -33,6 +33,7 @@
  */
 
 #include "config.h"
+#include "glibconfig.h"
 
 /* Uncomment the next line (and the corresponding line in gmain.c) to
  * enable debugging printouts if the environment variable
diff --git a/glib/grand.c b/glib/grand.c
index 9a72c2f..a70ce7b 100644
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -49,6 +49,7 @@
 
 #include "grand.h"
 
+#include "gmain.h"
 #include "gmem.h"
 #include "gtestutils.h"
 #include "gthread.h"
diff --git a/glib/gscanner.c b/glib/gscanner.c
index 9191e8e..1234a60 100644
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -49,6 +49,7 @@
 #include "gscanner.h"
 
 #include "gprintfint.h"
+#include "gstrfuncs.h"
 #include "gstring.h"
 #include "gtestutils.h"
 
diff --git a/glib/gshell.c b/glib/gshell.c
index e6ecd6d..1461f29 100644
--- a/glib/gshell.c
+++ b/glib/gshell.c
@@ -27,6 +27,7 @@
 #include "gshell.h"
 
 #include "gslist.h"
+#include "gstrfuncs.h"
 #include "gstring.h"
 #include "gtestutils.h"
 #include "glibintl.h"
-- 
2.7.4