diff --git a/include/phasar/PhasarClang/ClangController.h b/include/phasar/PhasarClang/ClangController.h
index 0de2195f14..969cc72653 100644
--- a/include/phasar/PhasarClang/ClangController.h
+++ b/include/phasar/PhasarClang/ClangController.h
@@ -10,11 +10,9 @@
 #ifndef PHASAR_PHASARCLANG_CLANGCONTROLLER_H_
 #define PHASAR_PHASARCLANG_CLANGCONTROLLER_H_
 
-namespace clang {
-namespace tooling {
+namespace clang::tooling {
 class CommonOptionsParser;
-}
-} // namespace clang
+} // namespace clang::tooling
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h
index d139d45200..59ccbce1cb 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h
+++ b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h
@@ -12,10 +12,10 @@
 
 namespace llvm {
 class Value;
-}
+} // namespace llvm
 
 namespace psr {
-bool isConstant(const llvm::Value *val);
-}
+bool isConstant(const llvm::Value *Val);
+} // namespace psr
 
 #endif
diff --git a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h b/include/phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h
index 6384fdfd03..681b6da5a6 100644
--- a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h
+++ b/include/phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h
@@ -31,7 +31,7 @@
 
 namespace llvm {
 class StructType;
-}
+} // namespace llvm
 
 namespace psr {
 class CachedTypeGraph : public TypeGraph<CachedTypeGraph> {
diff --git a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h b/include/phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h
index 3e649db747..bc5979baa7 100644
--- a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h
+++ b/include/phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h
@@ -31,7 +31,7 @@
 
 namespace llvm {
 class StructType;
-}
+} // namespace llvm
 
 namespace psr {
 class LazyTypeGraph : public TypeGraph<LazyTypeGraph> {
diff --git a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h b/include/phasar/PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h
index feaed18b8a..e6624ca8e5 100644
--- a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h
+++ b/include/phasar/PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h
@@ -23,7 +23,7 @@
 
 namespace llvm {
 class StructType;
-}
+} // namespace llvm
 
 namespace psr {
 template <class ConcreteTypeGraph> class TypeGraph {
diff --git a/include/phasar/Utils/LLVMCXXShorthands.h b/include/phasar/Utils/LLVMCXXShorthands.h
index 8ded7917a7..b4b3449f90 100644
--- a/include/phasar/Utils/LLVMCXXShorthands.h
+++ b/include/phasar/Utils/LLVMCXXShorthands.h
@@ -10,5 +10,6 @@
 
 namespace psr {
 bool isTouchVTableInst(const llvm::StoreInst *Store);
-}
+} // namespace psr
+
 #endif
diff --git a/lib/PhasarLLVM/Utils/BasicBlockOrdering.cpp b/lib/PhasarLLVM/Utils/BasicBlockOrdering.cpp
index 9fdc18bcbe..2db0ed6a6a 100644
--- a/lib/PhasarLLVM/Utils/BasicBlockOrdering.cpp
+++ b/lib/PhasarLLVM/Utils/BasicBlockOrdering.cpp
@@ -38,4 +38,4 @@ bool BasicBlockOrdering::mustComeBefore(const llvm::Instruction *LHS,
   return getDom(LHS->getFunction()).dominates(LHS, RHS);
 }
 
-} // namespace psr
\ No newline at end of file
+} // namespace psr
diff --git a/lib/Utils/LLVMCXXShorthands.cpp b/lib/Utils/LLVMCXXShorthands.cpp
index 7ba86de292..71d0594e49 100644
--- a/lib/Utils/LLVMCXXShorthands.cpp
+++ b/lib/Utils/LLVMCXXShorthands.cpp
@@ -42,4 +42,4 @@ bool isTouchVTableInst(const llvm::StoreInst *Store) {
   } /* end vtable set-up instruction */
   return false;
 }
-} // namespace psr
\ No newline at end of file
+} // namespace psr