--- old/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp	2010-11-16 18:11:30.000000000 +0100
+++ new/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp	2010-11-16 18:11:29.000000000 +0100
@@ -22,6 +22,13 @@
  *
  */
 
+#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP
+#define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP
+
+#include "gc_implementation/g1/g1RemSet.hpp"
+#include "gc_implementation/g1/heapRegionRemSet.hpp"
+#include "oops/oop.inline.hpp"
+
 inline size_t G1RemSet::n_workers() {
   if (_g1->workers() != NULL) {
     return _g1->workers()->total_workers();
@@ -108,3 +115,5 @@
   }
 }
 
+
+#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP