--- a/hotspot/src/cpu/zero/vm/entry_zero.hpp	Thu Apr 30 04:01:13 2015 -0700
+++ b/hotspot/src/cpu/zero/vm/entry_zero.hpp	Thu Apr 30 09:09:01 2015 +0200
@@ -26,6 +26,8 @@
 #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP
 #define CPU_ZERO_VM_ENTRY_ZERO_HPP
 
+#include "interpreter/cppInterpreter.hpp"
+
 class ZeroEntry {
  public:
   ZeroEntry() {

--- a/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp	Thu Apr 30 04:01:13 2015 -0700
+++ b/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp	Thu Apr 30 09:09:01 2015 +0200
@@ -25,6 +25,8 @@
 
 #include "precompiled.hpp"
 #include "assembler_zero.inline.hpp"
+#include "entry_zero.hpp"
+#include "interpreter/cppInterpreter.hpp"
 #include "memory/resourceArea.hpp"
 #include "nativeInst_zero.hpp"
 #include "oops/oop.inline.hpp"

--- a/hotspot/src/share/vm/code/codeCache.cpp	Thu Apr 30 04:01:13 2015 -0700
+++ b/hotspot/src/share/vm/code/codeCache.cpp	Thu Apr 30 09:09:01 2015 +0200
@@ -41,6 +41,7 @@
 #include "oops/verifyOopClosure.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/deoptimization.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/java.hpp"
 #include "runtime/mutexLocker.hpp"

--- a/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp	Thu Apr 30 04:01:13 2015 -0700
+++ b/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp	Thu Apr 30 09:09:01 2015 +0200
@@ -29,6 +29,10 @@
 // of the template interpreter generator.
 
 #ifdef CC_INTERP
+#ifdef TARGET_ARCH_zero
+# include "entry_zero.hpp"
+# include "interpreter/interp_masm.hpp"
+#endif
 
 class CppInterpreterGenerator: public AbstractInterpreterGenerator {
   protected:

--- a/hotspot/src/share/vm/interpreter/interpreter.hpp	Thu Apr 30 04:01:13 2015 -0700
+++ b/hotspot/src/share/vm/interpreter/interpreter.hpp	Thu Apr 30 09:09:01 2015 +0200
@@ -29,11 +29,9 @@
 #include "interpreter/cppInterpreter.hpp"
 #include "interpreter/templateInterpreter.hpp"
 #include "memory/resourceArea.hpp"
-#ifdef ZERO
 #ifdef TARGET_ARCH_zero
 # include "entry_zero.hpp"
 #endif
-#endif
 
 // This file contains the platform-independent parts
 // of the interpreter and the interpreter generator.

--- a/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp	Thu Apr 30 04:01:13 2015 -0700
+++ b/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp	Thu Apr 30 09:09:01 2015 +0200
@@ -27,6 +27,7 @@
 
 #include "interpreter/cppInterpreter.hpp"
 #include "interpreter/cppInterpreterGenerator.hpp"
+#include "interpreter/interp_masm.hpp"
 #include "interpreter/templateInterpreter.hpp"
 #include "interpreter/templateInterpreterGenerator.hpp"
 

--- a/hotspot/src/share/vm/runtime/frame.hpp	Thu Apr 30 04:01:13 2015 -0700
+++ b/hotspot/src/share/vm/runtime/frame.hpp	Thu Apr 30 09:09:01 2015 +0200
@@ -30,11 +30,9 @@
 #include "runtime/monitorChunk.hpp"
 #include "runtime/registerMap.hpp"
 #include "utilities/top.hpp"
-#ifdef ZERO
 #ifdef TARGET_ARCH_zero
 # include "stack_zero.hpp"
 #endif
-#endif
 
 typedef class BytecodeInterpreter* interpreterState;
 

--- a/hotspot/src/share/vm/runtime/frame.inline.hpp	Thu Apr 30 04:01:13 2015 -0700
+++ b/hotspot/src/share/vm/runtime/frame.inline.hpp	Thu Apr 30 09:09:01 2015 +0200
@@ -31,14 +31,12 @@
 #include "oops/method.hpp"
 #include "runtime/frame.hpp"
 #include "runtime/signature.hpp"
-#ifdef ZERO
 #ifdef TARGET_ARCH_zero
 # include "entryFrame_zero.hpp"
 # include "fakeStubFrame_zero.hpp"
 # include "interpreterFrame_zero.hpp"
 # include "sharkFrame_zero.hpp"
 #endif
-#endif
 
 inline bool frame::is_entry_frame() const {
   return StubRoutines::returns_to_call_stub(pc());

--- a/hotspot/src/share/vm/runtime/thread.hpp	Thu Apr 30 04:01:13 2015 -0700
+++ b/hotspot/src/share/vm/runtime/thread.hpp	Thu Apr 30 09:09:01 2015 +0200
@@ -51,11 +51,9 @@
 #include "gc_implementation/g1/dirtyCardQueue.hpp"
 #include "gc_implementation/g1/satbQueue.hpp"
 #endif // INCLUDE_ALL_GCS
-#ifdef ZERO
 #ifdef TARGET_ARCH_zero
 # include "stack_zero.hpp"
 #endif
-#endif
 
 class ThreadSafepointState;
 class ThreadProfiler;