diff -r 518b01b064ff -r 5b173b4ca846 hotspot/src/share/vm/runtime/jfieldIDWorkaround.hpp
--- a/hotspot/src/share/vm/runtime/jfieldIDWorkaround.hpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/hotspot/src/share/vm/runtime/jfieldIDWorkaround.hpp	Tue Nov 23 13:22:55 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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,9 @@
  *
  */
 
+#ifndef SHARE_VM_RUNTIME_JFIELDIDWORKAROUND_HPP
+#define SHARE_VM_RUNTIME_JFIELDIDWORKAROUND_HPP
+
 class jfieldIDWorkaround: AllStatic {
   // This workaround is because JVMTI doesn't have distinct entry points
   // for methods that use static jfieldIDs and instance jfieldIDs.
@@ -157,3 +160,5 @@
     }
   }
 };
+
+#endif // SHARE_VM_RUNTIME_JFIELDIDWORKAROUND_HPP