diff -r e33f46fc48ed -r f95d63e2154a src/share/vm/memory/heap.hpp
--- a/src/share/vm/memory/heap.hpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/src/share/vm/memory/heap.hpp	Tue Nov 23 13:22:55 2010 -0800
@@ -22,6 +22,12 @@
  *
  */
 
+#ifndef SHARE_VM_MEMORY_HEAP_HPP
+#define SHARE_VM_MEMORY_HEAP_HPP
+
+#include "memory/allocation.hpp"
+#include "runtime/virtualspace.hpp"
+
 // Blocks
 
 class HeapBlock VALUE_OBJ_CLASS_SPEC {
@@ -160,3 +166,5 @@
   void verify();
   void print()  PRODUCT_RETURN;
 };
+
+#endif // SHARE_VM_MEMORY_HEAP_HPP