diff --git a/include/gp/allocator/aggregator.hpp b/include/gp/allocator/aggregator.hpp
index 3398046..ee59e5e 100644
--- a/include/gp/allocator/aggregator.hpp
+++ b/include/gp/allocator/aggregator.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <stddef.h>
 #include "gp/ring_list.hpp"
 
+#include <stddef.h>
+
 namespace gp {
 	class aggregator {
 		struct virtual_allocator
diff --git a/include/gp/allocator/arena.hpp b/include/gp/allocator/arena.hpp
index d7aa4e8..f15a811 100644
--- a/include/gp/allocator/arena.hpp
+++ b/include/gp/allocator/arena.hpp
@@ -1,10 +1,12 @@
 #pragma once
 #include "gp_config.hpp"
+
+#include "gp/algorithm/min_max.hpp"
+#include "gp/algorithm/tmp_manip.hpp"
 #include "gp/buffer.hpp"
-#include <type_traits>
-#include <gp/algorithm/tmp_manip.hpp>
 #include "gp/math/integer_math.hpp"
-#include "gp/algorithm/min_max.hpp"
+
+#include <type_traits>
 
 namespace gp {
 	template<typename page_allocator = int>
diff --git a/include/gp/allocator/buddy.hpp b/include/gp/allocator/buddy.hpp
index 67c83a1..c023822 100644
--- a/include/gp/allocator/buddy.hpp
+++ b/include/gp/allocator/buddy.hpp
@@ -1,12 +1,14 @@
 #pragma once
 #include "gp_config.hpp"
-#include "gp/buffer.hpp"
+
+#include "gp/algorithm/modifiers.hpp"
+#include "gp/algorithm/tmp_manip.hpp"
+#include "gp/allocator/dummy.hpp"
 #include "gp/array.hpp"
+#include "gp/buffer.hpp"
 #include "gp/math/integer_math.hpp"
+
 #include <type_traits>
-#include <gp/algorithm/tmp_manip.hpp>
-#include <gp/algorithm/modifiers.hpp>
-#include <gp/allocator/dummy.hpp>
 
 
 namespace gp{
diff --git a/include/gp/array.hpp b/include/gp/array.hpp
index 25b6459..8942ead 100644
--- a/include/gp/array.hpp
+++ b/include/gp/array.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <initializer_list>
 #include <gp/buffer.hpp>
 
+#include <initializer_list>
+
 namespace gp{
 	template<typename T, std::size_t sz>
 	class array{
diff --git a/include/gp/bitops.hpp b/include/gp/bitops.hpp
index ca09da6..ade6776 100644
--- a/include/gp/bitops.hpp
+++ b/include/gp/bitops.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 namespace gp{
 	namespace _impl{
diff --git a/include/gp/bloomfilter.hpp b/include/gp/bloomfilter.hpp
index 1dc3460..1646917 100644
--- a/include/gp/bloomfilter.hpp
+++ b/include/gp/bloomfilter.hpp
@@ -1,9 +1,10 @@
 #pragma once
-#include <stdint.h>
-#include <atomic>
-#include <gp/array.hpp>
 #include <gp/algorithm/tmp_manip.hpp>
+#include <gp/array.hpp>
 
+#include <atomic>
+
+#include <stdint.h>
 
 namespace gp {
 	template<typename hash_type = uint64_t, uint8_t magnitude = 19, bool threading = false>
diff --git a/include/gp/buffer.hpp b/include/gp/buffer.hpp
index 44143b2..0505618 100644
--- a/include/gp/buffer.hpp
+++ b/include/gp/buffer.hpp
@@ -1,11 +1,12 @@
 #pragma once
-#include <cstddef>
-#include <cstdint>
-#include <gp/optional.hpp>
-#include <gp/iterator.hpp>
+#include <gp/algorithm/move.hpp>
 #include <gp/function.hpp>
 #include <gp/exception.hpp>
-#include <gp/algorithm/move.hpp>
+#include <gp/iterator.hpp>
+#include <gp/optional.hpp>
+
+#include <cstddef>
+#include <cstdint>
 
 namespace gp{
 
diff --git a/include/gp/flat_tree.hpp b/include/gp/flat_tree.hpp
index d5b5dd0..bb94d23 100644
--- a/include/gp/flat_tree.hpp
+++ b/include/gp/flat_tree.hpp
@@ -1,7 +1,7 @@
 #pragma one
 #include <gp/array.hpp>
-#include <gp/iterator.hpp>
 #include <gp/integer_math.hpp>
+#include <gp/iterator.hpp>
 // UNIMPLEMENTED: see filename
 
 template<typename T, size_t depth>
diff --git a/include/gp/function.hpp b/include/gp/function.hpp
index 25401c6..bb2f017 100644
--- a/include/gp/function.hpp
+++ b/include/gp/function.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include "gp/exception.hpp"
-#include "gp/algorithm/tmp_manip.hpp"
-#include "gp/algorithm/move.hpp"
 #include "gp/algorithm/modifiers.hpp"
+#include "gp/algorithm/move.hpp"
+#include "gp/algorithm/tmp_manip.hpp"
 
 namespace gp{
 	template <typename fn, typename allocator, bool copy_allocator = false>
diff --git a/include/gp/indexed_array.hpp b/include/gp/indexed_array.hpp
index fcf5a71..ab177b1 100644
--- a/include/gp/indexed_array.hpp
+++ b/include/gp/indexed_array.hpp
@@ -1,9 +1,11 @@
 #pragma once
-#include <stddef.h>
 #include "gp_config.hpp"
+
 #include "gp/algorithm/move.hpp"
-#include "gp/iterator.hpp"
 #include "gp/array.hpp"
+#include "gp/iterator.hpp"
+
+#include <stddef.h>
 
 namespace gp{
 	template<typename T, size_t _capacity>
diff --git a/include/gp/math.hpp b/include/gp/math.hpp
index 9d5661e..be3dc02 100644
--- a/include/gp/math.hpp
+++ b/include/gp/math.hpp
@@ -1,12 +1,13 @@
 #pragma once
 #include "gp_config.hpp"
+
+#include "gp/algorithm/min_max.hpp"
+#include "gp/algorithm/repeat.hpp"
 #include "gp/math/integer_math.hpp"
-#include "gp/math/q_math.hpp"
 #if !defined(NO_FP_MATH)
 #	include "gp/math/fp_math.hpp"
 #endif
-#include "gp/algorithm/repeat.hpp"
-#include "gp/algorithm/min_max.hpp"
+#include "gp/math/q_math.hpp"
 
 namespace gp {
 	template<typename T>
diff --git a/include/gp/math/fp_math.hpp b/include/gp/math/fp_math.hpp
index 6d10a1d..4b419c6 100644
--- a/include/gp/math/fp_math.hpp
+++ b/include/gp/math/fp_math.hpp
@@ -1,8 +1,10 @@
 #pragma once
+#include "gp/algorithm/repeat.hpp"
+
+#include <limits>
+
 #include <stddef.h>
 #include <stdint.h>
-#include <limits>
-#include "gp/algorithm/repeat.hpp"
 
 namespace gp{
 
diff --git a/include/gp/memory.hpp b/include/gp/memory.hpp
index 793b2e3..67b6188 100644
--- a/include/gp/memory.hpp
+++ b/include/gp/memory.hpp
@@ -1,6 +1,8 @@
 #pragma once
 #include "gp_config.hpp"
+
 #include "gp/exception.hpp"
+
 #include <type_traits>
 // XXX: THIS FILE SHOULD BE REMOVED, AS SHOULD ALL DEPENDENCIES ON THE C-ALLOCATOR AS IS
 
diff --git a/include/gp/optional.hpp b/include/gp/optional.hpp
index 019049a..6aed83d 100644
--- a/include/gp/optional.hpp
+++ b/include/gp/optional.hpp
@@ -1,9 +1,11 @@
 #pragma once
-#include <type_traits>
 #include "gp_config.hpp"
-#include "gp/exception.hpp"
-#include "gp/algorithm/move.hpp"
+
 #include "gp/algorithm/modifiers.hpp"
+#include "gp/algorithm/move.hpp"
+#include "gp/exception.hpp"
+
+#include <type_traits>
 
 namespace gp{
 	struct nullopt_t{};
diff --git a/include/gp/quotient_filter.hpp b/include/gp/quotient_filter.hpp
index 14040ba..b4d07b3 100644
--- a/include/gp/quotient_filter.hpp
+++ b/include/gp/quotient_filter.hpp
@@ -1,10 +1,11 @@
 #pragma once
-#include <stdint.h>
-#include <atomic>
-#include <gp/array.hpp>
 #include <gp/algorithm/tmp_manip.hpp>
+#include <gp/array.hpp>
 #include <gp/exception.hpp>
 
+#include <atomic>
+
+#include <stdint.h>
 
 namespace gp {
 
diff --git a/include/gp/rendering/bmp_viewport.hpp b/include/gp/rendering/bmp_viewport.hpp
index b272dcd..c5736e6 100644
--- a/include/gp/rendering/bmp_viewport.hpp
+++ b/include/gp/rendering/bmp_viewport.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include "gp/function.hpp"
+#include "gp/algorithm/tmp_manip.hpp"
+#include "gp/bitops.hpp"
 #include "gp/buffer.hpp"
+#include "gp/function.hpp"
 #include "gp/math.hpp"
-#include "gp/bitops.hpp"
-#include "gp/algorithm/tmp_manip.hpp"
 
 
 #include <iostream>
diff --git a/include/gp/rendering/renderer.hpp b/include/gp/rendering/renderer.hpp
index 9a43d61..f9186a1 100644
--- a/include/gp/rendering/renderer.hpp
+++ b/include/gp/rendering/renderer.hpp
@@ -1,10 +1,11 @@
 #pragma once
 #include "gp_config.hpp"
-#include "gp/math.hpp"
-#include "gp/function.hpp"
+
 #include "gp/algorithm/min_of.hpp"
-#include "gp/indexed_array.hpp"
 #include "gp/allocator/buddy.hpp"
+#include "gp/function.hpp"
+#include "gp/indexed_array.hpp"
+#include "gp/math.hpp"
 
 using vec2 = gp::vec2_g<>;
 using vec3 = gp::vec3_g<>;
diff --git a/include/gp/ring_list.hpp b/include/gp/ring_list.hpp
index 2a60551..20f5c8e 100644
--- a/include/gp/ring_list.hpp
+++ b/include/gp/ring_list.hpp
@@ -1,9 +1,11 @@
 #pragma once
-#include <stddef.h>
-#include "gp/algorithm/tmp_manip.hpp"
-#include "gp/algorithm/modifiers.hpp"
 #include "gp_config.hpp"
 
+#include "gp/algorithm/modifiers.hpp"
+#include "gp/algorithm/tmp_manip.hpp"
+
+#include <stddef.h>
+
 namespace gp {
 	template<typename T, typename allocator, bool copy_allocator = false, bool may_contain_self = false>
 	class ring_list{
diff --git a/include/gp/subtree_iterator.hpp b/include/gp/subtree_iterator.hpp
index c36bf72..011a4aa 100644
--- a/include/gp/subtree_iterator.hpp
+++ b/include/gp/subtree_iterator.hpp
@@ -1,7 +1,8 @@
 #pragma once
+#include <gp/buffer.hpp>
+
 #include <stddef.h>
 #include <stdint.h>
-#include <gp/buffer.hpp>
 // UNIMPLEMENTED: see filename
 
 template<typename T>
diff --git a/include/gp/variant.hpp b/include/gp/variant.hpp
index 8b15df4..ea2a5f0 100644
--- a/include/gp/variant.hpp
+++ b/include/gp/variant.hpp
@@ -1,12 +1,14 @@
 #pragma once
-#include <gp/algorithm/tmp_manip.hpp>
-#include <type_traits>
-#include <new>
 #include "gp_config.hpp"
-#include "gp/exception.hpp"
+
+#include <gp/algorithm/tmp_manip.hpp>
 #include "gp/allocator/dummy.hpp"
-#include "gp/memory.hpp"
+#include "gp/exception.hpp"
 #include "gp/function.hpp"
+#include "gp/memory.hpp"
+
+#include <type_traits>
+#include <new>
 
 
 namespace gp{
diff --git a/include/gp/vfs/channel_fs.hpp b/include/gp/vfs/channel_fs.hpp
index 57d61b2..4560315 100644
--- a/include/gp/vfs/channel_fs.hpp
+++ b/include/gp/vfs/channel_fs.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "gp/array.hpp"
 #include "gp/algorithm/move.hpp"
-#include "gp/vfs/fs_types.hpp"
 #include "gp/allocator/aggregator.hpp"
+#include "gp/array.hpp"
+#include "gp/vfs/fs_types.hpp"
 
 namespace gp {
 	template<typename error_function, typename pop_function>
diff --git a/include/gp/vfs/fs_types.hpp b/include/gp/vfs/fs_types.hpp
index 5e80ffc..f6a51c4 100644
--- a/include/gp/vfs/fs_types.hpp
+++ b/include/gp/vfs/fs_types.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include "gp_config.hpp"
+
 #include "gp/buffer.hpp"
 #include "gp/variant.hpp"
 
diff --git a/include/gp/vfs/vfs.hpp b/include/gp/vfs/vfs.hpp
index dcec328..75f4d25 100644
--- a/include/gp/vfs/vfs.hpp
+++ b/include/gp/vfs/vfs.hpp
@@ -1,11 +1,13 @@
 #pragma once
-#include <stddef.h>
 #include "gp_config.hpp"
-#include "gp/variant.hpp"
-#include "gp/optional.hpp"
+
+#include "gp/allocator/aggregator.hpp"
 #include "gp/buffer.hpp"
+#include "gp/optional.hpp"
+#include "gp/variant.hpp"
 #include "gp/vfs/fs_types.hpp"
-#include "gp/allocator/aggregator.hpp"
+
+#include <stddef.h>
 
 namespace gp {
 	class vfs {
diff --git a/include/gp_config.hpp b/include/gp_config.hpp
index 54cb9fb..9dbba8c 100644
--- a/include/gp_config.hpp
+++ b/include/gp_config.hpp
@@ -1,8 +1,9 @@
 #pragma once
-#include <cstdint>
+#include <type_traits>
+
 #include <cstddef>
+#include <cstdint>
 #include <cstdlib>
-#include <type_traits>
 
 #ifdef GP_TESTS
 	class static_mapper;
diff --git a/tests.cpp b/tests.cpp
index 6dc39a5..e2bd564 100644
--- a/tests.cpp
+++ b/tests.cpp
@@ -1,13 +1,13 @@
 #include "gp_config.hpp"
 
-#include "test_scaffold.h"
 #include "allocator.hpp"
-#include "meta_test.cpp"
-#include "gp_test.cpp"
 #include "bloomfilter.cpp"
-#include "quotient_filter.cpp"
+#include "gp_test.cpp"
 #include "math.cpp"
+#include "meta_test.cpp"
 #include "pair_test.cpp"
+#include "quotient_filter.cpp"
+#include "test_scaffold.h"
 
 #include <iostream>
 
diff --git a/tests/bloomfilter.cpp b/tests/bloomfilter.cpp
index 0c8d289..66f0284 100644
--- a/tests/bloomfilter.cpp
+++ b/tests/bloomfilter.cpp
@@ -1,9 +1,10 @@
+#include "gp/algorithm/repeat.hpp"
+#include "gp/bloomfilter.hpp"
 #include "test_scaffold.h"
+
 #include <random>
 #include <string>
 
-#include "gp/bloomfilter.hpp"
-#include "gp/algorithm/repeat.hpp"
 
 typedef std::mt19937_64 cheap_rand;
 typedef std::mt19937_64 cheap_rand_bis;
diff --git a/tests/gp_test.cpp b/tests/gp_test.cpp
index a6de2f0..b50a6fb 100644
--- a/tests/gp_test.cpp
+++ b/tests/gp_test.cpp
@@ -1,28 +1,27 @@
-#include "test_scaffold.h"
 #include "allocator.hpp"
-#include "gp/array.hpp"
-#include "gp/indexed_array.hpp"
+#include "gp/algorithm/repeat.hpp"
+#include "gp/algorithm/rotate.hpp"
+#include "gp/algorithm/move.hpp"
 #include "gp/allocator/aggregator.hpp"
 #include "gp/allocator/arena.hpp"
 #include "gp/allocator/buddy.hpp"
 #include "gp/allocator/dummy.hpp"
-#include "gp/algorithm/repeat.hpp"
-#include "gp/algorithm/rotate.hpp"
-#include "gp/algorithm/move.hpp"
-#include "gp/ring_list.hpp"
+#include "gp/array.hpp"
 #include "gp/bitops.hpp"
-#include <thread>
-#include <chrono>
-#include <set>
-#include <stack>
-#include <numeric>
+#include "gp/indexed_array.hpp"
+#include "gp/ring_list.hpp"
+#include "test_scaffold.h"
+
+#include <algorithm>
 #include <chrono>
-#include <random>
+#include <fstream> 
 #include <iomanip>
 #include <iostream>
-#include <fstream> 
-#include <algorithm>
-#include "gp/vfs/vfs.hpp"
+#include <numeric>
+#include <random>
+#include <set>
+#include <stack>
+#include <thread>
 
 
 
diff --git a/tests/math.cpp b/tests/math.cpp
index ab3175d..150eaa9 100644
--- a/tests/math.cpp
+++ b/tests/math.cpp
@@ -3,11 +3,12 @@
 #include "gp/math.hpp"
 #include "gp/rendering/renderer.hpp"
 #include "gp/rendering/bmp_viewport.hpp"
+
+#include <chrono>
 #include <cmath>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <chrono>
 
 
 struct sin_test : public test_scaffold {
diff --git a/tests/pair_test.cpp b/tests/pair_test.cpp
index 5548488..45d30d4 100644
--- a/tests/pair_test.cpp
+++ b/tests/pair_test.cpp
@@ -1,7 +1,8 @@
+#include "gp/pair.hpp"
 #include "test_scaffold.h"
+
 #include <random>
 #include <string>
-#include "gp/pair.hpp"
 
 typedef std::mt19937_64 cheap_rand;
 
diff --git a/tests/quotient_filter.cpp b/tests/quotient_filter.cpp
index e90a4c0..fd0ea09 100644
--- a/tests/quotient_filter.cpp
+++ b/tests/quotient_filter.cpp
@@ -1,9 +1,9 @@
+#include "gp/quotient_filter.hpp"
 #include "test_scaffold.h"
+
 #include <random>
 #include <string>
 
-#include "gp/quotient_filter.hpp"
-
 typedef std::mt19937_64 cheap_rand;
 typedef std::mt19937_64 cheap_rand_bis;
 
diff --git a/tests/test_scaffold.h b/tests/test_scaffold.h
index 1fc68ef..db75d4e 100644
--- a/tests/test_scaffold.h
+++ b/tests/test_scaffold.h
@@ -1,8 +1,8 @@
 #pragma once
+#include <chrono>
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
-#include <chrono>
 
 #ifndef NO_BENCH
 #define NO_BENCH 1