--- a/hotspot/src/share/vm/oops/klass.cpp	Fri Jan 18 05:33:32 2013 -0800
+++ b/hotspot/src/share/vm/oops/klass.cpp	Wed Jan 23 13:02:39 2013 -0500
@@ -37,11 +37,12 @@
 #include "oops/oop.inline2.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/stack.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
 #include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
 #include "gc_implementation/parallelScavenge/psScavenge.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
 
 void Klass::set_name(Symbol* n) {
   _name = n;