diff -r e33f46fc48ed -r f95d63e2154a src/share/vm/prims/jvmtiThreadState.hpp
--- a/src/share/vm/prims/jvmtiThreadState.hpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/src/share/vm/prims/jvmtiThreadState.hpp	Tue Nov 23 13:22:55 2010 -0800
@@ -22,8 +22,15 @@
  *
  */
 
-#ifndef _JAVA_JVMTITHREADSTATE_H_
-#define _JAVA_JVMTITHREADSTATE_H_
+#ifndef SHARE_VM_PRIMS_JVMTITHREADSTATE_HPP
+#define SHARE_VM_PRIMS_JVMTITHREADSTATE_HPP
+
+#include "jvmtifiles/jvmti.h"
+#include "memory/allocation.hpp"
+#include "memory/allocation.inline.hpp"
+#include "prims/jvmtiEventController.hpp"
+#include "runtime/thread.hpp"
+#include "utilities/growableArray.hpp"
 
 //
 // Forward Declarations
@@ -403,4 +410,4 @@
   }
 };
 
-#endif   /* _JAVA_JVMTITHREADSTATE_H_ */
+#endif // SHARE_VM_PRIMS_JVMTITHREADSTATE_HPP