diff --git a/make/bsd/makefiles/gcc.make b/make/bsd/makefiles/gcc.make
--- a/make/bsd/makefiles/gcc.make
+++ b/make/bsd/makefiles/gcc.make
@@ -117,6 +117,7 @@
 CFLAGS += -fno-exceptions
 CFLAGS += -pthread
 CFLAGS += -fcheck-new
+CFLAGS += -include runtime/config-full.hpp
 # version 4 and above support fvisibility=hidden (matches jni_x86.h file)
 # except 4.1.2 gives pointless warnings that can't be disabled (afaik)
 ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
diff --git a/make/excludeSrc.make b/make/excludeSrc.make
--- a/make/excludeSrc.make
+++ b/make/excludeSrc.make
@@ -73,9 +73,6 @@
 endif
 
 ifeq ($(INCLUDE_ALL_GCS), false)
-      CXXFLAGS += -DINCLUDE_ALL_GCS=0
-      CFLAGS += -DINCLUDE_ALL_GCS=0
-
       Src_Files_EXCLUDE += \
 	cmsAdaptiveSizePolicy.cpp cmsCollectorPolicy.cpp \
 	cmsGCAdaptivePolicyCounters.cpp cmsLockVerifier.cpp cmsPermGen.cpp compactibleFreeListSpace.cpp \
diff --git a/make/windows/makefiles/vm.make b/make/windows/makefiles/vm.make
--- a/make/windows/makefiles/vm.make
+++ b/make/windows/makefiles/vm.make
@@ -74,6 +74,8 @@
 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
 
+CCX_FLAGS=$(CCS_FLAGS) /FI runtime/config-full.hpp
+
 !ifndef JAVASE_EMBEDDED
 CXX_FLAGS=$(CXX_FLAGS) /D "INCLUDE_TRACE"
 !endif
diff --git a/src/share/vm/runtime/config-full.hpp b/src/share/vm/runtime/config-full.hpp
new file mode 100644
--- /dev/null
+++ b/src/share/vm/runtime/config-full.hpp
@@ -0,0 +1,6 @@
+#ifndef VM_RUNTIME_CONFIG_FULL_HPP
+#define VM_RUNTIME_CONFIG_FULL_HPP
+
+#define INCLUDE_ALL_GCS 1
+
+#endif // VM_RUNTIME_CONFIG_FULL_HPP
diff --git a/src/share/vm/runtime/config-minimal.hpp b/src/share/vm/runtime/config-minimal.hpp
new file mode 100644
--- /dev/null
+++ b/src/share/vm/runtime/config-minimal.hpp
@@ -0,0 +1,6 @@
+#ifndef VM_RUNTIME_CONFIG_MINIMAL_HPP
+#define VM_RUNTIME_CONFIG_MINIMAL_HPP
+
+#define INCLUDE_ALL_GCS 0
+
+#endif // VM_RUNTIME_CONFIG_MINIMAL_HPP
diff --git a/src/share/vm/utilities/macros.hpp b/src/share/vm/utilities/macros.hpp
--- a/src/share/vm/utilities/macros.hpp
+++ b/src/share/vm/utilities/macros.hpp
@@ -129,17 +129,6 @@
 #define NOT_MANAGEMENT_RETURN_(code) { return code; }
 #endif // INCLUDE_MANAGEMENT
 
-/*
- * When INCLUDE_ALL_GCS is false the only garbage collectors
- * included in the JVM are defaultNewGeneration and markCompact.
- *
- * When INCLUDE_ALL_GCS is true all garbage collectors are
- * included in the JVM.
- */
-#ifndef INCLUDE_ALL_GCS
-#define INCLUDE_ALL_GCS 1
-#endif // INCLUDE_ALL_GCS
-
 #if INCLUDE_ALL_GCS
 #define NOT_ALL_GCS_RETURN        /* next token must be ; */
 #define NOT_ALL_GCS_RETURN_(code) /* next token must be ; */