diff --git a/gio/Makefile.am b/gio/Makefile.am
index fc0b91855..05b20cdef 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -896,7 +896,7 @@ gio_probes.h: gio_probes.d
 		< $@.tmp > $@ && rm -f $@.tmp
 
 gio_probes.lo: gio_probes.d
-	$(AM_V_GEN) $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC $(DTRACE) -G -s $< -o $@
+	$(AM_V_GEN) $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
 
 BUILT_SOURCES += gio_probes.h gio_probes.lo
 CLEANFILES += gio_probes.h gio_probes.h.tmp
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 90d33d082..39163aa7f 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -386,7 +386,7 @@ glib_probes.h: glib_probes.d
 		< $@.tmp > $@ && rm -f $@.tmp
 
 glib_probes.lo: glib_probes.d
-	$(AM_V_GEN) $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC $(DTRACE) -G -s $< -o $@
+	$(AM_V_GEN) $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
 
 BUILT_SOURCES += glib_probes.h glib_probes.lo
 CLEANFILES += glib_probes.h glib_probes.h.tmp
diff --git a/glib/grefcount.h b/glib/grefcount.h
index dec9a5ffb..b6eced1b7 100644
--- a/glib/grefcount.h
+++ b/glib/grefcount.h
@@ -23,6 +23,7 @@
 #error "Only <glib.h> can be included directly."
 #endif
 
+#include <glib/gatomic.h>
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 4c28acdff..78748e96c 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -119,7 +119,7 @@ gobject_probes.h: gobject_probes.d
 		< $@.tmp > $@ && rm -f $@.tmp
 
 gobject_probes.lo: gobject_probes.d
-	$(AM_V_GEN) $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC $(DTRACE) -G -s $< -o $@
+	$(AM_V_GEN) $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
 
 BUILT_SOURCES += gobject_probes.h gobject_probes.lo
 CLEANFILES += gobject_probes.h