diff --git a/include/htool/local_operators/local_dense_matrix.hpp b/include/htool/local_operators/local_dense_matrix.hpp
index 9e8a35bc..23743b0b 100644
--- a/include/htool/local_operators/local_dense_matrix.hpp
+++ b/include/htool/local_operators/local_dense_matrix.hpp
@@ -2,9 +2,9 @@
 #ifndef HTOOL_TESTING_LOCAL_DENSE_MATRIX_HPP
 #define HTOOL_TESTING_LOCAL_DENSE_MATRIX_HPP
 
-#include "../matrix/matrix.hpp"
 #include "../clustering/cluster_node.hpp"
 #include "../hmatrix/interfaces/virtual_generator.hpp"
+#include "../matrix/matrix.hpp"
 #include "local_operator.hpp"
 
 namespace htool {
diff --git a/include/htool/local_operators/local_hmatrix.hpp b/include/htool/local_operators/local_hmatrix.hpp
index e86c80ae..7578373c 100644
--- a/include/htool/local_operators/local_hmatrix.hpp
+++ b/include/htool/local_operators/local_hmatrix.hpp
@@ -2,11 +2,11 @@
 #ifndef HTOOL_TESTING_LOCAL_HMATRIX_HPP
 #define HTOOL_TESTING_LOCAL_HMATRIX_HPP
 
-#include "../matrix/matrix.hpp"
 #include "../clustering/cluster_node.hpp"
 #include "../hmatrix/hmatrix.hpp"
 #include "../hmatrix/interfaces/virtual_generator.hpp"
 #include "../hmatrix/tree_builder/tree_builder.hpp"
+#include "../matrix/matrix.hpp"
 #include "local_operator.hpp"
 
 namespace htool {
diff --git a/include/htool/local_operators/local_operator.hpp b/include/htool/local_operators/local_operator.hpp
index 2138137f..4aa149ec 100644
--- a/include/htool/local_operators/local_operator.hpp
+++ b/include/htool/local_operators/local_operator.hpp
@@ -2,10 +2,10 @@
 #ifndef HTOOL_TESTING_LOCAL_OPERATOR_HPP
 #define HTOOL_TESTING_LOCAL_OPERATOR_HPP
 
-#include "../matrix/matrix.hpp"
 #include "../clustering/cluster_node.hpp"
 #include "../hmatrix/interfaces/virtual_generator.hpp"
 #include "../local_operators/virtual_local_operator.hpp"
+#include "../matrix/matrix.hpp"
 #include "../misc/logger.hpp"
 
 namespace htool {
diff --git a/include/htool/solvers/ddm.hpp b/include/htool/solvers/ddm.hpp
index 6bc95a0e..ba80b45d 100644
--- a/include/htool/solvers/ddm.hpp
+++ b/include/htool/solvers/ddm.hpp
@@ -1,8 +1,8 @@
 #ifndef HTOOL_DDM_HPP
 #define HTOOL_DDM_HPP
 
-#include "../matrix/matrix.hpp"
 #include "../distributed_operator/distributed_operator.hpp"
+#include "../matrix/matrix.hpp"
 #include "../misc/logger.hpp"
 #include "../misc/misc.hpp"
 #include "../wrappers/wrapper_hpddm.hpp"
diff --git a/include/htool/testing/generator_test.hpp b/include/htool/testing/generator_test.hpp
index b52f10b5..cab6d0bb 100644
--- a/include/htool/testing/generator_test.hpp
+++ b/include/htool/testing/generator_test.hpp
@@ -2,9 +2,9 @@
 #ifndef HTOOL_TESTING_GENERATOR_TEST_HPP
 #define HTOOL_TESTING_GENERATOR_TEST_HPP
 
-#include "../matrix/matrix.hpp"
 #include "../clustering/cluster_node.hpp"
 #include "../hmatrix/interfaces/virtual_generator.hpp"
+#include "../matrix/matrix.hpp"
 #include <vector>
 
 namespace htool {