--- a/hotspot/src/share/vm/prims/jniCheck.hpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/hotspot/src/share/vm/prims/jniCheck.hpp	Tue Nov 23 13:22:55 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, 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,13 @@
  *
  */
 
+#ifndef SHARE_VM_PRIMS_JNICHECK_HPP
+#define SHARE_VM_PRIMS_JNICHECK_HPP
+
+#ifndef KERNEL
+#include "runtime/thread.hpp"
+#endif
+
 extern "C" {
   // Report a JNI failure caught by -Xcheck:jni.  Perform a core dump.
   // Note: two variations -- one to be called when in VM state (e.g. when
@@ -50,3 +57,5 @@
   static void validate_call_class(JavaThread* thr, jclass clazz, jmethodID method_id);
   static methodOop validate_jmethod_id(JavaThread* thr, jmethodID method_id);
 };
+
+#endif // SHARE_VM_PRIMS_JNICHECK_HPP