diff --git a/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp b/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
index 2b30ed3d78372c2979223b44879d6d316abbfbc3..494f4e923f6806016904fec39f0707f3a57a6980 100644
--- a/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
+++ b/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
@@ -24,7 +24,6 @@
 #include "Core/Multilayer/MultiLayer.h"
 #include "Core/Particle/Particle.h"
 #include "Core/Simulation/GISASSimulation.h"
-#include "Core/Simulation/Simulation.h"
 
 int main()
 {
diff --git a/Fit/Kernel/Kernel.h b/Fit/Kernel/Kernel.h
index 2b34245c253271844de670a084d152ad1eb14887..7ce2f630d81e5ed3e6ddb5d9f1e85829275f4c0c 100644
--- a/Fit/Kernel/Kernel.h
+++ b/Fit/Kernel/Kernel.h
@@ -17,7 +17,6 @@
 
 #include "Fit/Kernel/KernelTypes.h"
 #include "Fit/Kernel/MinimizerResult.h"
-#include "Fit/Kernel/Parameters.h"
 #include "Fit/Tools/WallclockTimer.h"
 #include <functional>
 #include <memory>
diff --git a/Fit/Kernel/Minimizer.h b/Fit/Kernel/Minimizer.h
index b3cb506df67d57516e726b942b66fea33c695f32..2d440e4ee20939a5876f78f17cfa3841f183a652 100644
--- a/Fit/Kernel/Minimizer.h
+++ b/Fit/Kernel/Minimizer.h
@@ -17,7 +17,6 @@
 
 #include "Fit/Kernel/KernelTypes.h"
 #include "Fit/Kernel/MinimizerResult.h"
-#include "Fit/Kernel/Parameters.h"
 #include <functional>
 #include <memory>
 #include <string>
diff --git a/Fit/Minimizer/MinimizerFactory.cpp b/Fit/Minimizer/MinimizerFactory.cpp
index 4bfe08d5124dc72ead8e14cf78f7c460e79fe860..614aad6de0c824ce8185359dde71807d15ce0401 100644
--- a/Fit/Minimizer/MinimizerFactory.cpp
+++ b/Fit/Minimizer/MinimizerFactory.cpp
@@ -13,7 +13,6 @@
 // ************************************************************************** //
 
 #include "Fit/Minimizer/MinimizerFactory.h"
-#include "Fit/Minimizer/MinimizerCatalog.h"
 #include "Fit/Minimizer/TestMinimizer.h"
 #include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
 #include "Fit/RootAdapter/GSLMultiMinimizer.h"
diff --git a/Fit/Minimizer/TestMinimizer.cpp b/Fit/Minimizer/TestMinimizer.cpp
index 41429f7a1fe5ed3c0b018620f17d28b76cbb50c0..329569a5f579951eeeebe5ec9bb2c337c38c2c23 100644
--- a/Fit/Minimizer/TestMinimizer.cpp
+++ b/Fit/Minimizer/TestMinimizer.cpp
@@ -13,7 +13,6 @@
 // ************************************************************************** //
 
 #include "Fit/Minimizer/TestMinimizer.h"
-#include "Fit/Kernel/Parameters.h"
 #include <sstream>
 
 using namespace Fit;
diff --git a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp b/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
index 11b56e8cdf5a7a734662271c6e3aa5ccad25d91b..90bfd7b41b3cd893e073c0e6004cd71ed571404b 100644
--- a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
+++ b/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
@@ -14,7 +14,6 @@
 
 #include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
 #include "Fit/RootAdapter/GSLMultiMinimizer.h"
-#include "Fit/Tools/AttLimits.h"
 #include "Fit/Tools/MinimizerUtils.h"
 #include "Fit/Tools/StringUtils.h"
 #include <stdexcept>