--- old/src/share/vm/jvmci/vmStructs_compiler_runtime.hpp	2016-11-03 04:05:49.815543476 -0700
+++ new/src/share/vm/jvmci/vmStructs_compiler_runtime.hpp	2016-11-03 04:05:49.729539659 -0700
@@ -24,6 +24,7 @@
 #ifndef SHARE_VM_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
 #define SHARE_VM_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
 
+#if INCLUDE_AOT
 #include "jvmci/compilerRuntime.hpp"
 
 #define VM_ADDRESSES_COMPILER_RUNTIME(declare_address, declare_preprocessor_address, declare_function) \
@@ -34,4 +35,10 @@
   declare_function(CompilerRuntime::invocation_event)                             \
   declare_function(CompilerRuntime::backedge_event)
 
+#else // INCLUDE_AOT
+
+#define VM_ADDRESSES_COMPILER_RUNTIME(declare_address, declare_preprocessor_address, declare_function)
+
+#endif // INCLUDE_AOT
+
 #endif // SHARE_VM_AOT_VMSTRUCTS_COMPILER_RUNTIME_HPP