*** old/src/share/vm/jvmci/vmStructs_compiler_runtime.hpp	Thu Nov  3 04:05:49 2016
--- new/src/share/vm/jvmci/vmStructs_compiler_runtime.hpp	Thu Nov  3 04:05:49 2016

*** 22,37 ****
--- 22,44 ----
   */
  
  #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) \
    declare_function(CompilerRuntime::resolve_string_by_symbol)                     \
    declare_function(CompilerRuntime::resolve_klass_by_symbol)                      \
    declare_function(CompilerRuntime::resolve_method_by_symbol_and_load_counters)   \
    declare_function(CompilerRuntime::initialize_klass_by_symbol)                   \
    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