diff -r d4f8e348420a -r 9f644073d3a0 hotspot/src/share/vm/prims/unsafe.cpp
--- a/hotspot/src/share/vm/prims/unsafe.cpp	Sun Aug 21 06:18:09 2016 +0200
+++ b/hotspot/src/share/vm/prims/unsafe.cpp	Sun Aug 21 20:56:37 2016 -0400
@@ -32,7 +32,7 @@
 #include "prims/jni.h"
 #include "prims/jvm.h"
 #include "prims/unsafe.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/interfaceSupport.hpp"
 #include "runtime/orderAccess.inline.hpp"