--- 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());