diff --git a/src/algorithms.hpp b/src/algorithms.hpp
index b3943c688b33b7a2114f2dc88d2f3d22905d273c..83eeaf8dd7e32f776384d0c47fec5e5d0b43d1a8 100644
--- a/src/algorithms.hpp
+++ b/src/algorithms.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <iostream>
-
 #include <algorithm>
+#include <iostream>
 #include <numeric>
 #include <type_traits>
 #include <vector>
diff --git a/src/fvm.hpp b/src/fvm.hpp
index d4bf2aaa3b139d7e0f51201e8bb522682c4e5fce..644dd48b27f347a53b93f44cef14612cd81605f6 100644
--- a/src/fvm.hpp
+++ b/src/fvm.hpp
@@ -12,9 +12,9 @@
 #include "matrix.hpp"
 #include "mechanism.hpp"
 #include "mechanism_interface.hpp"
-#include "util.hpp"
 #include "segment.hpp"
 #include "stimulus.hpp"
+#include "util.hpp"
 
 #include <Vector.hpp>
 
diff --git a/src/ion.hpp b/src/ion.hpp
index 990eefccc4ddd339623c9e6fad04660a44b8f04a..883658b4b59ab3e605f1ac0f49088329d6bdb33d 100644
--- a/src/ion.hpp
+++ b/src/ion.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Vector.hpp>
+
 #include "indexed_view.hpp"
 
 namespace nest {
diff --git a/src/math.hpp b/src/math.hpp
index 86eccfce67e7f53fe6645b15808c201c88634e19..006a429e06372412c1fa5dd7d84401a4df4e68f4 100644
--- a/src/math.hpp
+++ b/src/math.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <utility>
 #include <cmath>
+#include <utility>
+
 
 namespace nest {
 namespace mc {
diff --git a/src/matrix.hpp b/src/matrix.hpp
index fe6501905ac423641f2517f70cfdb64f37a03234..889a3e514c86921c7876f05be45a960884b81ccd 100644
--- a/src/matrix.hpp
+++ b/src/matrix.hpp
@@ -1,11 +1,10 @@
 #pragma once
 
 #include <type_traits>
+#include <Vector.hpp>
 
 #include "util.hpp"
 
-#include <Vector.hpp>
-
 namespace nest {
 namespace mc {
 
diff --git a/src/mechanism.hpp b/src/mechanism.hpp
index ea69c292e1f5c50efe0fd0e6e7dbf092c32b16fb..5a4873663def934dfd252e89330306b6d21c36b2 100644
--- a/src/mechanism.hpp
+++ b/src/mechanism.hpp
@@ -6,9 +6,9 @@
 #include <string>
 
 #include "indexed_view.hpp"
+#include "ion.hpp"
 #include "parameter_list.hpp"
 #include "util.hpp"
-#include "ion.hpp"
 
 namespace nest {
 namespace mc {
diff --git a/src/segment.hpp b/src/segment.hpp
index decb0cdd88665c421cf159b8d7f49e4f91e03f0f..c6c49b26a946d36fdc969d9473fa07105d30d4af 100644
--- a/src/segment.hpp
+++ b/src/segment.hpp
@@ -1,14 +1,13 @@
 #pragma once
 
 #include <cmath>
-
 #include <vector>
 
+#include "algorithms.hpp"
 #include "compartment.hpp"
 #include "math.hpp"
 #include "parameter_list.hpp"
 #include "point.hpp"
-#include "algorithms.hpp"
 #include "util.hpp"
 
 namespace nest {
diff --git a/src/tree.hpp b/src/tree.hpp
index 72e22e831143f9c71c4e37a87e016edb0791a89c..7d702cc229cf9cab34339c6f7adcc9d200d48608 100644
--- a/src/tree.hpp
+++ b/src/tree.hpp
@@ -1,12 +1,11 @@
 #pragma once
 
 #include <algorithm>
+#include <cassert>
 #include <numeric>
 #include <vector>
-
-#include <cassert>
-
 #include <Vector.hpp>
+
 #include "algorithms.hpp"
 #include "util.hpp"
 
diff --git a/tests/test_point.cpp b/tests/test_point.cpp
index b5bfeb9c1783a6c921ca97f3eb6ae4afd535c311..27b5bf705ee2224f0dd1d12a18824d3b5d170b71 100644
--- a/tests/test_point.cpp
+++ b/tests/test_point.cpp
@@ -1,5 +1,5 @@
-#include <limits>
 #include <cmath>
+#include <limits>
 
 #include "gtest.h"
 
diff --git a/tests/test_tree.cpp b/tests/test_tree.cpp
index d933705513539b77fc16e4cea0cd2522829beac5..334a90cb5357e10d101b9b123e76bd6c9f0622af 100644
--- a/tests/test_tree.cpp
+++ b/tests/test_tree.cpp
@@ -1,8 +1,8 @@
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <json.hpp>
 #include <numeric>
 #include <vector>
-#include <json.hpp>
 
 #include "gtest.h"
 
diff --git a/tests/util.hpp b/tests/util.hpp
index bdc21531219726d998edeb82d22bc48a65714d94..92a9bcb59d7b0abf57acb8131ae9772e72cbdbf8 100644
--- a/tests/util.hpp
+++ b/tests/util.hpp
@@ -1,14 +1,13 @@
+#include <chrono>
+#include <cmath>
 #include <fstream>
+#include <iomanip>
 #include <iostream>
 #include <string>
 #include <vector>
-#include <iomanip>
-#include <chrono>
 
-#include <cmath>
-
-#include <util.hpp>
 #include <json.hpp>
+#include <util.hpp>
 
 // helpful code for running tests
 // a bit messy: refactor when it gets heavier and obvious patterns emerge...