--- glib/gatomic-gcc.c.orig	2011-06-06 01:18:49.000000000 +0200
+++ glib/gatomic-gcc.c	2011-12-07 00:24:48.000000000 +0100
@@ -22,6 +22,8 @@
 
 #include "gatomic.h"
 
+#include "gthreadprivate.h"
+
 gint
 g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
 			       gint           val)
--- glib/gmem.c.orig	2011-02-10 00:31:42.000000000 +0100
+++ glib/gmem.c	2011-12-07 00:21:38.000000000 +0100
@@ -39,6 +39,7 @@
 #include "gbacktrace.h"
 #include "gtestutils.h"
 #include "gthread.h"
+#include "gthreadprivate.h"
 #include "glib_trace.h"