--- old/src/cpu/x86/vm/vm_version_x86.hpp	2010-11-16 18:03:44.000000000 +0100
+++ new/src/cpu/x86/vm/vm_version_x86.hpp	2010-11-16 18:03:44.000000000 +0100
@@ -22,6 +22,12 @@
  *
  */
 
+#ifndef CPU_X86_VM_VM_VERSION_X86_HPP
+#define CPU_X86_VM_VM_VERSION_X86_HPP
+
+#include "runtime/globals_extension.hpp"
+#include "runtime/vm_version.hpp"
+
 class VM_Version : public Abstract_VM_Version {
 public:
   // cpuid result register layouts.  These are all unions of a uint32_t
@@ -516,3 +522,5 @@
     return count >= 0 ? count : 1;
   }
 };
+
+#endif // CPU_X86_VM_VM_VERSION_X86_HPP