--- old/src/share/vm/opto/regmask.hpp	2010-11-16 18:17:49.000000000 +0100
+++ new/src/share/vm/opto/regmask.hpp	2010-11-16 18:17:48.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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,25 @@
  *
  */
 
+#ifndef SHARE_VM_OPTO_REGMASK_HPP
+#define SHARE_VM_OPTO_REGMASK_HPP
+
+#include "code/vmreg.hpp"
+#include "libadt/port.hpp"
+#include "opto/optoreg.hpp"
+#ifdef TARGET_ARCH_MODEL_x86_32
+# include "adfiles/adGlobals_x86_32.hpp"
+#endif
+#ifdef TARGET_ARCH_MODEL_x86_64
+# include "adfiles/adGlobals_x86_64.hpp"
+#endif
+#ifdef TARGET_ARCH_MODEL_sparc
+# include "adfiles/adGlobals_sparc.hpp"
+#endif
+#ifdef TARGET_ARCH_MODEL_zero
+# include "adfiles/adGlobals_zero.hpp"
+#endif
+
 // Some fun naming (textual) substitutions:
 //
 // RegMask::get_low_elem() ==> RegMask::find_first_elem()
@@ -262,3 +281,5 @@
 
 // Do not use this constant directly in client code!
 #undef RM_SIZE
+
+#endif // SHARE_VM_OPTO_REGMASK_HPP