--- old/src/share/vm/runtime/atomic.hpp	2017-07-17 10:42:58.550128969 +0200
+++ new/src/share/vm/runtime/atomic.hpp	2017-07-17 10:42:58.418128974 +0200
@@ -26,13 +26,9 @@
 #define SHARE_VM_RUNTIME_ATOMIC_HPP
 
 #include "memory/allocation.hpp"
-#include "metaprogramming/conditional.hpp"
-#include "metaprogramming/enableIf.hpp"
 #include "metaprogramming/integerTypes.hpp"
 #include "metaprogramming/isIntegral.hpp"
 #include "metaprogramming/isPointer.hpp"
-#include "metaprogramming/isSame.hpp"
-#include "metaprogramming/removePointer.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
@@ -247,7 +243,7 @@
 template <typename T, typename U>
 inline U* Atomic::add(T add_value, U* volatile* dst) {
   STATIC_ASSERT(IsIntegral<T>::value);
-  typedef typename IntegerTypes::Signed<intptr_t>::type Raw;
+  typedef typename IntegerTypes::Signed<U*>::type Raw;
   ptrdiff_t value = add_value;
   Raw raw_value = IntegerTypes::cast_to_signed(value * sizeof(U));
   Raw result = specialized_add(raw_value, reinterpret_cast<volatile Raw*>(dst));
@@ -266,7 +262,7 @@
   if (sizeof(T) != 1) {
     add(1, src);
   } else {
-    typedef typename IntegerTypes::Signed<intptr_t>::type Raw;
+    typedef typename IntegerTypes::Signed<T*>::type Raw;
     specialized_inc(reinterpret_cast<volatile Raw*>(src));
   }
 }
@@ -283,7 +279,7 @@
   if (sizeof(T) != 1) {
     add(-1, src);
   } else {
-    typedef typename IntegerTypes::Signed<intptr_t>::type Raw;
+    typedef typename IntegerTypes::Signed<T*>::type Raw;
     specialized_dec(reinterpret_cast<volatile Raw*>(src));
   }
 }