diff -r e33f46fc48ed -r f95d63e2154a src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
--- a/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	Tue Nov 23 13:22:55 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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,12 @@
  *
  */
 
+#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
+#define SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
+
+#include "gc_implementation/g1/g1BlockOffsetTable.hpp"
+#include "memory/space.hpp"
+
 inline HeapWord* G1BlockOffsetTable::block_start(const void* addr) {
   if (addr >= _bottom && addr < _end) {
     return block_start_unsafe(addr);
@@ -151,3 +157,5 @@
 inline void G1BlockOffsetArray::freed(HeapWord* blk, size_t size) {
   freed(blk, blk + size);
 }
+
+#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP