--- a/hotspot/src/share/vm/oops/oop.psgc.inline.hpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/hotspot/src/share/vm/oops/oop.psgc.inline.hpp	Tue Nov 23 13:22:55 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,15 @@
  *
  */
 
+#ifndef SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP
+#define SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP
+
+#ifndef SERIALGC
+#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
+#include "gc_implementation/parallelScavenge/psScavenge.hpp"
+#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
+#endif
+
 // ParallelScavengeHeap methods
 
 inline void oopDesc::push_contents(PSPromotionManager* pm) {
@@ -32,3 +41,5 @@
   }
   // Else skip it.  The typeArrayKlass in the header never needs scavenging.
 }
+
+#endif // SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP