From b7a218ebe303b0ceb012705c50282c28d51b5446 Mon Sep 17 00:00:00 2001
From: Mikael Lund <Mlund@mac.com>
Date: Thu, 11 Apr 2024 08:11:36 +0200
Subject: [PATCH] Header cleanup

---
 src/analysis.h                | 2 +-
 src/aux/eigen_cerealisation.h | 6 ++----
 src/aux/eigensupport.h        | 1 -
 src/celllistimpl.h            | 2 +-
 src/externalpotential.cpp     | 2 +-
 src/faunus.cpp                | 6 +++---
 src/io.h                      | 2 +-
 src/molecule.cpp              | 2 +-
 src/montecarlo.cpp            | 2 +-
 src/move.cpp                  | 4 ++--
 src/penalty.cpp               | 4 ++--
 src/potentials.cpp            | 2 +-
 src/scatter.cpp               | 2 +-
 src/space.cpp                 | 2 +-
 src/speciation.cpp            | 2 +-
 15 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/analysis.h b/src/analysis.h
index 39c036b26..3465f2a3e 100644
--- a/src/analysis.h
+++ b/src/analysis.h
@@ -9,7 +9,7 @@
 #include "aux/timers.h"
 #include "aux/table_2d.h"
 #include "aux/equidistant_table.h"
-#include <aux/sparsehistogram.h>
+#include "aux/sparsehistogram.h"
 #include <Eigen/SparseCore>
 #include <limits>
 #include <memory>
diff --git a/src/aux/eigen_cerealisation.h b/src/aux/eigen_cerealisation.h
index e3dc3c728..80c7f00ff 100644
--- a/src/aux/eigen_cerealisation.h
+++ b/src/aux/eigen_cerealisation.h
@@ -22,10 +22,8 @@
 #ifndef EIGENCEREALISATION_HPP_
 #define EIGENCEREALISATION_HPP_
 
-#include "cereal/cereal.hpp"
-
-#include "Eigen/Core"
-
+#include <cereal/cereal.hpp>
+#include <Eigen/Core>
 #include <cstdint>
 
 /**
diff --git a/src/aux/eigensupport.h b/src/aux/eigensupport.h
index 9ec8d2218..50976fa89 100644
--- a/src/aux/eigensupport.h
+++ b/src/aux/eigensupport.h
@@ -2,7 +2,6 @@
 
 #include <Eigen/Core>
 #include <nlohmann/json.hpp>
-
 #include "aux/eigen_cerealisation.h"
 
 // Eigen<->JSON (de)serialization
diff --git a/src/celllistimpl.h b/src/celllistimpl.h
index be81ca1df..56d109a77 100644
--- a/src/celllistimpl.h
+++ b/src/celllistimpl.h
@@ -19,7 +19,7 @@
 #include <range/v3/view/transform.hpp>
 #include "celllist.h"
 #include "core.h"
-#include "spdlog/spdlog.h"
+#include <spdlog/spdlog.h>
 
 namespace Faunus {
 
diff --git a/src/externalpotential.cpp b/src/externalpotential.cpp
index 0fcc63a0c..3180acb39 100644
--- a/src/externalpotential.cpp
+++ b/src/externalpotential.cpp
@@ -4,7 +4,7 @@
 #include "aux/eigensupport.h"
 #include "functionparser.h"
 #include "space.h"
-#include "spdlog/spdlog.h"
+#include <spdlog/spdlog.h>
 
 namespace Faunus::Energy {
 
diff --git a/src/faunus.cpp b/src/faunus.cpp
index 2437b526f..fc923a94d 100644
--- a/src/faunus.cpp
+++ b/src/faunus.cpp
@@ -1,14 +1,14 @@
 #define DOCTEST_CONFIG_IMPLEMENT
-#include <doctest/doctest.h>
 #include "mpicontroller.h"
 #include "montecarlo.h"
 #include "analysis.h"
 #include "multipole.h"
 #include "docopt.h"
-#include "progress_tracker.h"
-#include "spdlog/spdlog.h"
 #include "move.h"
 #include "actions.h"
+#include <doctest/doctest.h>
+#include <progress_tracker.h>
+#include <spdlog/spdlog.h>
 #include <spdlog/sinks/null_sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
 #include <spdlog/sinks/basic_file_sink.h>
diff --git a/src/io.h b/src/io.h
index eaed8796d..7aec50d13 100644
--- a/src/io.h
+++ b/src/io.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include "particle.h"
-#include "spdlog/spdlog.h"
 #include "units.h"
 #include "group.h"
 #include <fstream>
 #include <type_traits>
 #include <concepts>
 #include <iterator>
+#include <spdlog/spdlog.h>
 #include <range/v3/iterator/operations.hpp>
 #include <range/v3/algorithm/for_each.hpp>
 #include <numeric>
diff --git a/src/molecule.cpp b/src/molecule.cpp
index db506dc81..1a48fd35e 100644
--- a/src/molecule.cpp
+++ b/src/molecule.cpp
@@ -3,9 +3,9 @@
 #include "geometry.h"
 #include "rotate.h"
 #include "bonds.h"
-#include "spdlog/spdlog.h"
 #include "aux/eigensupport.h"
 #include <functional>
+#include <spdlog/spdlog.h>
 #include <range/v3/view/transform.hpp>
 #include <range/v3/view/join.hpp>
 #include <range/v3/view/filter.hpp>
diff --git a/src/montecarlo.cpp b/src/montecarlo.cpp
index 3a34abbff..6a0bd65dd 100644
--- a/src/montecarlo.cpp
+++ b/src/montecarlo.cpp
@@ -2,7 +2,7 @@
 #include "speciation.h"
 #include "energy.h"
 #include "move.h"
-#include "spdlog/spdlog.h"
+#include <spdlog/spdlog.h>
 #include <range/v3/algorithm/for_each.hpp>
 
 namespace Faunus {
diff --git a/src/move.cpp b/src/move.cpp
index 6daa740b4..9a3686a63 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -1,4 +1,3 @@
-#include <doctest/doctest.h>
 #include "core.h"
 #include "move.h"
 #include "speciation.h"
@@ -10,7 +9,8 @@
 #include "regions.h"
 #include "aux/iteratorsupport.h"
 #include "aux/eigensupport.h"
-#include "spdlog/spdlog.h"
+#include <spdlog/spdlog.h>
+#include <doctest/doctest.h>
 #include <range/v3/view/counted.hpp>
 #include <range/v3/algorithm/count.hpp>
 #include <range/v3/algorithm/fold_left.hpp>
diff --git a/src/penalty.cpp b/src/penalty.cpp
index 936d6620a..aa55ee72e 100644
--- a/src/penalty.cpp
+++ b/src/penalty.cpp
@@ -1,6 +1,6 @@
 #include "penalty.h"
 #include "space.h"
-#include "spdlog/spdlog.h"
+#include <spdlog/spdlog.h>
 
 namespace Faunus::Energy {
 
@@ -234,4 +234,4 @@ void PenaltyMPI::averagePenaltyFunctions() {
 }
 
 #endif
-} // namespace Faunus::Energy
\ No newline at end of file
+} // namespace Faunus::Energy
diff --git a/src/potentials.cpp b/src/potentials.cpp
index 5735907a4..68bff8a5e 100644
--- a/src/potentials.cpp
+++ b/src/potentials.cpp
@@ -3,9 +3,9 @@
 #include "units.h"
 #include "auxiliary.h"
 #include "aux/arange.h"
-#include "spdlog/spdlog.h"
 #include "smart_montecarlo.h"
 #include <coulombgalore.h>
+#include <spdlog/spdlog.h>
 
 namespace Faunus::pairpotential {
 
diff --git a/src/scatter.cpp b/src/scatter.cpp
index 3fa8d75c8..175be4dde 100644
--- a/src/scatter.cpp
+++ b/src/scatter.cpp
@@ -3,7 +3,7 @@
 #include "io.h"
 
 //#define ANKERL_NANOBENCH_IMPLEMENT
-#include "nanobench.h"
+#include <nanobench.h>
 
 namespace Faunus::Scatter {
 
diff --git a/src/space.cpp b/src/space.cpp
index 7184ec1a4..4a3067b6c 100644
--- a/src/space.cpp
+++ b/src/space.cpp
@@ -1,7 +1,7 @@
 #include "space.h"
 #include "io.h"
-#include "spdlog/spdlog.h"
 #include "aux/eigensupport.h"
+#include <spdlog/spdlog.h>
 #include <range/v3/algorithm/for_each.hpp>
 #include <range/v3/algorithm/count_if.hpp>
 #include <doctest/doctest.h>
diff --git a/src/speciation.cpp b/src/speciation.cpp
index c86fb28f0..4de308c4c 100644
--- a/src/speciation.cpp
+++ b/src/speciation.cpp
@@ -1,7 +1,7 @@
 #include "bonds.h"
 #include "speciation.h"
 #include "aux/iteratorsupport.h"
-#include "range/v3/range/conversion.hpp"
+#include <range/v3/range/conversion.hpp>
 #include <algorithm>
 #include <range/v3/algorithm/all_of.hpp>
 #include <range/v3/view/take.hpp>