--- a/hotspot/src/share/vm/oops/oop.inline.hpp	Wed May 07 22:06:42 2014 +0200
+++ b/hotspot/src/share/vm/oops/oop.inline.hpp	Tue Apr 29 15:17:27 2014 +0200
@@ -38,7 +38,8 @@
 #include "oops/klass.inline.hpp"
 #include "oops/markOop.inline.hpp"
 #include "oops/oop.hpp"
-#include "runtime/atomic.hpp"
+#include "runtime/atomic.inline.hpp"
+#include "runtime/orderAccess.inline.hpp"
 #include "runtime/os.hpp"
 #include "utilities/macros.hpp"
 #ifdef TARGET_ARCH_x86