diff --git a/ChangeLog b/ChangeLog
index b0a7047cf..0ead9772d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb  6 21:59:09 2005  Manish Singh  <yosh@gimp.org>
+
+	* glib/abicheck.sh: feed the contents of config.h and glibconfig.h
+	into the preprocessor, since glib.symbols could need #defines
+	from them.
+
 Sun Feb  6 12:09:55 2005  Manish Singh  <yosh@gimp.org>
 
 	* glib/gatomic.c: Don't use matching constraints for asm mem
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b0a7047cf..0ead9772d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Feb  6 21:59:09 2005  Manish Singh  <yosh@gimp.org>
+
+	* glib/abicheck.sh: feed the contents of config.h and glibconfig.h
+	into the preprocessor, since glib.symbols could need #defines
+	from them.
+
 Sun Feb  6 12:09:55 2005  Manish Singh  <yosh@gimp.org>
 
 	* glib/gatomic.c: Don't use matching constraints for asm mem
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index b0a7047cf..0ead9772d 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Sun Feb  6 21:59:09 2005  Manish Singh  <yosh@gimp.org>
+
+	* glib/abicheck.sh: feed the contents of config.h and glibconfig.h
+	into the preprocessor, since glib.symbols could need #defines
+	from them.
+
 Sun Feb  6 12:09:55 2005  Manish Singh  <yosh@gimp.org>
 
 	* glib/gatomic.c: Don't use matching constraints for asm mem
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b0a7047cf..0ead9772d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Feb  6 21:59:09 2005  Manish Singh  <yosh@gimp.org>
+
+	* glib/abicheck.sh: feed the contents of config.h and glibconfig.h
+	into the preprocessor, since glib.symbols could need #defines
+	from them.
+
 Sun Feb  6 12:09:55 2005  Manish Singh  <yosh@gimp.org>
 
 	* glib/gatomic.c: Don't use matching constraints for asm mem
diff --git a/glib/abicheck.sh b/glib/abicheck.sh
index a9bead4cc..d77e63dcd 100755
--- a/glib/abicheck.sh
+++ b/glib/abicheck.sh
@@ -1,5 +1,13 @@
 #! /bin/sh
 
-cpp -P -DG_OS_UNIX -DINCLUDE_INTERNAL_SYMBOLS ${srcdir:-.}/glib.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
+egrep '^#([^i]|if).*[^\]$' "${top_builddir:-..}/glibconfig.h" > glibconfig.cpp
+
+INCLUDES="-include ${top_builddir:-..}/config.h"
+INCLUDES="$INCLUDES -include glibconfig.cpp"
+
+cpp -P -DINCLUDE_INTERNAL_SYMBOLS $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
+rm glibconfig.cpp
+
 nm -D .libs/libglib-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
+
 diff -u expected-abi actual-abi && rm expected-abi actual-abi