--- old/src/share/vm/gc_implementation/g1/g1_globals.hpp	2010-10-28 13:54:45.000000000 +0200
+++ new/src/share/vm/gc_implementation/g1/g1_globals.hpp	2010-10-28 13:54:45.000000000 +0200
@@ -22,6 +22,11 @@
  *
  */
 
+#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1_GLOBALS_HPP
+#define SHARE_VM_GC_IMPLEMENTATION_G1_G1_GLOBALS_HPP
+
+#include "runtime/globals.hpp"
+
 //
 // Defines all globals flags used by the garbage-first compiler.
 //
@@ -285,3 +290,5 @@
           " controls whether G1 allows the RICM optimization")
 
 G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG)
+
+#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1_GLOBALS_HPP