diff --git a/roofit/roofitcore/src/RooAbsArg.cxx b/roofit/roofitcore/src/RooAbsArg.cxx
index 3fff337be59cca9b90c1052b10e904ba1ff3bdd7..123ea6cd5af15d93bf2f11bfa359ceb0e1f3fd3a 100644
--- a/roofit/roofitcore/src/RooAbsArg.cxx
+++ b/roofit/roofitcore/src/RooAbsArg.cxx
@@ -67,10 +67,7 @@ setting/clearing/testing named attributes.
 #include "RooTreeDataStore.h"
 
 #include <string.h>
-#include <iomanip>
-#include <fstream>
 #include <algorithm>
-#include <sstream>
 
 using namespace std ;
 
diff --git a/roofit/roofitcore/src/RooAbsCategoryLValue.cxx b/roofit/roofitcore/src/RooAbsCategoryLValue.cxx
index 6d639de0c2390bd918c7213e46560bd2abd7ed7d..b2328c39bf067387811ce6dd0f918a6189a6fee9 100644
--- a/roofit/roofitcore/src/RooAbsCategoryLValue.cxx
+++ b/roofit/roofitcore/src/RooAbsCategoryLValue.cxx
@@ -32,7 +32,6 @@ to other RooAbsArgs must be invertible
 #include "Riostream.h"
 #include "Riostream.h"
 #include <stdlib.h>
-#include <string.h>
 #include "TTree.h"
 #include "TString.h"
 #include "TH1.h"
diff --git a/roofit/roofitcore/src/RooAbsCollection.cxx b/roofit/roofitcore/src/RooAbsCollection.cxx
index de84a9ac842943ab12626c92fc94d8482d1da18a..7a8892a5c482c1adaab42ee7d6517e16356d4b45 100644
--- a/roofit/roofitcore/src/RooAbsCollection.cxx
+++ b/roofit/roofitcore/src/RooAbsCollection.cxx
@@ -29,11 +29,6 @@ collections.
 **/
 
 #include <iomanip>
-#include <fstream>
-#include <vector>
-#include <string>
-#include <sstream>
-#include <algorithm>
 
 #include "Riostream.h"
 #include "TClass.h"
diff --git a/roofit/roofitcore/src/RooAbsMoment.cxx b/roofit/roofitcore/src/RooAbsMoment.cxx
index ede449ca3b5bf8c448105d010dcdb7be7ccbb1b6..0fd98b928fa54a4ed9fb809261fef7c780fd616e 100644
--- a/roofit/roofitcore/src/RooAbsMoment.cxx
+++ b/roofit/roofitcore/src/RooAbsMoment.cxx
@@ -30,7 +30,6 @@ derivator class.
 #include "Riostream.h"
 #include "Riostream.h"
 #include <math.h>
-#include <string>
 
 #include "RooAbsMoment.h"
 #include "RooAbsReal.h"
diff --git a/roofit/roofitcore/src/RooAbsRealLValue.cxx b/roofit/roofitcore/src/RooAbsRealLValue.cxx
index 3ee7b29c051f81c2164c4d95a911a0f9b71f49f8..e495f1e7896bd040eab056e64dcd9e3711e0e8d0 100644
--- a/roofit/roofitcore/src/RooAbsRealLValue.cxx
+++ b/roofit/roofitcore/src/RooAbsRealLValue.cxx
@@ -35,9 +35,6 @@ interpreted as a parameter.
 #include "RooFit.h"
 
 #include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
 #include "Riostream.h"
 #include "TObjString.h"
 #include "TTree.h"
diff --git a/roofit/roofitcore/src/RooAdaptiveIntegratorND.cxx b/roofit/roofitcore/src/RooAdaptiveIntegratorND.cxx
index f3a65e4cad7bf669eae5cf2ed2435ed70fa5525f..3e92fe0927d65646202738c6b733a588a2bdd959 100644
--- a/roofit/roofitcore/src/RooAdaptiveIntegratorND.cxx
+++ b/roofit/roofitcore/src/RooAdaptiveIntegratorND.cxx
@@ -38,7 +38,6 @@ numerical integration algorithm.
 #include "Math/AdaptiveIntegratorMultiDim.h"
 
 #include <assert.h>
-#include <iomanip>
 
 
 
diff --git a/roofit/roofitcore/src/RooAddition.cxx b/roofit/roofitcore/src/RooAddition.cxx
index fc386ce3a89f6af991e8830604b1bb6783aa80ce..924e8af97855f871b525f188627fc1961c1d2d24 100644
--- a/roofit/roofitcore/src/RooAddition.cxx
+++ b/roofit/roofitcore/src/RooAddition.cxx
@@ -30,9 +30,6 @@ i.e. all integrals of the product are handled numerically
 
 #include "Riostream.h"
 #include <math.h>
-#include <memory>
-#include <list>
-#include <algorithm>
 using namespace std ;
 
 #include "RooAddition.h"
diff --git a/roofit/roofitcore/src/RooArgList.cxx b/roofit/roofitcore/src/RooArgList.cxx
index 867362f205bc38939fa95bbcbda165131c2a6369..e4674250905999febc9fe825ae43649de28593fc 100644
--- a/roofit/roofitcore/src/RooArgList.cxx
+++ b/roofit/roofitcore/src/RooArgList.cxx
@@ -40,7 +40,6 @@
 
 #include "Riostream.h"
 #include <iomanip>
-#include <fstream>
 #include "TClass.h"
 #include "RooArgList.h"
 #include "RooErrorHandler.h"
diff --git a/roofit/roofitcore/src/RooArgSet.cxx b/roofit/roofitcore/src/RooArgSet.cxx
index 87824af410c9def86998287c245179d516ec9899..7f450d9437a4a3a9657670aea7db9dc81f5b8d5d 100644
--- a/roofit/roofitcore/src/RooArgSet.cxx
+++ b/roofit/roofitcore/src/RooArgSet.cxx
@@ -41,8 +41,6 @@
 
 #include "Riostream.h"
 #include <iomanip>
-#include <fstream>
-#include <list>
 #include "TClass.h"
 #include "RooErrorHandler.h"
 #include "RooArgSet.h"
diff --git a/roofit/roofitcore/src/RooBinning.cxx b/roofit/roofitcore/src/RooBinning.cxx
index cf74bab9e979ea767a45cf523bbc4565c5574ba9..347c6caa443e38b1be2415031c79e4f7f6331cb3 100644
--- a/roofit/roofitcore/src/RooBinning.cxx
+++ b/roofit/roofitcore/src/RooBinning.cxx
@@ -27,7 +27,6 @@ uniformly spaced boundaries.
 **/
 
 #include <cmath>
-#include <algorithm>
 #include "RooFit.h"
 
 #include "Riostream.h"
diff --git a/roofit/roofitcore/src/RooBinningCategory.cxx b/roofit/roofitcore/src/RooBinningCategory.cxx
index f4041b47410304717e828d2bbb3178fe1a1c548b..b6a47e4a6a6b138ff1b234f1a84611c9adbc088b 100644
--- a/roofit/roofitcore/src/RooBinningCategory.cxx
+++ b/roofit/roofitcore/src/RooBinningCategory.cxx
@@ -29,7 +29,6 @@ by a series of thresholds.
 #include "Riostream.h"
 #include "Riostream.h"
 #include <stdlib.h>
-#include <stdio.h>
 #include "TString.h"
 #include "RooBinningCategory.h"
 #include "RooStreamParser.h"
diff --git a/roofit/roofitcore/src/RooCatType.cxx b/roofit/roofitcore/src/RooCatType.cxx
index 05bb2f9a0246bfe860b38b606cf7c6c8157238b7..eb789f76c6d4cee4edb00461320452552a240228 100644
--- a/roofit/roofitcore/src/RooCatType.cxx
+++ b/roofit/roofitcore/src/RooCatType.cxx
@@ -26,7 +26,6 @@ index value which define the state
 
 #include "RooFit.h"
 
-#include <stdlib.h>
 #include <stdlib.h>
 #include "TClass.h"
 #include "RooCatType.h"
diff --git a/roofit/roofitcore/src/RooCategory.cxx b/roofit/roofitcore/src/RooCategory.cxx
index f57cd59c40c7ad4e4cd7aef73b80fbcc3b08dad7..1ecdc60f4356c88bcbd7d0ec8a3f8a28ebfe7aaa 100644
--- a/roofit/roofitcore/src/RooCategory.cxx
+++ b/roofit/roofitcore/src/RooCategory.cxx
@@ -29,7 +29,6 @@ has a public interface to define the possible value states.
 #include "Riostream.h"
 #include "Riostream.h"
 #include <stdlib.h>
-#include <string.h>
 #include "TTree.h"
 #include "TString.h"
 #include "TH1.h"
diff --git a/roofit/roofitcore/src/RooClassFactory.cxx b/roofit/roofitcore/src/RooClassFactory.cxx
index 91e9db25692d1257f9b776eaa1bfb0eda0ec10b0..75ee042f380879b884e01a76670ff7afa325a9e6 100644
--- a/roofit/roofitcore/src/RooClassFactory.cxx
+++ b/roofit/roofitcore/src/RooClassFactory.cxx
@@ -39,8 +39,6 @@ instantiate objects.
 #include "RooGlobalFunc.h"
 #include "RooAbsPdf.h"
 #include <fstream>
-#include <vector>
-#include <string>
 
 using namespace std ;
 
diff --git a/roofit/roofitcore/src/RooCurve.cxx b/roofit/roofitcore/src/RooCurve.cxx
index 3b48f3644b6a0cd3d63a579415cd997708f0347e..a09c763d48c254aca6305d678f21f0083f45effb 100644
--- a/roofit/roofitcore/src/RooCurve.cxx
+++ b/roofit/roofitcore/src/RooCurve.cxx
@@ -50,11 +50,7 @@ a function y(x) is actually evaluated to approximate a smooth curve, use:
 #include "TMatrixD.h"
 #include "TVectorD.h"
 #include <iomanip>
-#include <math.h>
-#include <assert.h>
 #include <deque>
-#include <algorithm>
-#include <limits>
 
 using namespace std ;
 
diff --git a/roofit/roofitcore/src/RooDerivative.cxx b/roofit/roofitcore/src/RooDerivative.cxx
index 794092ace50a265db646dc4823b9bc86bb50ba4d..53d60f3bdb5625908862e14bb0e0cdfc998cd509 100644
--- a/roofit/roofitcore/src/RooDerivative.cxx
+++ b/roofit/roofitcore/src/RooDerivative.cxx
@@ -30,7 +30,6 @@ derivator class.
 #include "Riostream.h"
 #include "Riostream.h"
 #include <math.h>
-#include <string>
 
 #include "RooDerivative.h"
 #include "RooAbsReal.h"
diff --git a/roofit/roofitcore/src/RooEllipse.cxx b/roofit/roofitcore/src/RooEllipse.cxx
index e0de5ac5b213e1b7938000e545582b5866d7cc15..f465b908fab2ba6513bdad640ae6d3a3ef636aa5 100644
--- a/roofit/roofitcore/src/RooEllipse.cxx
+++ b/roofit/roofitcore/src/RooEllipse.cxx
@@ -34,7 +34,6 @@ an error contour.
 #include "Riostream.h"
 #include "TClass.h"
 #include <math.h>
-#include <assert.h>
 
 using namespace std;
 
diff --git a/roofit/roofitcore/src/RooExpensiveObjectCache.cxx b/roofit/roofitcore/src/RooExpensiveObjectCache.cxx
index 41f25ce8d521fb87f746c97d9580206b14531946..ace75b9f0243bdfb44f4b896c40105d3c82eff2d 100644
--- a/roofit/roofitcore/src/RooExpensiveObjectCache.cxx
+++ b/roofit/roofitcore/src/RooExpensiveObjectCache.cxx
@@ -35,7 +35,6 @@ retrieve these precalculated objects
 #include "RooArgSet.h"
 #include "RooMsgService.h"
 #include <iostream>
-#include <math.h>
 using namespace std ;
 
 #include "RooExpensiveObjectCache.h"
diff --git a/roofit/roofitcore/src/RooFactoryWSTool.cxx b/roofit/roofitcore/src/RooFactoryWSTool.cxx
index be820663fa656a4722e88b42f8f144bcd5270b48..cd5a5ee44a563cb8236d553beba1b286696a409b 100644
--- a/roofit/roofitcore/src/RooFactoryWSTool.cxx
+++ b/roofit/roofitcore/src/RooFactoryWSTool.cxx
@@ -41,8 +41,6 @@ instantiate objects.
 #include "RooAbsPdf.h"
 #include "RooGaussian.h"
 #include <fstream>
-#include <vector>
-#include <string>
 #include "RooGlobalFunc.h"
 #include "RooDataSet.h"
 #include "RooDataHist.h"
diff --git a/roofit/roofitcore/src/RooFirstMoment.cxx b/roofit/roofitcore/src/RooFirstMoment.cxx
index 32e8fd8df7ce67ecea87202b0cb2beb1ac0bfcb2..ada5f615f178776610bcc343815c57cf413a144b 100644
--- a/roofit/roofitcore/src/RooFirstMoment.cxx
+++ b/roofit/roofitcore/src/RooFirstMoment.cxx
@@ -30,7 +30,6 @@ derivator class.
 #include "Riostream.h"
 #include "Riostream.h"
 #include <math.h>
-#include <string>
 
 #include "RooFirstMoment.h"
 #include "RooAbsReal.h"
diff --git a/roofit/roofitcore/src/RooGaussKronrodIntegrator1D.cxx b/roofit/roofitcore/src/RooGaussKronrodIntegrator1D.cxx
index 5e7c58571f4df81f1659784ce4e999642ce24d31..e30c9ad5abd87399aec782bdd41d1b0de7e1f1b9 100644
--- a/roofit/roofitcore/src/RooGaussKronrodIntegrator1D.cxx
+++ b/roofit/roofitcore/src/RooGaussKronrodIntegrator1D.cxx
@@ -46,7 +46,6 @@ reached
 #include <assert.h>
 #include <math.h>
 #include <float.h>
-#include <stdlib.h>
 #include "Riostream.h"
 #include "TMath.h"
 #include "RooGaussKronrodIntegrator1D.h"
diff --git a/roofit/roofitcore/src/RooHist.cxx b/roofit/roofitcore/src/RooHist.cxx
index 6f80c2b8b35937f9cbd30b621f5afa241abbe8eb..ae82e5aed05d484f77a9a1c10fc8f46ae4230f3c 100644
--- a/roofit/roofitcore/src/RooHist.cxx
+++ b/roofit/roofitcore/src/RooHist.cxx
@@ -37,7 +37,6 @@ a RooPlot.
 #include "TClass.h"
 #include "Riostream.h"
 #include <iomanip>
-#include <math.h>
 
 using namespace std;
 
diff --git a/roofit/roofitcore/src/RooLinearVar.cxx b/roofit/roofitcore/src/RooLinearVar.cxx
index d4d38776f347f3e7be9c1a5e2e5514c922676474..180ec6c1d21e1df99f376b45f7debbcd44c20a3c 100644
--- a/roofit/roofitcore/src/RooLinearVar.cxx
+++ b/roofit/roofitcore/src/RooLinearVar.cxx
@@ -41,9 +41,6 @@
 #include "Riostream.h"
 
 #include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
 #include "TClass.h"
 #include "TObjString.h"
 #include "TTree.h"
diff --git a/roofit/roofitcore/src/RooMCIntegrator.cxx b/roofit/roofitcore/src/RooMCIntegrator.cxx
index 77bffd5c22b7be412fe47fda66afe7db93ebeae0..d7fd138f4f0e84342cf07056fd3c6595611e2b9d 100644
--- a/roofit/roofitcore/src/RooMCIntegrator.cxx
+++ b/roofit/roofitcore/src/RooMCIntegrator.cxx
@@ -40,7 +40,6 @@ based on a C version from the 0.9 beta release of the GNU scientific library.
 #include "RooMsgService.h"
 
 #include <math.h>
-#include <assert.h>
 
 
 
diff --git a/roofit/roofitcore/src/RooMappedCategory.cxx b/roofit/roofitcore/src/RooMappedCategory.cxx
index da2afa04d5da14ad78e638f428fc14ff563ea872..14b3a6b96141e846324486f57c7585605615200b 100644
--- a/roofit/roofitcore/src/RooMappedCategory.cxx
+++ b/roofit/roofitcore/src/RooMappedCategory.cxx
@@ -23,8 +23,6 @@
 // output state label.
 
 #include <cstdio>
-#include <memory>
-#include <cstdlib>
 
 #include "RooMappedCategory.h"
 
diff --git a/roofit/roofitcore/src/RooMinimizer.cxx b/roofit/roofitcore/src/RooMinimizer.cxx
index 44028550adfe520c878d74ba5e99133077e161a4..87f383f77d0ff3a7ff9c0b9fb73bc25fb0e02b96 100644
--- a/roofit/roofitcore/src/RooMinimizer.cxx
+++ b/roofit/roofitcore/src/RooMinimizer.cxx
@@ -44,7 +44,6 @@ automatic PDF optimization.
 #include "TClass.h"
 
 #include <fstream>
-#include <iomanip>
 
 #include "TH1.h"
 #include "TH2.h"
diff --git a/roofit/roofitcore/src/RooMoment.cxx b/roofit/roofitcore/src/RooMoment.cxx
index a2463ba5f9eb14192396ad32b7c35c7dc34db15f..d0968cd4be49f77f97fc40dadd2ab7d70c89a48a 100644
--- a/roofit/roofitcore/src/RooMoment.cxx
+++ b/roofit/roofitcore/src/RooMoment.cxx
@@ -30,7 +30,6 @@ derivator class.
 #include "Riostream.h"
 #include "Riostream.h"
 #include <math.h>
-#include <string>
 
 #include "RooMoment.h"
 #include "RooAbsReal.h"
diff --git a/roofit/roofitcore/src/RooMsgService.cxx b/roofit/roofitcore/src/RooMsgService.cxx
index ea0e2f650d96cbc2eec20cf8d722f9d710710ebe..32777005bb2fd990256b0a895df1e3369df9e8c8 100644
--- a/roofit/roofitcore/src/RooMsgService.cxx
+++ b/roofit/roofitcore/src/RooMsgService.cxx
@@ -56,7 +56,6 @@ The singleton instance is accessible through RooMsgService::instance() ;
 #include "TSystem.h"
 #include "Riostream.h"
 #include <iomanip>
-#include <fstream>
 using namespace std ;
 using namespace RooFit ;
 
diff --git a/roofit/roofitcore/src/RooMultiCategory.cxx b/roofit/roofitcore/src/RooMultiCategory.cxx
index 618cb659134ddb4e225729afdcceb1920c6b3ea4..24723cde32f9c703666f6abb849f6cd17c8133ab 100644
--- a/roofit/roofitcore/src/RooMultiCategory.cxx
+++ b/roofit/roofitcore/src/RooMultiCategory.cxx
@@ -31,7 +31,6 @@ category modifies its list of states
 #include "Riostream.h"
 #include "Riostream.h"
 #include <stdlib.h>
-#include <stdio.h>
 #include "TString.h"
 #include "RooMultiCategory.h"
 #include "RooStreamParser.h"
diff --git a/roofit/roofitcore/src/RooNameSet.cxx b/roofit/roofitcore/src/RooNameSet.cxx
index 7ee80a7dbaebe502f938cc91a0ccb17ef1556a9d..ec08da08e43e2e9aa4d7ecf80adc42f6f2e967a4 100644
--- a/roofit/roofitcore/src/RooNameSet.cxx
+++ b/roofit/roofitcore/src/RooNameSet.cxx
@@ -27,8 +27,6 @@ by offering it a list of new RooAbsArg objects.
 **/
 
 #include <cstring>
-#include <algorithm>
-#include <cassert>
 
 #include "RooFit.h"
 #include "Riostream.h"
diff --git a/roofit/roofitcore/src/RooPlot.cxx b/roofit/roofitcore/src/RooPlot.cxx
index e79e5c9c4641016418a614b3daafc73142f2759d..a2a9ce02cab27285595f937792b14a07da3451aa 100644
--- a/roofit/roofitcore/src/RooPlot.cxx
+++ b/roofit/roofitcore/src/RooPlot.cxx
@@ -67,7 +67,6 @@ object onto a one-dimensional plot.
 
 #include "Riostream.h"
 #include <string.h>
-#include <assert.h>
 
 using namespace std;
 
diff --git a/roofit/roofitcore/src/RooProduct.cxx b/roofit/roofitcore/src/RooProduct.cxx
index 0338cdbd11678e542a1f9dfda3dc1459ec9b23f6..ca4cfa2685a285db35cad897b736d7cd9b6aba2f 100644
--- a/roofit/roofitcore/src/RooProduct.cxx
+++ b/roofit/roofitcore/src/RooProduct.cxx
@@ -27,10 +27,7 @@ of a given set of other RooAbsReal objects
 
 
 #include <cmath>
-#include <vector>
-#include <utility>
 #include <memory>
-#include <algorithm>
 
 #include "RooProduct.h"
 #include "RooNameReg.h"
diff --git a/roofit/roofitcore/src/RooRealSumFunc.cxx b/roofit/roofitcore/src/RooRealSumFunc.cxx
index 3695b46c7d939b696a888beaf5d9cbe4d2c0fd12..1c89675eca1098af6b4bff66e12d8d9d64f4a685 100644
--- a/roofit/roofitcore/src/RooRealSumFunc.cxx
+++ b/roofit/roofitcore/src/RooRealSumFunc.cxx
@@ -44,7 +44,6 @@
 #include "RooNameReg.h"
 #include "RooTrace.h"
 #include <memory>
-#include <algorithm>
 
 using namespace std;
 
diff --git a/roofit/roofitcore/src/RooRealSumPdf.cxx b/roofit/roofitcore/src/RooRealSumPdf.cxx
index 677fe6dbda7025c3f7f57a951c00508a2cc21e27..1e525fa778b5a686d98371d3641ba34e1b680b4d 100644
--- a/roofit/roofitcore/src/RooRealSumPdf.cxx
+++ b/roofit/roofitcore/src/RooRealSumPdf.cxx
@@ -49,7 +49,6 @@ In the present version \f$coef_i\f$ may not depend on x, but this limitation may
 #include "RooMsgService.h"
 #include "RooNameReg.h"
 #include <memory>
-#include <algorithm>
 
 #include "TError.h"
 
diff --git a/roofit/roofitcore/src/RooRealVar.cxx b/roofit/roofitcore/src/RooRealVar.cxx
index 7c34eebc541b2a689c50c10a77cc6037f22cf760..6fe1093d7b41d430968ee8bbc513bf9da0aae0c9 100644
--- a/roofit/roofitcore/src/RooRealVar.cxx
+++ b/roofit/roofitcore/src/RooRealVar.cxx
@@ -31,10 +31,6 @@ a optionally series of alternate named ranges.
 #include "RooTrace.h"
 
 #include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <iomanip>
 #include "TObjString.h"
 #include "TTree.h"
 #include "RooRealVar.h"
diff --git a/roofit/roofitcore/src/RooSecondMoment.cxx b/roofit/roofitcore/src/RooSecondMoment.cxx
index 44ba746ab2b65cf57a38352e3b10ce587a35c9a2..10dcfe4cb4b882ac06c3a9c2d689ab6659a0f3d4 100644
--- a/roofit/roofitcore/src/RooSecondMoment.cxx
+++ b/roofit/roofitcore/src/RooSecondMoment.cxx
@@ -30,7 +30,6 @@ derivator class.
 #include "Riostream.h"
 #include "Riostream.h"
 #include <math.h>
-#include <string>
 
 #include "RooSecondMoment.h"
 #include "RooAbsReal.h"
diff --git a/roofit/roofitcore/src/RooSimPdfBuilder.cxx b/roofit/roofitcore/src/RooSimPdfBuilder.cxx
index 1b741bda7aef7763f805c09e6b7babce944b0e89..0e5b9b20591dab843873eaeef1d6a8a79e533261 100644
--- a/roofit/roofitcore/src/RooSimPdfBuilder.cxx
+++ b/roofit/roofitcore/src/RooSimPdfBuilder.cxx
@@ -417,7 +417,6 @@
 
 #include "RooFit.h"
 
-#include <string.h>
 #include <string.h>
 
 #ifndef _WIN32
diff --git a/roofit/roofitcore/src/RooStreamParser.cxx b/roofit/roofitcore/src/RooStreamParser.cxx
index 94e5f8ff637eae21ee8e1c89efd8a089754297ab..a52ff05fc759e84aa85ddcd1658f825d0b0ca529 100644
--- a/roofit/roofitcore/src/RooStreamParser.cxx
+++ b/roofit/roofitcore/src/RooStreamParser.cxx
@@ -39,7 +39,6 @@
 #include "Riostream.h"
 #include "Riostream.h"
 #include <stdlib.h>
-#include <ctype.h>
 
 #ifndef _WIN32
 #include <strings.h>
diff --git a/roofit/roofitcore/src/RooStringVar.cxx b/roofit/roofitcore/src/RooStringVar.cxx
index de34e86686bdcea50fc8181855109ded63dc2712..6e62483a95cd3964dcd58818f42046aeca809c8e 100644
--- a/roofit/roofitcore/src/RooStringVar.cxx
+++ b/roofit/roofitcore/src/RooStringVar.cxx
@@ -26,9 +26,6 @@ RooStringVar implements a string values RooAbsArg
 #include "Riostream.h"
 
 #include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
 #include "TObjString.h"
 #include "TTree.h"
 #include "RooStringVar.h"
diff --git a/roofit/roofitcore/src/RooSuperCategory.cxx b/roofit/roofitcore/src/RooSuperCategory.cxx
index 24b94bf414de02af732c8d409bb2fa40170f5dda..c3e140fe5424a7f1d004c4164d62e44417b1b98b 100644
--- a/roofit/roofitcore/src/RooSuperCategory.cxx
+++ b/roofit/roofitcore/src/RooSuperCategory.cxx
@@ -35,7 +35,6 @@ category modifies its list of states
 #include "Riostream.h"
 #include "Riostream.h"
 #include <stdlib.h>
-#include <stdio.h>
 #include "TString.h"
 #include "TClass.h"
 #include "RooSuperCategory.h"
diff --git a/roofit/roofitcore/src/RooThresholdCategory.cxx b/roofit/roofitcore/src/RooThresholdCategory.cxx
index 90d91ccc8a1eef7f5f3fb6c7d9c2a6916703992d..39f9c305a718b699635f861df841980983b8bfb6 100644
--- a/roofit/roofitcore/src/RooThresholdCategory.cxx
+++ b/roofit/roofitcore/src/RooThresholdCategory.cxx
@@ -29,7 +29,6 @@ by a series of thresholds.
 #include "Riostream.h"
 #include "Riostream.h"
 #include <stdlib.h>
-#include <stdio.h>
 #include "TString.h"
 #include "RooThresholdCategory.h"
 #include "RooStreamParser.h"
diff --git a/roofit/roofitcore/src/RooVectorDataStore.cxx b/roofit/roofitcore/src/RooVectorDataStore.cxx
index 81e598a119ae75c22c06b8df4263ec67921a1555..1487aea8d1f014ca10b8c73435a0bebce2e0b296 100644
--- a/roofit/roofitcore/src/RooVectorDataStore.cxx
+++ b/roofit/roofitcore/src/RooVectorDataStore.cxx
@@ -41,8 +41,6 @@ use a TTree as internal storage mechanism
 #include "RooTrace.h"
 
 #include <iomanip>
-#include <algorithm>
-#include <memory>
 using namespace std ;
 
 ClassImp(RooVectorDataStore);
diff --git a/roofit/roofitcore/src/RooWorkspace.cxx b/roofit/roofitcore/src/RooWorkspace.cxx
index a8a19dc9e33b48dd1eec4afb6f13ca12db5ae480..5b7a1a83e849f44292971525d604a9fea48ca3fd 100644
--- a/roofit/roofitcore/src/RooWorkspace.cxx
+++ b/roofit/roofitcore/src/RooWorkspace.cxx
@@ -59,9 +59,6 @@ importClassCode() method.
 #include "TFile.h"
 #include "TH1.h"
 #include <map>
-#include <string>
-#include <list>
-#include <set>
 
 using namespace std ;
 
@@ -74,7 +71,6 @@ using namespace std ;
 #include "TClass.h"
 #include "Riostream.h"
 #include <string.h>
-#include <assert.h>
 
 ClassImp(RooWorkspace);
 ;