--- a/src/cpu/x86/vm/interp_masm_x86_64.cpp	Wed Jul 22 15:50:08 2015 +0200
+++ b/src/cpu/x86/vm/interp_masm_x86_64.cpp	Wed Jul 22 08:56:03 2015 -0700
@@ -1129,7 +1129,7 @@
     bind(skip_receiver_profile);
 
     // The method data pointer needs to be updated to reflect the new target.
-#ifdef JVMCI
+#if INCLUDE_JVMCI
     if (MethodProfileWidth == 0) {
       update_mdp_by_constant(mdp, in_bytes(VirtualCallData::virtual_call_data_size()));
     }
@@ -1140,7 +1140,7 @@
   }
 }
 
-#ifdef JVMCI
+#if INCLUDE_JVMCI
 void InterpreterMacroAssembler::profile_called_method(Register method, Register mdp, Register reg2) {
   assert_different_registers(method, mdp, reg2);
   if (ProfileInterpreter && MethodProfileWidth > 0) {
@@ -1178,7 +1178,7 @@
     if (is_virtual_call) {
       increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
     }
-#ifdef JVMCI
+#if INCLUDE_JVMCI
     else {
       increment_mdp_data_at(mdp, in_bytes(ReceiverTypeData::nonprofiled_receiver_count_offset()));
     }
@@ -1188,11 +1188,11 @@
     int non_profiled_offset = -1;
     if (use_non_profiled_counter) {
        non_profiled_offset = in_bytes(CounterData::count_offset());
-    #ifdef JVMCI
+#if INCLUDE_JVMCI
       if (!is_virtual_call) {
         non_profiled_offset = in_bytes(ReceiverTypeData::nonprofiled_receiver_count_offset());
       }
-    #endif
+#endif
       assert(non_profiled_offset >= 0, "must be");
     }