--- a/hotspot/src/share/vm/oops/cpCache.cpp	Fri Jan 18 05:33:32 2013 -0800
+++ b/hotspot/src/share/vm/oops/cpCache.cpp	Wed Jan 23 13:02:39 2013 -0500
@@ -33,9 +33,10 @@
 #include "prims/jvmtiRedefineClassesTrace.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/handles.inline.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
 # include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
 
 
 // Implememtation of ConstantPoolCacheEntry