--- old/src/cpu/zero/vm/nativeInst_zero.cpp	2015-04-24 19:04:53.701454726 +0200
+++ new/src/cpu/zero/vm/nativeInst_zero.cpp	2015-04-24 19:04:53.661454726 +0200
@@ -25,8 +25,10 @@
 
 #include "precompiled.hpp"
 #include "assembler_zero.inline.hpp"
+#include "interpreter/cppInterpreter.hpp"
 #include "memory/resourceArea.hpp"
 #include "nativeInst_zero.hpp"
+#include "entry_zero.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.hpp"
 #include "runtime/sharedRuntime.hpp"
--- old/src/share/vm/code/codeCache.cpp	2015-04-24 19:04:53.945454725 +0200
+++ new/src/share/vm/code/codeCache.cpp	2015-04-24 19:04:53.905454725 +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"
--- old/src/share/vm/interpreter/cppInterpreterGenerator.hpp	2015-04-24 19:04:54.197454725 +0200
+++ new/src/share/vm/interpreter/cppInterpreterGenerator.hpp	2015-04-24 19:04:54.157454725 +0200
@@ -30,6 +30,12 @@
 
 #ifdef CC_INTERP
 
+#ifdef ZERO
+#ifdef TARGET_ARCH_zero
+# include "entry_zero.hpp"
+#endif
+#endif
+
 class CppInterpreterGenerator: public AbstractInterpreterGenerator {
   protected:
   // shared code sequences
--- old/src/share/vm/interpreter/interpreterGenerator.hpp	2015-04-24 19:04:54.445454724 +0200
+++ new/src/share/vm/interpreter/interpreterGenerator.hpp	2015-04-24 19:04:54.401454724 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_INTERPRETER_INTERPRETERGENERATOR_HPP
 
 #include "interpreter/cppInterpreter.hpp"
+#include "interpreter/interp_masm.hpp"
 #include "interpreter/cppInterpreterGenerator.hpp"
 #include "interpreter/templateInterpreter.hpp"
 #include "interpreter/templateInterpreterGenerator.hpp"