diff --git a/bhtree_mpi/src/datastructures/BarnesHutTree.cpp b/bhtree_mpi/src/datastructures/BarnesHutTree.cpp
index 0ad4b48c09d04c71356e107f837238653c1efeae..69bc55e79a340c2c3da25a75095eb6bc317b61b4 100644
--- a/bhtree_mpi/src/datastructures/BarnesHutTree.cpp
+++ b/bhtree_mpi/src/datastructures/BarnesHutTree.cpp
@@ -1,9 +1,10 @@
-#include "BarnesHutTree.hpp"
-#include "Node.hpp"
-#include "Box.hpp"
 #include <iostream>
 #include <limits>
 
+#include "BarnesHutTree.hpp"
+#include "Box.hpp"
+#include "Node.hpp"
+
 namespace nbody {
 	BarnesHutTree::BarnesHutTree(std::size_t parallelId) : Tree(parallelId) {}
 
diff --git a/bhtree_mpi/src/datastructures/Body.cpp b/bhtree_mpi/src/datastructures/Body.cpp
index 8ab72436121baa84a61a045d872c407ae46cf0fb..1d7e2332175a35bff0a0a1fab118e86994984112 100644
--- a/bhtree_mpi/src/datastructures/Body.cpp
+++ b/bhtree_mpi/src/datastructures/Body.cpp
@@ -1,11 +1,12 @@
-#include "Body.hpp"
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <limits>
 #include <algorithm>
 #include <cmath>
-#include <Vec3.hpp>
+#include <fstream>
+#include <iostream>
+#include <limits>
+#include <sstream>
+
+#include "Body.hpp"
+#include "Vec3.hpp"
 
 namespace nbody {
 	Body::Body(const Vec3& position_,
diff --git a/bhtree_mpi/src/datastructures/Body.hpp b/bhtree_mpi/src/datastructures/Body.hpp
index b28c4ae4dc41dc5d974bd64fb4e141bc6f8906a7..81b1e09a577b848b98f19d3b9ea5fb1836e79bfc 100644
--- a/bhtree_mpi/src/datastructures/Body.hpp
+++ b/bhtree_mpi/src/datastructures/Body.hpp
@@ -1,10 +1,11 @@
 #ifndef BODY_HPP
 #define BODY_HPP
 
-#include <vector>
-#include <string>
 #include <array>
-#include <Vec3.hpp>
+#include <string>
+#include <vector>
+
+#include "Vec3.hpp"
 
 namespace nbody {
 	static const double timestep = 1.0;
diff --git a/bhtree_mpi/src/datastructures/Box.cpp b/bhtree_mpi/src/datastructures/Box.cpp
index 24b09a31133f6799d16683d536948b496633c7d9..4daedb10fe01813e20107091305ab3ec97959d7b 100644
--- a/bhtree_mpi/src/datastructures/Box.cpp
+++ b/bhtree_mpi/src/datastructures/Box.cpp
@@ -1,7 +1,8 @@
-#include <iostream>
-#include <cmath>
 #include <algorithm>
+#include <cmath>
 #include <cstdlib>
+#include <iostream>
+
 #include "Box.hpp"
 
 namespace nbody {
diff --git a/bhtree_mpi/src/datastructures/Box.hpp b/bhtree_mpi/src/datastructures/Box.hpp
index d8e8964350a24e0882522d74f99ff4203c488dd7..9794d7450f0f62075a6fc3b415f985c90badb8b9 100644
--- a/bhtree_mpi/src/datastructures/Box.hpp
+++ b/bhtree_mpi/src/datastructures/Box.hpp
@@ -1,11 +1,12 @@
 #ifndef BOX_HPP
 #define BOX_HPP
 
-#include <vector>
 #include <array>
-#include <limits> 
-#include <Body.hpp>
-#include <Vec3.hpp>
+#include <limits>
+#include <vector>
+
+#include "Body.hpp"
+#include "Vec3.hpp"
 
 namespace nbody {
 	struct Box {
diff --git a/bhtree_mpi/src/datastructures/Node.cpp b/bhtree_mpi/src/datastructures/Node.cpp
index bca25e9e4f963acc11b5fb20bc8beda6db40c7ef..de52894eb0e0a1f7177674f4b26b1f107e9bfa73 100644
--- a/bhtree_mpi/src/datastructures/Node.cpp
+++ b/bhtree_mpi/src/datastructures/Node.cpp
@@ -1,8 +1,9 @@
-#include <limits>
+#include <algorithm>
 #include <cmath>
-#include <iostream>
 #include <functional>
-#include <algorithm>
+#include <iostream>
+#include <limits>
+
 #include "Node.hpp"
 #include "Tree.hpp"
 
diff --git a/bhtree_mpi/src/datastructures/Node.hpp b/bhtree_mpi/src/datastructures/Node.hpp
index 7837690fb1245eba22b6d87318ec7ad23fecd61e..bc1e077f60a20ef57a00878a1794a5498bd1c04d 100644
--- a/bhtree_mpi/src/datastructures/Node.hpp
+++ b/bhtree_mpi/src/datastructures/Node.hpp
@@ -1,12 +1,13 @@
 #ifndef TREE_NODE_HPP
 #define TREE_NODE_HPP
 
-#include "Body.hpp"
-#include <iterator>
-#include "Box.hpp"
 #include <cstdlib>
+#include <iterator>
 #include <vector>
 
+#include "Body.hpp"
+#include "Box.hpp"
+
 namespace nbody {
 	class Tree;
 	//class for storing node information
diff --git a/bhtree_mpi/src/datastructures/Tree.cpp b/bhtree_mpi/src/datastructures/Tree.cpp
index 68b464695a4fe48bac9f1a0caf337ceaad7d3c13..03559f194c38bbb8edebd666c5d0e519d369ee15 100644
--- a/bhtree_mpi/src/datastructures/Tree.cpp
+++ b/bhtree_mpi/src/datastructures/Tree.cpp
@@ -1,11 +1,12 @@
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <fstream>
 #include <algorithm>
-#include "Tree.hpp"
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <string>
+
 #include "Node.hpp"
 #include "Simulation.hpp"
+#include "Tree.hpp"
 
 namespace nbody {
 	Tree::Tree(std::size_t _parallelId):
diff --git a/bhtree_mpi/src/datastructures/Tree.hpp b/bhtree_mpi/src/datastructures/Tree.hpp
index eb8c48bfd62615af14dcd6fdcab4e08bb6e12fcf..7c731bc7999f0dfb46a924eb5417a3e51b4d09a4 100644
--- a/bhtree_mpi/src/datastructures/Tree.hpp
+++ b/bhtree_mpi/src/datastructures/Tree.hpp
@@ -1,9 +1,10 @@
 #ifndef TREE_HPP
 #define TREE_HPP
 
-#include <vector>
 #include <cstdlib>
 #include <string>
+#include <vector>
+
 #include "Body.hpp"
 #include "Box.hpp"
 #include "Node.hpp"