--- a/src/hotspot/share/prims/whitebox.hpp	Fri Mar 16 08:26:53 2018 -0400
+++ b/src/hotspot/share/prims/whitebox.hpp	Fri Mar 16 09:12:13 2018 -0400
@@ -31,7 +31,8 @@
 #include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "oops/symbol.hpp"
-#include "runtime/interfaceSupport.hpp"
+
+#define WB_METHOD_DECLARE(result_type) extern "C" result_type JNICALL
 
 // Unconditionally clear pedantic pending JNI checks
 class ClearPendingJniExcCheck : public StackObj {
@@ -44,30 +45,6 @@
   }
 };
 
-// Entry macro to transition from JNI to VM state.
-
-#define WB_ENTRY(result_type, header) JNI_ENTRY(result_type, header) \
-  ClearPendingJniExcCheck _clearCheck(env);
-
-#define WB_END JNI_END
-#define WB_METHOD_DECLARE(result_type) extern "C" result_type JNICALL
-
-#define CHECK_JNI_EXCEPTION_(env, value)                               \
-  do {                                                                 \
-    JavaThread* THREAD = JavaThread::thread_from_jni_environment(env); \
-    if (HAS_PENDING_EXCEPTION) {                                       \
-      return(value);                                                   \
-    }                                                                  \
-  } while (0)
-
-#define CHECK_JNI_EXCEPTION(env)                                       \
-  do {                                                                 \
-    JavaThread* THREAD = JavaThread::thread_from_jni_environment(env); \
-    if (HAS_PENDING_EXCEPTION) {                                       \
-      return;                                                          \
-    }                                                                  \
-  } while (0)
-
 class CodeBlob;
 class CodeHeap;
 class JavaThread;
@@ -93,6 +70,4 @@
   static bool compile_method(Method* method, int comp_level, int bci, Thread* THREAD);
 };
 
-
-
 #endif // SHARE_VM_PRIMS_WHITEBOX_HPP