--- a/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp	Tue Apr 07 14:19:03 2015 +0200
+++ b/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp	Thu Apr 23 17:42:06 2015 +0200
@@ -27,6 +27,7 @@
 #include "interpreter/interpreterGenerator.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/allocation.inline.hpp"
+#include "oops/oop.inline.hpp"
 #include "prims/methodHandles.hpp"
 
 void MethodHandles::invoke_target(Method* method, TRAPS) {

--- a/hotspot/src/cpu/zero/vm/vm_version_zero.hpp	Tue Apr 07 14:19:03 2015 +0200
+++ b/hotspot/src/cpu/zero/vm/vm_version_zero.hpp	Thu Apr 23 17:42:06 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -34,6 +34,7 @@
   static const char* cpu_features() {
     return "";
   }
+  static void initialize();
 };
 
 #endif // CPU_ZERO_VM_VM_VERSION_ZERO_HPP