diff --git a/adapter.hpp b/adapter.hpp
index c5156667..70b6a671 100644
--- a/adapter.hpp
+++ b/adapter.hpp
@@ -17,9 +17,8 @@
 #ifndef __UTIL_ADAPTER_HPP
 #define __UTIL_ADAPTER_HPP
 
-#include <cstdlib>
+#include <cstddef>
 #include <iterator>
-#include <utility>
 #include <tuple>
 
 namespace util { namespace adapter {
diff --git a/alloc/allocator.hpp b/alloc/allocator.hpp
index dd861851..18c160ce 100644
--- a/alloc/allocator.hpp
+++ b/alloc/allocator.hpp
@@ -17,8 +17,7 @@
 #ifndef __UTIL_ALLOC_ALLOCATOR_HPP
 #define __UTIL_ALLOC_ALLOCATOR_HPP
 
-#include <cstdlib>
-#include <utility>
+#include <cstddef>
 
 // C++11 allocator concept conformant allocator adaptor, going from our
 // allocator interface to that of the STL and friends.
@@ -31,8 +30,8 @@ namespace util { namespace alloc {
         template <typename ...Args>
         allocator (Args&& ...args);
 
-        T* allocate (std::size_t count);
-        void deallocate (T*, std::size_t count);
+        T* allocate (size_t count);
+        void deallocate (T*, size_t count);
 
     private:
         B &m_backing;
diff --git a/alloc/allocator.ipp b/alloc/allocator.ipp
index 41e52d82..2cb45793 100644
--- a/alloc/allocator.ipp
+++ b/alloc/allocator.ipp
@@ -21,6 +21,7 @@
 
 #define __UTIL_ALLOC_ALLOCATOR_IPP
 
+#include <utility>
 
 ///////////////////////////////////////////////////////////////////////////////
 template <class B, class T>
diff --git a/alloc/arena.hpp b/alloc/arena.hpp
index c0a3a6f5..737c9cc0 100644
--- a/alloc/arena.hpp
+++ b/alloc/arena.hpp
@@ -17,9 +17,10 @@
 #ifndef __UTIL_ALLOC_ARENA_HPP
 #define __UTIL_ALLOC_ARENA_HPP
 
-#include <memory>
 #include "../memory/deleter.hpp"
 
+#include <memory>
+#include <utility>
 
 namespace util { namespace alloc {
     template <class T>
diff --git a/alloc/linear.hpp b/alloc/linear.hpp
index d8724e86..07e07c3b 100644
--- a/alloc/linear.hpp
+++ b/alloc/linear.hpp
@@ -19,7 +19,6 @@
 
 #include <cstddef>
 
-
 namespace util { namespace alloc {
     // allocate progressively across a buffer without concern for deallocation.
     // deallocation is a noop; the only way to free allocations is via reset.