diff --git a/include/boost/atomic/detail/base.hpp b/include/boost/atomic/detail/base.hpp
index 3bde0d0..eb105b9 100644
--- a/include/boost/atomic/detail/base.hpp
+++ b/include/boost/atomic/detail/base.hpp
@@ -19,12 +19,6 @@
 #include <boost/atomic/detail/config.hpp>
 #include <boost/atomic/detail/lockpool.hpp>
 
-
-#ifdef __QNX__
-#include <stddef.h>
-#endif
-
-
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
 #endif
@@ -408,7 +402,7 @@ class base_atomic<T *, void *, Size, Sign>
 private:
     typedef base_atomic this_type;
     typedef T * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
     typedef lockpool::scoped_lock guard_type;
 
 protected:
@@ -506,7 +500,7 @@ class base_atomic<void *, void *, Size, Sign>
 {
 private:
     typedef base_atomic this_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
     typedef void * value_type;
     typedef lockpool::scoped_lock guard_type;
 
diff --git a/include/boost/atomic/detail/cas128strong.hpp b/include/boost/atomic/detail/cas128strong.hpp
index 66ef47b..906c13e 100644
--- a/include/boost/atomic/detail/cas128strong.hpp
+++ b/include/boost/atomic/detail/cas128strong.hpp
@@ -12,6 +12,7 @@
 // primitive. It is assumed that 128-bit loads/stores are not
 // atomic, so they are implemented through platform_load128/platform_store128.
 
+#include <string.h>
 #include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/memory_order.hpp>
diff --git a/include/boost/atomic/detail/cas32strong.hpp b/include/boost/atomic/detail/cas32strong.hpp
index a6a0e06..27e7983 100644
--- a/include/boost/atomic/detail/cas32strong.hpp
+++ b/include/boost/atomic/detail/cas32strong.hpp
@@ -12,6 +12,7 @@
 // Build 8-, 16- and 32-bit atomic operations from
 // a platform_cmpxchg32_strong primitive.
 
+#include <string.h>
 #include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/memory_order.hpp>
@@ -436,7 +437,7 @@ class base_atomic<void *, void *, 4, Sign>
 private:
     typedef base_atomic this_type;
     typedef void * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;
@@ -539,7 +540,7 @@ class base_atomic<T *, void *, 4, Sign>
 private:
     typedef base_atomic this_type;
     typedef T * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;
diff --git a/include/boost/atomic/detail/cas32weak.hpp b/include/boost/atomic/detail/cas32weak.hpp
index bc35670..d75215d 100644
--- a/include/boost/atomic/detail/cas32weak.hpp
+++ b/include/boost/atomic/detail/cas32weak.hpp
@@ -9,6 +9,7 @@
 //  Copyright (c) 2013 Tim Blechmann
 
 
+#include <string.h>
 #include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/memory_order.hpp>
@@ -463,7 +464,7 @@ class base_atomic<void *, void *, 4, Sign>
 private:
     typedef base_atomic this_type;
     typedef void * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;
@@ -576,7 +577,7 @@ class base_atomic<T *, void *, 4, Sign>
 private:
     typedef base_atomic this_type;
     typedef T * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;
diff --git a/include/boost/atomic/detail/cas64strong-ptr.hpp b/include/boost/atomic/detail/cas64strong-ptr.hpp
index 49258ef..2f04112 100644
--- a/include/boost/atomic/detail/cas64strong-ptr.hpp
+++ b/include/boost/atomic/detail/cas64strong-ptr.hpp
@@ -17,6 +17,7 @@
 // On these platforms there is no need for 64-bit pointer specializations,
 // since they will never be used.
 
+#include <string.h>
 #include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/memory_order.hpp>
@@ -39,7 +40,7 @@ class base_atomic<void *, void *, 8, Sign>
 private:
     typedef base_atomic this_type;
     typedef void * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;
@@ -142,7 +143,7 @@ class base_atomic<T *, void *, 8, Sign>
 private:
     typedef base_atomic this_type;
     typedef T * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;
diff --git a/include/boost/atomic/detail/cas64strong.hpp b/include/boost/atomic/detail/cas64strong.hpp
index 91c10ef..c283f98 100644
--- a/include/boost/atomic/detail/cas64strong.hpp
+++ b/include/boost/atomic/detail/cas64strong.hpp
@@ -12,6 +12,7 @@
 // primitive. It is assumed that 64-bit loads/stores are not
 // atomic, so they are implemented through platform_load64/platform_store64.
 
+#include <string.h>
 #include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/memory_order.hpp>
diff --git a/include/boost/atomic/detail/gcc-armv6plus.hpp b/include/boost/atomic/detail/gcc-armv6plus.hpp
index 65266b0..7939643 100644
--- a/include/boost/atomic/detail/gcc-armv6plus.hpp
+++ b/include/boost/atomic/detail/gcc-armv6plus.hpp
@@ -10,7 +10,6 @@
 //  Copyright (c) 2013 Tim Blechmann
 //  ARM Code by Phil Endecott, based on other architectures.
 
-#include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/atomic/detail/config.hpp>
 
diff --git a/include/boost/atomic/detail/gcc-atomic.hpp b/include/boost/atomic/detail/gcc-atomic.hpp
index c5901ba..5cd7f8f 100644
--- a/include/boost/atomic/detail/gcc-atomic.hpp
+++ b/include/boost/atomic/detail/gcc-atomic.hpp
@@ -7,6 +7,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
+#include <string.h>
 #include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/atomic/detail/config.hpp>
diff --git a/include/boost/atomic/detail/gcc-cas.hpp b/include/boost/atomic/detail/gcc-cas.hpp
index 5965e65..25626bd 100644
--- a/include/boost/atomic/detail/gcc-cas.hpp
+++ b/include/boost/atomic/detail/gcc-cas.hpp
@@ -11,7 +11,6 @@
 #ifndef BOOST_ATOMIC_DETAIL_GENERIC_CAS_HPP
 #define BOOST_ATOMIC_DETAIL_GENERIC_CAS_HPP
 
-#include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/atomic/detail/config.hpp>
 
diff --git a/include/boost/atomic/detail/gcc-ppc.hpp b/include/boost/atomic/detail/gcc-ppc.hpp
index 9fe43dc..e6735da 100644
--- a/include/boost/atomic/detail/gcc-ppc.hpp
+++ b/include/boost/atomic/detail/gcc-ppc.hpp
@@ -8,6 +8,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
+#include <string.h>
 #include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/atomic/detail/config.hpp>
@@ -1571,7 +1572,7 @@ class base_atomic<void *, void *, 4, Sign>
 {
 private:
     typedef base_atomic this_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
     typedef void * value_type;
 
 protected:
@@ -1745,7 +1746,7 @@ class base_atomic<T *, void *, 4, Sign>
 private:
     typedef base_atomic this_type;
     typedef T * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;
@@ -1921,7 +1922,7 @@ class base_atomic<void *, void *, 8, Sign>
 {
 private:
     typedef base_atomic this_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
     typedef void * value_type;
 
 protected:
@@ -2095,7 +2096,7 @@ class base_atomic<T *, void *, 8, Sign>
 private:
     typedef base_atomic this_type;
     typedef T * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;
diff --git a/include/boost/atomic/detail/gcc-sparcv9.hpp b/include/boost/atomic/detail/gcc-sparcv9.hpp
index d221faf..b3fc7e6 100644
--- a/include/boost/atomic/detail/gcc-sparcv9.hpp
+++ b/include/boost/atomic/detail/gcc-sparcv9.hpp
@@ -8,6 +8,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
+#include <string.h>
 #include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/atomic/detail/config.hpp>
@@ -832,7 +833,7 @@ class base_atomic<void *, void *, 4, Sign>
 {
 private:
     typedef base_atomic this_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
     typedef void * value_type;
 
 protected:
@@ -933,7 +934,7 @@ class base_atomic<T *, void *, 4, Sign>
 private:
     typedef base_atomic this_type;
     typedef T * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;
diff --git a/include/boost/atomic/detail/gcc-x86.hpp b/include/boost/atomic/detail/gcc-x86.hpp
index 9c4ae6a..284478d 100644
--- a/include/boost/atomic/detail/gcc-x86.hpp
+++ b/include/boost/atomic/detail/gcc-x86.hpp
@@ -8,6 +8,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
+#include <string.h>
 #include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/atomic/detail/config.hpp>
@@ -881,7 +882,7 @@ class base_atomic<void *, void *, 4, Sign>
 {
 private:
     typedef base_atomic this_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
     typedef void * value_type;
 
 protected:
@@ -993,7 +994,7 @@ class base_atomic<T *, void *, 4, Sign>
 private:
     typedef base_atomic this_type;
     typedef T * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;
@@ -1114,7 +1115,7 @@ class base_atomic<void *, void *, 8, Sign>
 {
 private:
     typedef base_atomic this_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
     typedef void * value_type;
 
 protected:
@@ -1226,7 +1227,7 @@ class base_atomic<T *, void *, 8, Sign>
 private:
     typedef base_atomic this_type;
     typedef T * value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;
diff --git a/include/boost/atomic/detail/windows.hpp b/include/boost/atomic/detail/windows.hpp
index 4856b7e..03e37c7 100644
--- a/include/boost/atomic/detail/windows.hpp
+++ b/include/boost/atomic/detail/windows.hpp
@@ -9,6 +9,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
+#include <string.h>
 #include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/type_traits/make_signed.hpp>
@@ -749,7 +750,7 @@ class base_atomic<void*, void*, sizeof_pointer, Sign>
 {
 private:
     typedef base_atomic this_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
     typedef void* value_type;
 
 protected:
@@ -844,7 +845,7 @@ class base_atomic<T*, void*, sizeof_pointer, Sign>
 private:
     typedef base_atomic this_type;
     typedef T* value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
 
 protected:
     typedef value_type value_arg_type;