diff -r d4f8e348420a -r 9f644073d3a0 hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp
--- a/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp	Sun Aug 21 06:18:09 2016 +0200
+++ b/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp	Sun Aug 21 20:56:37 2016 -0400
@@ -30,7 +30,7 @@
 #include "gc/shared/memset_with_concurrent_readers.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/orderAccess.inline.hpp"
 #include "runtime/thread.inline.hpp"