diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index 7c911349..da5f3125 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -1161,9 +1161,7 @@ void translation_unit_visitor::
         const std::string &type_name, template_parameter &tp, class_ &c)
 {
     auto template_params = cx::util::parse_unexposed_template_params(
-        type_name, [this](const std::string &t) {
-            return t;
-        });
+        type_name, [this](const std::string &t) { return t; });
 
     found_relationships_t relationships;
     for (auto &param : template_params) {
diff --git a/src/common/clang_utils.h b/src/common/clang_utils.h
index 9d842c76..e12d4c85 100644
--- a/src/common/clang_utils.h
+++ b/src/common/clang_utils.h
@@ -22,8 +22,8 @@
 
 #include <clang/AST/RecursiveASTVisitor.h>
 
-#include <string>
 #include <filesystem>
+#include <string>
 
 namespace clang {
 class NamespaceDecl;
diff --git a/src/common/model/diagram_filter.cc b/src/common/model/diagram_filter.cc
index 17473065..6fa3b616 100644
--- a/src/common/model/diagram_filter.cc
+++ b/src/common/model/diagram_filter.cc
@@ -358,7 +358,7 @@ tvl::value_t paths_filter::match(
     }
 
     // Matching source paths doesn't make sens if they are not absolute
-    if(!p.is_absolute())
+    if (!p.is_absolute())
         return {};
 
     auto pp = p.fs_path(root_);
diff --git a/src/include_diagram/generators/plantuml/include_diagram_generator.cc b/src/include_diagram/generators/plantuml/include_diagram_generator.cc
index 5c7e2695..3676031d 100644
--- a/src/include_diagram/generators/plantuml/include_diagram_generator.cc
+++ b/src/include_diagram/generators/plantuml/include_diagram_generator.cc
@@ -63,7 +63,6 @@ void generator::generate_relationships(
 void generator::generate(const source_file &f, std::ostream &ostr) const
 {
 
-
     if (f.type() == common::model::source_file_t::kDirectory) {
         LOG_DBG("Generating directory {}", f.name());
 
@@ -105,10 +104,7 @@ void generator::generate(std::ostream &ostr) const
 
     // Generate files and folders
     util::for_each_if(
-        m_model,
-        [this](const auto &f) {
-            return true;
-        },
+        m_model, [this](const auto &f) { return true; },
         [this, &ostr](const auto &f) {
             generate(dynamic_cast<source_file &>(*f), ostr);
         });
diff --git a/src/include_diagram/model/diagram.cc b/src/include_diagram/model/diagram.cc
index aceb89bb..be0244be 100644
--- a/src/include_diagram/model/diagram.cc
+++ b/src/include_diagram/model/diagram.cc
@@ -43,7 +43,7 @@ common::optional_ref<common::model::diagram_element> diagram::get(
 void diagram::add_file(std::unique_ptr<common::model::source_file> &&f)
 {
     // Don't add the same file more than once
-    if(get_file(f->id()))
+    if (get_file(f->id()))
         return;
 
     LOG_DBG("Adding source file: {}, {}", f->name(), f->fs_path().string());
@@ -63,7 +63,7 @@ void diagram::add_file(std::unique_ptr<common::model::source_file> &&f)
         common::model::filesystem_path parent_path_so_far;
         for (const auto &directory : f->path()) {
             auto source_file_path = parent_path_so_far | directory;
-            if(parent_path_so_far.is_empty())
+            if (parent_path_so_far.is_empty())
                 source_file_path = {directory};
 
             auto dir = std::make_unique<common::model::source_file>(
diff --git a/src/include_diagram/visitor/translation_unit_visitor.h b/src/include_diagram/visitor/translation_unit_visitor.h
index 0b3a65bb..c044353d 100644
--- a/src/include_diagram/visitor/translation_unit_visitor.h
+++ b/src/include_diagram/visitor/translation_unit_visitor.h
@@ -52,14 +52,16 @@ public:
             clang::StringRef relative_path, const clang::Module *imported,
             clang::SrcMgr::CharacteristicKind file_type) override;
 
-        std::optional<common::id_t> process_internal_header(const std::filesystem::path &include_path,
-            bool is_system, const common::id_t current_file_id);
+        std::optional<common::id_t> process_internal_header(
+            const std::filesystem::path &include_path, bool is_system,
+            const common::id_t current_file_id);
 
         std::optional<common::id_t> process_external_system_header(
             const std::filesystem::path &include_path,
             const common::id_t current_file_id);
 
-        std::optional<common::id_t> process_source_file(const std::filesystem::path &file);
+        std::optional<common::id_t> process_source_file(
+            const std::filesystem::path &file);
 
         clanguml::include_diagram::model::diagram &diagram()
         {