diff --git a/include/phasar/DataFlow/IfdsIde/GenericFlowFunction.h b/include/phasar/DataFlow/IfdsIde/GenericFlowFunction.h
index d49fc8859..d124e8a01 100644
--- a/include/phasar/DataFlow/IfdsIde/GenericFlowFunction.h
+++ b/include/phasar/DataFlow/IfdsIde/GenericFlowFunction.h
@@ -1,12 +1,3 @@
-/******************************************************************************
- * Copyright (c) 2023 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel and others
- *****************************************************************************/
-
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_GENERICFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_GENERICFLOWFUNCTION_H
 
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h b/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h
index fe2c8f753..7d357a0a0 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_COMPRESSOR_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_COMPRESSOR_H
 
 #include "phasar/DB/ProjectIRDBBase.h"
 #include "phasar/Utils/ByRef.h"
@@ -186,3 +187,5 @@ struct ValCompressorTraits<T, std::enable_if_t<CanEfficientlyPassByValue<T>>> {
 };
 
 } // namespace psr
+
+#endif // PHASAR_DATAFLOW_IFDSIDE_SOLVER_COMPRESSOR_H
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/ESGEdgeKind.h b/include/phasar/DataFlow/IfdsIde/Solver/ESGEdgeKind.h
index 94b98ed89..9beaa0d63 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/ESGEdgeKind.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/ESGEdgeKind.h
@@ -1,3 +1,6 @@
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_ESGEDGEKIND_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_ESGEDGEKIND_H
+
 /******************************************************************************
  * Copyright (c) 2022 Philipp Schubert.
  * All rights reserved. This program and the accompanying materials are made
@@ -7,9 +10,6 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_ESGEDGEKIND_H
-#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_ESGEDGEKIND_H
-
 namespace psr {
 enum class ESGEdgeKind { Normal, Call, CallToRet, SkipUnknownFn, Ret, Summary };
 
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCache.h b/include/phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCache.h
index c59f2d81f..dbcd46561 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCache.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCache.h
@@ -1,14 +1,5 @@
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_EDGEFUNCTIONCACHE_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_EDGEFUNCTIONCACHE_H
-
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel
- *****************************************************************************/
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_EDGEFUNCTIONCACHE_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_EDGEFUNCTIONCACHE_H
 
 #include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
 #include "phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCacheStats.h"
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCacheStats.h b/include/phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCacheStats.h
index 437f5151a..a91950460 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCacheStats.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCacheStats.h
@@ -1,14 +1,5 @@
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_EDGEFUNCTIONCACHESTATS_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_EDGEFUNCTIONCACHESTATS_H
-
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel
- *****************************************************************************/
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_EDGEFUNCTIONCACHESTATS_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_EDGEFUNCTIONCACHESTATS_H
 
 #include <cstddef>
 
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheNG.h b/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheNG.h
index 3206ef7b2..1c5b77c21 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheNG.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheNG.h
@@ -1,13 +1,5 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_FLOWEDGEFUNCTIONCACHENG_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_FLOWEDGEFUNCTIONCACHENG_H
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_FLOWEDGEFUNCTIONCACHENG_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_FLOWEDGEFUNCTIONCACHENG_H
 
 #include "phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCache.h"
 #include "phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheStats.h"
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheStats.h b/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheStats.h
index 1550a9bdf..b88aa4679 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheStats.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheStats.h
@@ -1,14 +1,5 @@
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_FLOWEDGEFUNCTIONCACHESTATS_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_FLOWEDGEFUNCTIONCACHESTATS_H
-
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel
- *****************************************************************************/
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_FLOWEDGEFUNCTIONCACHESTATS_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_FLOWEDGEFUNCTIONCACHESTATS_H
 
 #include "phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCacheStats.h"
 #include "phasar/DataFlow/IfdsIde/Solver/FlowFunctionCacheStats.h"
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCache.h b/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCache.h
index d5fc7cdf4..a0f42d821 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCache.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCache.h
@@ -1,14 +1,5 @@
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_FLOWFUNCTIONCACHE_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_FLOWFUNCTIONCACHE_H
-
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel
- *****************************************************************************/
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_FLOWFUNCTIONCACHE_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_FLOWFUNCTIONCACHE_H
 
 #include "phasar/DataFlow/IfdsIde/GenericFlowFunction.h"
 #include "phasar/DataFlow/IfdsIde/Solver/FlowFunctionCacheStats.h"
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCacheStats.h b/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCacheStats.h
index 423ecd7da..049af06a0 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCacheStats.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCacheStats.h
@@ -1,14 +1,5 @@
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_FLOWFUNCTIONCACHESTATS_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_FLOWFUNCTIONCACHESTATS_H
-
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel
- *****************************************************************************/
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_FLOWFUNCTIONCACHESTATS_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_FLOWFUNCTIONCACHESTATS_H
 
 #include <cstddef>
 
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/GenericSolverResults.h b/include/phasar/DataFlow/IfdsIde/Solver/GenericSolverResults.h
index 280d9571f..744c8e7e3 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/GenericSolverResults.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/GenericSolverResults.h
@@ -1,14 +1,5 @@
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel and others
- *****************************************************************************/
-
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_GENERICSOLVERRESULTS_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_GENERICSOLVERRESULTS_H
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_GENERICSOLVERRESULTS_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_GENERICSOLVERRESULTS_H
 
 #include "phasar/Domain/BinaryDomain.h"
 #include "phasar/Utils/ByRef.h"
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/IdBasedSolverResults.h b/include/phasar/DataFlow/IfdsIde/Solver/IdBasedSolverResults.h
index d9d31fbd9..0ca1e8f25 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/IdBasedSolverResults.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/IdBasedSolverResults.h
@@ -1,14 +1,5 @@
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel and others
- *****************************************************************************/
-
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_IDBASEDSOLVERRESULTS_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_IDBASEDSOLVERRESULTS_H
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_IDBASEDSOLVERRESULTS_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_IDBASEDSOLVERRESULTS_H
 
 #include "phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverResults.h"
 #include "phasar/Utils/ByRef.h"
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h
index 9ca4cd1fc..bab1509d0 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h
@@ -1,14 +1,5 @@
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_ITERATIVEIDESOLVER_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_ITERATIVEIDESOLVER_H
-
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel
- *****************************************************************************/
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_ITERATIVEIDESOLVER_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_ITERATIVEIDESOLVER_H
 
 #include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
 #include "phasar/DataFlow/IfdsIde/Solver/Compressor.h"
@@ -53,6 +44,14 @@
 
 namespace psr {
 
+/// Solves the given IDETabulationProblem as described in the 1996 paper by
+/// Sagiv, Horwitz and Reps. To solve the problem, call solve().
+///
+/// This solver implements the optimizations and the $JF_N$ layout from the
+/// paper "Scaling Interprocedural Static Data-Flow Analysis to Large C/C++
+/// Applications: An Experience Report"
+/// (https://doi.org/10.4230/LIPIcs.ECOOP.2024.36) by Schiebel, Sattler,
+/// Schubert, Apel, and Bodden.
 template <typename ProblemTy,
           typename StaticSolverConfigTy = DefaultIDESolverConfig<ProblemTy>>
 class IterativeIDESolver
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverBase.h b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverBase.h
index 4454a0830..9dfa44edf 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverBase.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverBase.h
@@ -1,14 +1,5 @@
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_ITERATIVEIDESOLVERBASE_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_ITERATIVEIDESOLVERBASE_H
-
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel
- *****************************************************************************/
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_ITERATIVEIDESOLVERBASE_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_ITERATIVEIDESOLVERBASE_H
 
 #include "phasar/Utils/ByRef.h"
 #include "phasar/Utils/EmptyBaseOptimizationUtils.h"
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverResults.h b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverResults.h
index 33c1d7f09..28ba33542 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverResults.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverResults.h
@@ -1,14 +1,5 @@
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_ITERATIVEIDESOLVERRESULTS_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_ITERATIVEIDESOLVERRESULTS_H
-
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel
- *****************************************************************************/
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_ITERATIVEIDESOLVERRESULTS_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_ITERATIVEIDESOLVERRESULTS_H
 
 #include "phasar/DataFlow/IfdsIde/Solver/Compressor.h"
 #include "phasar/Domain/BinaryDomain.h"
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverStats.h b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverStats.h
index d2b618182..4c705ea74 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverStats.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverStats.h
@@ -1,14 +1,5 @@
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_ITERATIVEIDESOLVERSTATS_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_ITERATIVEIDESOLVERSTATS_H
-
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel
- *****************************************************************************/
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_ITERATIVEIDESOLVERSTATS_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_ITERATIVEIDESOLVERSTATS_H
 
 #include "phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheStats.h"
 
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/StaticIDESolverConfig.h b/include/phasar/DataFlow/IfdsIde/Solver/StaticIDESolverConfig.h
index 758a06248..1dc231652 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/StaticIDESolverConfig.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/StaticIDESolverConfig.h
@@ -1,14 +1,5 @@
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_STATICIDESOLVERCONFIG_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_STATICIDESOLVERCONFIG_H
-
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel
- *****************************************************************************/
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_STATICIDESOLVERCONFIG_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_STATICIDESOLVERCONFIG_H
 
 #include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
 #include "phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheNG.h"
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/WorkListTraits.h b/include/phasar/DataFlow/IfdsIde/Solver/WorkListTraits.h
index 8e15255d4..560c378dd 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/WorkListTraits.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/WorkListTraits.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_WORKLISTTRAITS_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_WORKLISTTRAITS_H
 
 #include "phasar/DataFlow/IfdsIde/Solver/Compressor.h"
 
@@ -117,3 +118,5 @@ template <typename T> class DequeWorkList {
 };
 
 } // namespace psr
+
+#endif // PHASAR_DATAFLOW_IFDSIDE_SOLVER_WORKLISTTRAITS_H
diff --git a/include/phasar/Utils/EmptyBaseOptimizationUtils.h b/include/phasar/Utils/EmptyBaseOptimizationUtils.h
index e1ac1b040..a592780bf 100644
--- a/include/phasar/Utils/EmptyBaseOptimizationUtils.h
+++ b/include/phasar/Utils/EmptyBaseOptimizationUtils.h
@@ -1,20 +1,10 @@
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel and others
- *****************************************************************************/
-
-#ifndef PHASAR_UTILS_EMPTYBASEOPTIMIZATIONUTILS_H_
-#define PHASAR_UTILS_EMPTYBASEOPTIMIZATIONUTILS_H_
+#ifndef PHASAR_UTILS_EMPTYBASEOPTIMIZATIONUTILS_H
+#define PHASAR_UTILS_EMPTYBASEOPTIMIZATIONUTILS_H
 
 #include "phasar/Utils/ByRef.h"
 
 #include "llvm/ADT/DenseMapInfo.h"
 
-#include <cstdint>
 #include <functional>
 #include <type_traits>
 
diff --git a/include/phasar/Utils/PointerUtils.h b/include/phasar/Utils/PointerUtils.h
index b985f381a..117a5bea9 100644
--- a/include/phasar/Utils/PointerUtils.h
+++ b/include/phasar/Utils/PointerUtils.h
@@ -1,12 +1,3 @@
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel and others
- *****************************************************************************/
-
 #ifndef PHASAR_UTILS_POINTERUTILS_H
 #define PHASAR_UTILS_POINTERUTILS_H
 
diff --git a/include/phasar/Utils/TableWrappers.h b/include/phasar/Utils/TableWrappers.h
index 5b0363124..18accb1b1 100644
--- a/include/phasar/Utils/TableWrappers.h
+++ b/include/phasar/Utils/TableWrappers.h
@@ -1,14 +1,5 @@
-/******************************************************************************
- * Copyright (c) 2022 Fabian Schiebel.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel and others
- *****************************************************************************/
-
-#ifndef PHASAR_UTILS_TABLEWRAPPERS
-#define PHASAR_UTILS_TABLEWRAPPERS
+#ifndef PHASAR_UTILS_TABLEWRAPPERS_H
+#define PHASAR_UTILS_TABLEWRAPPERS_H
 
 #include "phasar/Utils/ByRef.h"
 #include "phasar/Utils/EmptyBaseOptimizationUtils.h"