--- a/src/share/vm/runtime/vmStructs.cpp	Wed Jul 22 15:50:08 2015 +0200
+++ b/src/share/vm/runtime/vmStructs.cpp	Wed Jul 22 08:56:03 2015 -0700
@@ -70,7 +70,7 @@
 #include "oops/constMethod.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/cpCache.hpp"
-#ifdef JVMCI
+#if INCLUDE_JVMCI
 #include "oops/fieldStreams.hpp"
 #endif
 #include "oops/instanceClassLoaderKlass.hpp"
@@ -106,7 +106,7 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/hashtable.hpp"
 #include "utilities/macros.hpp"
-#ifdef JVMCI
+#if INCLUDE_JVMCI
 # include "jvmci/jvmciRuntime.hpp"
 # include "jvmci/vmStructs_jvmci.hpp"
 #endif
@@ -3048,7 +3048,7 @@
              GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
              GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
 
-#ifdef JVMCI
+#if INCLUDE_JVMCI
    VM_STRUCTS_JVMCI(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                     GENERATE_STATIC_VM_STRUCT_ENTRY)
 #endif
@@ -3097,7 +3097,7 @@
            GENERATE_C2_VM_TYPE_ENTRY,
            GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY)
 
-#ifdef JVMCI
+#if INCLUDE_JVMCI
   VM_TYPES_JVMCI(GENERATE_VM_TYPE_ENTRY,
                  GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
 #endif
@@ -3144,7 +3144,7 @@
                    GENERATE_C2_VM_INT_CONSTANT_ENTRY,
                    GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 
-#ifdef JVMCI
+#if INCLUDE_JVMCI
   VM_INT_CONSTANTS_JVMCI(GENERATE_VM_INT_CONSTANT_ENTRY,
                          GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 
@@ -3496,7 +3496,7 @@
 #endif
 
 
-#ifdef JVMCI
+#if INCLUDE_JVMCI
 // Emit intialization code for HotSpotVMConfig.  It's placed here so
 // it can take advantage of the relaxed access checking enjoyed by
 // VMStructs.