diff --git a/configure/os/CONFIG.darwin-ppc.darwin-ppc-debug b/configure/os/CONFIG.darwin-ppc.darwin-ppc-debug
index 5d56cb222..47ad7f818 100644
--- a/configure/os/CONFIG.darwin-ppc.darwin-ppc-debug
+++ b/configure/os/CONFIG.darwin-ppc.darwin-ppc-debug
@@ -9,6 +9,8 @@
 
 -include $(CONFIG)/os/CONFIG.Common.darwin-ppc
 -include $(CONFIG)/os/CONFIG.darwin-ppc.darwin-ppc
+-include $(CONFIG)/os/CONFIG_SITE.Common.darwin-ppc
+-include $(CONFIG)/os/CONFIG_SITE.darwin-ppc.darwin-ppc
 
 BUILD_CLASS=HOST
 HOST_OPT = NO
diff --git a/configure/os/CONFIG.darwin-x86.darwin-x86-debug b/configure/os/CONFIG.darwin-x86.darwin-x86-debug
index 01c57db50..9a551540a 100644
--- a/configure/os/CONFIG.darwin-x86.darwin-x86-debug
+++ b/configure/os/CONFIG.darwin-x86.darwin-x86-debug
@@ -9,6 +9,9 @@
 
 -include $(CONFIG)/os/CONFIG.Common.darwin-x86
 -include $(CONFIG)/os/CONFIG.darwin-x86.darwin-x86
+-include $(CONFIG)/os/CONFIG_SITE.Common.darwin-x86
+-include $(CONFIG)/os/CONFIG_SITE.darwin-x86.darwin-x86
+
 
 BUILD_CLASS=HOST
 HOST_OPT = NO
diff --git a/configure/os/CONFIG.linux-x86.linux-x86-debug b/configure/os/CONFIG.linux-x86.linux-x86-debug
index 5fab87fc6..c86da0aa6 100644
--- a/configure/os/CONFIG.linux-x86.linux-x86-debug
+++ b/configure/os/CONFIG.linux-x86.linux-x86-debug
@@ -7,8 +7,10 @@
 # Sites may override these definitions in CONFIG_SITE.linux-x86.linux-x86-debug
 #-------------------------------------------------------
 
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+#-include $(CONFIG)/os/CONFIG.Common.linux-x86
+-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+#-include $(CONFIG)/os/CONFIG_SITE.Common.linux-x86
+#-include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-x86
 
 BUILD_CLASS=HOST
 HOST_OPT=NO
-
diff --git a/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug b/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug
index bc184145b..06894215f 100644
--- a/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug
+++ b/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug
@@ -7,8 +7,10 @@
 # Sites may override these definitions in CONFIG_SITE.linux-x86_64.linux-x86_64-debug
 #-------------------------------------------------------
 
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+-include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+-include $(CONFIG)/os/CONFIG.linux-x86_64.linux-x86_64
+-include $(CONFIG)/os/CONFIG_SITE.Common.linux-x86_64
+-include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.linux-x86_64
 
 BUILD_CLASS=HOST
-
 HOST_OPT = NO
diff --git a/configure/os/CONFIG.solaris-sparc.solaris-sparc-debug b/configure/os/CONFIG.solaris-sparc.solaris-sparc-debug
index cff97369a..653e59c2b 100644
--- a/configure/os/CONFIG.solaris-sparc.solaris-sparc-debug
+++ b/configure/os/CONFIG.solaris-sparc.solaris-sparc-debug
@@ -7,7 +7,10 @@
 # Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc-debug
 #-------------------------------------------------------
 
-include $(CONFIG)/os/CONFIG.solaris-sparc.solaris-sparc
+-include $(CONFIG)/os/CONFIG.Common.solaris-sparc
+-include $(CONFIG)/os/CONFIG.solaris-sparc.solaris-sparc
+-include $(CONFIG)/os/CONFIG_SITE.Common.solaris-sparc
+-include $(CONFIG)/os/CONFIG_SITE.solaris-sparc.solaris-sparc
 
 BUILD_CLASS=HOST
 HOST_OPT=NO
diff --git a/configure/os/CONFIG.solaris-x86.solaris-x86-debug b/configure/os/CONFIG.solaris-x86.solaris-x86-debug
index a263f2175..5840ce2c7 100644
--- a/configure/os/CONFIG.solaris-x86.solaris-x86-debug
+++ b/configure/os/CONFIG.solaris-x86.solaris-x86-debug
@@ -7,8 +7,10 @@
 # Sites may override these definitions in CONFIG_SITE.solaris-x86.solaris-x86-debug
 #-------------------------------------------------------
 
-include $(CONFIG)/os/CONFIG.Common.solaris-x86
-include $(CONFIG)/os/CONFIG.solaris-x86.solaris-x86
+-include $(CONFIG)/os/CONFIG.Common.solaris-x86
+-include $(CONFIG)/os/CONFIG.solaris-x86.solaris-x86
+-include $(CONFIG)/os/CONFIG_SITE.Common.solaris-x86
+-include $(CONFIG)/os/CONFIG_SITE.solaris-x86.solaris-x86
 
 BUILD_CLASS=HOST