diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 448ebceca9da..9ce395c75462 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-23  Hans Boehm  <Hans.Boehm@hp.com>
+
+	* aix_irix_threads.c: Move _THREADS checks after gc_priv.h include.
+	* backgraph.c, include/private/gc_pmark.h: Always include gc.h.
+
 2004-08-23  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* win32_threads.c: Move GC_WIN32_THREADS check after gc_priv.h include.
diff --git a/boehm-gc/aix_irix_threads.c b/boehm-gc/aix_irix_threads.c
index 4a5383ce4d10..5d27afd145ed 100644
--- a/boehm-gc/aix_irix_threads.c
+++ b/boehm-gc/aix_irix_threads.c
@@ -26,9 +26,10 @@
  * as a base instead.
  */
 
+# include "private/gc_priv.h"
+
 # if defined(GC_IRIX_THREADS) || defined(GC_AIX_THREADS)
 
-# include "private/gc_priv.h"
 # include <pthread.h>
 # include <assert.h>
 # include <semaphore.h>
diff --git a/boehm-gc/backgraph.c b/boehm-gc/backgraph.c
index 0fe1c8f7d360..7baf5b103e40 100644
--- a/boehm-gc/backgraph.c
+++ b/boehm-gc/backgraph.c
@@ -24,6 +24,8 @@
  * a growing space leak.
  */
 
+#include "gc.h"	/* For configuration information. */
+
 #ifdef MAKE_BACK_GRAPH
 
 #define MAX_IN	10	/* Maximum in-degree we handle directly */
diff --git a/boehm-gc/include/private/gc_pmark.h b/boehm-gc/include/private/gc_pmark.h
index 51981914dc5f..6b15d8ad2421 100644
--- a/boehm-gc/include/private/gc_pmark.h
+++ b/boehm-gc/include/private/gc_pmark.h
@@ -25,6 +25,8 @@
 #ifndef GC_PMARK_H
 # define GC_PMARK_H
 
+# include "gc.h"	/* For configuration */
+
 # if defined(KEEP_BACK_PTRS) || defined(PRINT_BLACK_LIST)
 #   include "dbg_mlc.h"
 # endif