From 6ec7b5cfc43df8f95d1e7bbd6080c72f940f0d1c Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Mon, 26 Oct 2015 09:48:06 +0100 Subject: [PATCH] Make more headers/sources self contained. Either include the missing header files or add forward declarations, where the complete types are not required. --- graf3d/eve/src/TEveTrans.cxx | 3 ++- gui/recorder/src/TRecorder.cxx | 1 + hist/hist/inc/TBackCompFitter.h | 3 +++ hist/hist/inc/THnSparse_Internal.h | 2 ++ hist/hist/src/AnalyticalIntegrals.cxx | 5 +++-- hist/hist/src/AnalyticalIntegrals.h | 2 ++ hist/hist/src/HFitImpl.cxx | 1 + hist/hist/src/TBackCompFitter.cxx | 1 + hist/hist/src/TBinomialEfficiencyFitter.cxx | 1 + hist/hist/src/TFractionFitter.cxx | 1 + hist/hist/src/THnBase.cxx | 1 + math/genetic/inc/Math/GeneticMinimizer.h | 12 ++++++++---- math/mathcore/inc/Fit/BasicFCN.h | 1 + math/mathcore/inc/Fit/Chi2FCN.h | 2 ++ math/mathcore/inc/Math/TDataPoint.icc | 2 ++ math/mathcore/src/BasicMinimizer.cxx | 4 ++++ math/mathcore/src/BinData.cxx | 1 + math/mathcore/src/BrentMethods.cxx | 1 + math/mathcore/src/BrentMinimizer1D.cxx | 1 + math/mathcore/src/BrentRootFinder.cxx | 1 + math/mathcore/src/Delaunay2D.cxx | 2 ++ math/mathcore/src/DistSampler.cxx | 1 + math/mathcore/src/FitUtil.cxx | 2 ++ math/mathcore/src/Fitter.cxx | 5 +++++ math/mathcore/src/GaussIntegrator.cxx | 3 +++ math/mathcore/src/GaussLegendreIntegrator.cxx | 4 ++++ math/mathcore/src/GoFTest.cxx | 3 +++ math/mathcore/src/MinimTransformFunction.cxx | 1 + math/mathcore/src/RichardsonDerivator.cxx | 1 + math/mathcore/src/SparseData.cxx | 1 + math/mathcore/src/UnBinData.cxx | 1 + math/minuit/src/TLinearMinimizer.cxx | 2 ++ math/minuit2/src/SimplexBuilder.cxx | 2 +- math/smatrix/inc/Math/BinaryOperators.h | 1 + misc/table/inc/TGenericTable.h | 1 + misc/table/inc/TTable.h | 1 - misc/table/src/TIndexTable.cxx | 2 ++ net/http/inc/THttpServer.h | 4 ++++ .../inc/RooStats/HistFactory/HistFactoryNavigation.h | 3 +-- roofit/histfactory/src/HistFactoryNavigation.cxx | 1 + roofit/histfactory/src/PiecewiseInterpolation.cxx | 10 ++++++---- roofit/roofitcore/src/RooAbsArg.cxx | 1 + roofit/roofitcore/src/RooBinning.cxx | 2 +- roofit/roofitcore/src/RooMinimizer.cxx | 1 + tmva/tmva/inc/TMVA/NodekNN.h | 1 + tmva/tmva/inc/TMVA/ROCCalc.h | 4 ++++ tmva/tmva/src/MethodBase.cxx | 2 ++ tmva/tmva/src/MethodBoost.cxx | 1 + tmva/tmva/src/ModulekNN.cxx | 1 + tmva/tmva/src/ResultsRegression.cxx | 1 + tmva/tmva/src/VariableGaussTransform.cxx | 1 + tree/treeplayer/inc/TTreeGeneratorBase.h | 1 + tree/treeplayer/src/TTreePlayer.cxx | 1 + 53 files changed, 98 insertions(+), 16 deletions(-) diff --git a/graf3d/eve/src/TEveTrans.cxx b/graf3d/eve/src/TEveTrans.cxx index f4d66a54c36a7..237d562f69faa 100644 --- a/graf3d/eve/src/TEveTrans.cxx +++ b/graf3d/eve/src/TEveTrans.cxx @@ -12,8 +12,9 @@ #include "TEveTrans.h" #include "TEveUtil.h" -#include "TMath.h" +#include "TBuffer.h" #include "TClass.h" +#include "TMath.h" #include "Riostream.h" diff --git a/gui/recorder/src/TRecorder.cxx b/gui/recorder/src/TRecorder.cxx index dc8856d1c307c..a9eabe8cbbdc3 100644 --- a/gui/recorder/src/TRecorder.cxx +++ b/gui/recorder/src/TRecorder.cxx @@ -121,6 +121,7 @@ #include "TFile.h" #include "TTimer.h" #include "TTree.h" +#include "TSystem.h" #include "TMutex.h" #include "TGButton.h" #include "TGFileDialog.h" diff --git a/hist/hist/inc/TBackCompFitter.h b/hist/hist/inc/TBackCompFitter.h index 69751d1ca7b37..24550885645e0 100644 --- a/hist/hist/inc/TBackCompFitter.h +++ b/hist/hist/inc/TBackCompFitter.h @@ -14,6 +14,9 @@ #include "TVirtualFitter.h" #endif +#include "Fit/BasicFCN.h" +#include "Fit/FitResult.h" + #ifndef ROOT_Fit_Fitter #include "Fit/Fitter.h" #endif diff --git a/hist/hist/inc/THnSparse_Internal.h b/hist/hist/inc/THnSparse_Internal.h index b3e6922ca91d4..bd851c25e98f9 100644 --- a/hist/hist/inc/THnSparse_Internal.h +++ b/hist/hist/inc/THnSparse_Internal.h @@ -23,6 +23,8 @@ #include "TArrayD.h" #endif +#include "TObject.h" + class TBrowser; class TH1; class THnSparse; diff --git a/hist/hist/src/AnalyticalIntegrals.cxx b/hist/hist/src/AnalyticalIntegrals.cxx index e9783a0d33b48..ab0f45f5e6c36 100644 --- a/hist/hist/src/AnalyticalIntegrals.cxx +++ b/hist/hist/src/AnalyticalIntegrals.cxx @@ -15,14 +15,15 @@ // // -#include +#include "AnalyticalIntegrals.h" + #include "TROOT.h" #include "TF1.h" #include "TFormula.h" #include "TMath.h" -#include "AnalyticalIntegrals.h" #include "Math/DistFuncMathCore.h" //for cdf +#include using namespace std; diff --git a/hist/hist/src/AnalyticalIntegrals.h b/hist/hist/src/AnalyticalIntegrals.h index 8ba7dcb5ed9b7..aa225320b6b18 100644 --- a/hist/hist/src/AnalyticalIntegrals.h +++ b/hist/hist/src/AnalyticalIntegrals.h @@ -11,6 +11,8 @@ #ifndef ROOT_AnalyticalIntegrals_h #define ROOT_AnalyticalIntegrals_h +#include "RtypesCore.h" + class TF1; Double_t AnalyticalIntegral(TF1 *f, Double_t a, Double_t b); diff --git a/hist/hist/src/HFitImpl.cxx b/hist/hist/src/HFitImpl.cxx index 5c08c2b63c955..ea70fd231730e 100644 --- a/hist/hist/src/HFitImpl.cxx +++ b/hist/hist/src/HFitImpl.cxx @@ -14,6 +14,7 @@ #include "THnBase.h" #include "Fit/Fitter.h" +#include "Fit/FitConfig.h" #include "Fit/BinData.h" #include "Fit/UnBinData.h" #include "Fit/Chi2FCN.h" diff --git a/hist/hist/src/TBackCompFitter.cxx b/hist/hist/src/TBackCompFitter.cxx index 2be8279544292..8c9104c6e8d61 100644 --- a/hist/hist/src/TBackCompFitter.cxx +++ b/hist/hist/src/TBackCompFitter.cxx @@ -59,6 +59,7 @@ class before issuing a new fit to avoid deleting this information. #include "HFitInterface.h" #include "Math/Minimizer.h" #include "Fit/BinData.h" +#include "Fit/FitConfig.h" #include "Fit/UnBinData.h" #include "Fit/PoissonLikelihoodFCN.h" #include "Fit/LogLikelihoodFCN.h" diff --git a/hist/hist/src/TBinomialEfficiencyFitter.cxx b/hist/hist/src/TBinomialEfficiencyFitter.cxx index f5b2a19036384..ab00a22974b4a 100644 --- a/hist/hist/src/TBinomialEfficiencyFitter.cxx +++ b/hist/hist/src/TBinomialEfficiencyFitter.cxx @@ -82,6 +82,7 @@ weighted histograms (because the likelihood computation will be incorrect). #include "TF1.h" #include "TF2.h" #include "TF3.h" +#include "Fit/FitConfig.h" #include "Fit/Fitter.h" #include "TFitResult.h" #include "Math/Functor.h" diff --git a/hist/hist/src/TFractionFitter.cxx b/hist/hist/src/TFractionFitter.cxx index 1ba5037ea7442..8d2a351f85ca9 100644 --- a/hist/hist/src/TFractionFitter.cxx +++ b/hist/hist/src/TFractionFitter.cxx @@ -147,6 +147,7 @@ Any serious inconsistency results in an error. #include "TMath.h" #include "TClass.h" +#include "Fit/FitConfig.h" #include "Fit/Fitter.h" #include "TFitResult.h" #include "Math/Functor.h" diff --git a/hist/hist/src/THnBase.cxx b/hist/hist/src/THnBase.cxx index f5904f93018fc..4a12cd7ade2ec 100644 --- a/hist/hist/src/THnBase.cxx +++ b/hist/hist/src/THnBase.cxx @@ -27,6 +27,7 @@ #include "TVirtualPad.h" #include "HFitInterface.h" +#include "Fit/DataRange.h" #include "Fit/SparseData.h" #include "Math/MinimizerOptions.h" #include "Math/WrappedMultiTF1.h" diff --git a/math/genetic/inc/Math/GeneticMinimizer.h b/math/genetic/inc/Math/GeneticMinimizer.h index 6666e70140e73..1b07dd47ad447 100644 --- a/math/genetic/inc/Math/GeneticMinimizer.h +++ b/math/genetic/inc/Math/GeneticMinimizer.h @@ -12,12 +12,16 @@ #ifndef ROOT_Math_GeneticMinimizer #define ROOT_Math_GeneticMinimizer -#include - #include "Math/Minimizer.h" -#include "TMVA/IFitterTarget.h" -#include "TMVA/Interval.h" +#include "RtypesCore.h" + +#include + +namespace TMVA { + class IFitterTarget; + class Interval; +} namespace ROOT { namespace Math { diff --git a/math/mathcore/inc/Fit/BasicFCN.h b/math/mathcore/inc/Fit/BasicFCN.h index 667996428c070..403e8e15b6992 100644 --- a/math/mathcore/inc/Fit/BasicFCN.h +++ b/math/mathcore/inc/Fit/BasicFCN.h @@ -21,6 +21,7 @@ #include "Math/IParamFunction.h" #endif +#include "Math/IParamFunctionfwd.h" #include diff --git a/math/mathcore/inc/Fit/Chi2FCN.h b/math/mathcore/inc/Fit/Chi2FCN.h index f83caedde519d..c72be93fb9f48 100644 --- a/math/mathcore/inc/Fit/Chi2FCN.h +++ b/math/mathcore/inc/Fit/Chi2FCN.h @@ -21,6 +21,8 @@ #include "Math/IParamFunction.h" #endif +#include "Math/IFunction.h" +#include "Math/IFunctionfwd.h" #ifndef ROOT_Fit_BinData #include "Fit/BinData.h" diff --git a/math/mathcore/inc/Math/TDataPoint.icc b/math/mathcore/inc/Math/TDataPoint.icc index 3f64270615758..128b69b53b18a 100644 --- a/math/mathcore/inc/Math/TDataPoint.icc +++ b/math/mathcore/inc/Math/TDataPoint.icc @@ -14,6 +14,8 @@ #ifndef ROOT_TDataPoint_ICC #define ROOT_TDataPoint_ICC +#include + namespace ROOT { namespace Math diff --git a/math/mathcore/src/BasicMinimizer.cxx b/math/mathcore/src/BasicMinimizer.cxx index fe3109bf087d6..9da39ea331c0a 100644 --- a/math/mathcore/src/BasicMinimizer.cxx +++ b/math/mathcore/src/BasicMinimizer.cxx @@ -14,6 +14,10 @@ #include "Math/IFunction.h" +#include "Math/IFunctionfwd.h" + +#include "Math/IParamFunctionfwd.h" + #include "Math/FitMethodFunction.h" #include "Math/MinimTransformFunction.h" diff --git a/math/mathcore/src/BinData.cxx b/math/mathcore/src/BinData.cxx index bf7eebbcef3c9..49f184295b29e 100644 --- a/math/mathcore/src/BinData.cxx +++ b/math/mathcore/src/BinData.cxx @@ -12,6 +12,7 @@ #include "Fit/BinData.h" #include "Math/Error.h" +#include "Math/IParamFunctionfwd.h" #include #include diff --git a/math/mathcore/src/BrentMethods.cxx b/math/mathcore/src/BrentMethods.cxx index df759d6e53ff9..608852cba68b6 100644 --- a/math/mathcore/src/BrentMethods.cxx +++ b/math/mathcore/src/BrentMethods.cxx @@ -10,6 +10,7 @@ #include "Math/BrentMethods.h" #include "Math/IFunction.h" +#include "Math/IFunctionfwd.h" #include #include diff --git a/math/mathcore/src/BrentMinimizer1D.cxx b/math/mathcore/src/BrentMinimizer1D.cxx index c89566e97fcde..464a0b28f18c3 100644 --- a/math/mathcore/src/BrentMinimizer1D.cxx +++ b/math/mathcore/src/BrentMinimizer1D.cxx @@ -30,6 +30,7 @@ #include "Math/BrentMinimizer1D.h" #include "Math/BrentMethods.h" #include "Math/IFunction.h" +#include "Math/IFunctionfwd.h" #ifndef ROOT_Math_Error #include "Math/Error.h" diff --git a/math/mathcore/src/BrentRootFinder.cxx b/math/mathcore/src/BrentRootFinder.cxx index 023968fb71e40..ba88751815292 100644 --- a/math/mathcore/src/BrentRootFinder.cxx +++ b/math/mathcore/src/BrentRootFinder.cxx @@ -10,6 +10,7 @@ #include "Math/BrentRootFinder.h" #include "Math/BrentMethods.h" +#include "Math/IFunctionfwd.h" #include #ifndef ROOT_Math_Error diff --git a/math/mathcore/src/Delaunay2D.cxx b/math/mathcore/src/Delaunay2D.cxx index 1e777a63af0e0..c4d4680443b44 100644 --- a/math/mathcore/src/Delaunay2D.cxx +++ b/math/mathcore/src/Delaunay2D.cxx @@ -12,6 +12,7 @@ // Implementation file for class Delaunay2D #include "Math/Delaunay2D.h" +#include "Rtypes.h" //#include @@ -22,6 +23,7 @@ #endif #include +#include namespace ROOT { diff --git a/math/mathcore/src/DistSampler.cxx b/math/mathcore/src/DistSampler.cxx index 7a4783d761683..fda11a95b929e 100644 --- a/math/mathcore/src/DistSampler.cxx +++ b/math/mathcore/src/DistSampler.cxx @@ -15,6 +15,7 @@ #include "Math/Error.h" #include "Math/IFunction.h" +#include "Math/IFunctionfwd.h" #include "Fit/BinData.h" #include "Fit/UnBinData.h" #include "Fit/DataRange.h" diff --git a/math/mathcore/src/FitUtil.cxx b/math/mathcore/src/FitUtil.cxx index 0f1253377c9ab..41be763461368 100644 --- a/math/mathcore/src/FitUtil.cxx +++ b/math/mathcore/src/FitUtil.cxx @@ -16,7 +16,9 @@ #include "Fit/UnBinData.h" //#include "Fit/BinPoint.h" +#include "Math/IFunctionfwd.h" #include "Math/IParamFunction.h" +#include "Math/IParamFunctionfwd.h" #include "Math/Integrator.h" #include "Math/IntegratorMultiDim.h" #include "Math/WrappedFunction.h" diff --git a/math/mathcore/src/Fitter.cxx b/math/mathcore/src/Fitter.cxx index 9aa0920bde318..c1eee2fa2fd87 100644 --- a/math/mathcore/src/Fitter.cxx +++ b/math/mathcore/src/Fitter.cxx @@ -17,10 +17,15 @@ #include "Fit/LogLikelihoodFCN.h" #include "Math/Minimizer.h" #include "Math/MinimizerOptions.h" +#include "Math/FitMethodFunction.h" +#include "Fit/BasicFCN.h" #include "Fit/BinData.h" #include "Fit/UnBinData.h" #include "Fit/FcnAdapter.h" +#include "Fit/FitConfig.h" +#include "Fit/FitResult.h" #include "Math/Error.h" +#include "TF1.h" #include diff --git a/math/mathcore/src/GaussIntegrator.cxx b/math/mathcore/src/GaussIntegrator.cxx index e561f100f99fb..fde29a120ac1e 100644 --- a/math/mathcore/src/GaussIntegrator.cxx +++ b/math/mathcore/src/GaussIntegrator.cxx @@ -9,7 +9,10 @@ **********************************************************************/ #include "Math/GaussIntegrator.h" +#include "Math/Error.h" #include "Math/IntegratorOptions.h" +#include "Math/IFunction.h" +#include "Math/IFunctionfwd.h" #include namespace ROOT { diff --git a/math/mathcore/src/GaussLegendreIntegrator.cxx b/math/mathcore/src/GaussLegendreIntegrator.cxx index 417aafb1b31c2..05c9004854c04 100644 --- a/math/mathcore/src/GaussLegendreIntegrator.cxx +++ b/math/mathcore/src/GaussLegendreIntegrator.cxx @@ -9,6 +9,10 @@ **********************************************************************/ #include "Math/GaussLegendreIntegrator.h" +#include "Math/Error.h" +#include "Math/IFunction.h" +#include "Math/IFunctionfwd.h" +#include "Math/IntegratorOptions.h" #include #include #include diff --git a/math/mathcore/src/GoFTest.cxx b/math/mathcore/src/GoFTest.cxx index 1bfb39e23a719..c3ff11890798f 100644 --- a/math/mathcore/src/GoFTest.cxx +++ b/math/mathcore/src/GoFTest.cxx @@ -19,8 +19,11 @@ #include "Math/Error.h" #include "Math/Math.h" +#include "Math/IFunction.h" +#include "Math/IFunctionfwd.h" #include "Math/Integrator.h" #include "Math/ProbFuncMathCore.h" +#include "Math/WrappedFunction.h" #include "Math/GoFTest.h" diff --git a/math/mathcore/src/MinimTransformFunction.cxx b/math/mathcore/src/MinimTransformFunction.cxx index 943d155824ed2..77fa6d7bb6cbe 100644 --- a/math/mathcore/src/MinimTransformFunction.cxx +++ b/math/mathcore/src/MinimTransformFunction.cxx @@ -11,6 +11,7 @@ // Implementation file for class MinimTransformFunction #include "Math/MinimTransformFunction.h" +#include "Math/IFunctionfwd.h" //#include #include diff --git a/math/mathcore/src/RichardsonDerivator.cxx b/math/mathcore/src/RichardsonDerivator.cxx index f842d6ba0938c..11eb66cbb6399 100644 --- a/math/mathcore/src/RichardsonDerivator.cxx +++ b/math/mathcore/src/RichardsonDerivator.cxx @@ -9,6 +9,7 @@ **********************************************************************/ #include "Math/RichardsonDerivator.h" +#include "Math/IFunctionfwd.h" #include #include diff --git a/math/mathcore/src/SparseData.cxx b/math/mathcore/src/SparseData.cxx index 2455e23cc0471..54c0eee4ad926 100644 --- a/math/mathcore/src/SparseData.cxx +++ b/math/mathcore/src/SparseData.cxx @@ -23,6 +23,7 @@ #include // #include "TMath.h" +#include "Fit/BinData.h" #include "Fit/SparseData.h" using namespace std; diff --git a/math/mathcore/src/UnBinData.cxx b/math/mathcore/src/UnBinData.cxx index f54023d2b13af..4868b6eb760be 100644 --- a/math/mathcore/src/UnBinData.cxx +++ b/math/mathcore/src/UnBinData.cxx @@ -11,6 +11,7 @@ // Implementation file for class UnBinData #include "Fit/UnBinData.h" +#include "Fit/DataVector.h" #include "Math/Error.h" #include diff --git a/math/minuit/src/TLinearMinimizer.cxx b/math/minuit/src/TLinearMinimizer.cxx index 666f9c93e876f..0c9516215cf8e 100644 --- a/math/minuit/src/TLinearMinimizer.cxx +++ b/math/minuit/src/TLinearMinimizer.cxx @@ -15,6 +15,8 @@ #include "TF1.h" #include "TUUID.h" #include "TROOT.h" +#include "Fit/BasicFCN.h" +#include "Fit/BinData.h" #include "Fit/Chi2FCN.h" #include "TLinearFitter.h" diff --git a/math/minuit2/src/SimplexBuilder.cxx b/math/minuit2/src/SimplexBuilder.cxx index 60fbea1447691..8b9cd56c54ca5 100644 --- a/math/minuit2/src/SimplexBuilder.cxx +++ b/math/minuit2/src/SimplexBuilder.cxx @@ -26,7 +26,7 @@ namespace ROOT { //#define DEBUG 1 class GradientCalculator; -jobsclass MnStrategy; +class MnStrategy; FunctionMinimum SimplexBuilder::Minimum(const MnFcn& mfcn, const GradientCalculator&, const MinimumSeed& seed, const MnStrategy&, unsigned int maxfcn, double minedm) const { // find the minimum using the Simplex method of Nelder and Mead (does not use function gradient) // method to find initial simplex is slightly different than in the orginal Fortran diff --git a/math/smatrix/inc/Math/BinaryOperators.h b/math/smatrix/inc/Math/BinaryOperators.h index e3347d4e07d30..e31da9cc45704 100644 --- a/math/smatrix/inc/Math/BinaryOperators.h +++ b/math/smatrix/inc/Math/BinaryOperators.h @@ -21,6 +21,7 @@ #ifndef ROOT_Math_BinaryOpPolicy #include "Math/BinaryOpPolicy.h" #endif +#include "Math/Expression.h" namespace ROOT { diff --git a/misc/table/inc/TGenericTable.h b/misc/table/inc/TGenericTable.h index 773e192d0bdfd..deac3e2abaed3 100644 --- a/misc/table/inc/TGenericTable.h +++ b/misc/table/inc/TGenericTable.h @@ -5,6 +5,7 @@ #define ROOT_TGenericTable #include "TTable.h" +#include "TTableDescriptor.h" ////////////////////////////////////////////////////////////////////////// // // diff --git a/misc/table/inc/TTable.h b/misc/table/inc/TTable.h index 3306eada271a7..8b4af7fb35b48 100644 --- a/misc/table/inc/TTable.h +++ b/misc/table/inc/TTable.h @@ -381,6 +381,5 @@ inline void TTable::Draw(Option_t *opt) //________________________________________________________________________________________________________________ inline UInt_t TTable::piterator::Column() const { return fCurrentColIndex;} #endif -#include "TTableDescriptor.h" #endif diff --git a/misc/table/src/TIndexTable.cxx b/misc/table/src/TIndexTable.cxx index 3cf7a4cf0827d..74f2a834690fb 100644 --- a/misc/table/src/TIndexTable.cxx +++ b/misc/table/src/TIndexTable.cxx @@ -12,6 +12,8 @@ #include "TIndexTable.h" +#include "TTableDescriptor.h" + ////////////////////////////////////////////////////////////////////////////// // TIndexTable class is helper class to keep the list of the referencs to the // TTable rows and iterate over it. diff --git a/net/http/inc/THttpServer.h b/net/http/inc/THttpServer.h index 512ffa776655e..390fa08aa8b30 100644 --- a/net/http/inc/THttpServer.h +++ b/net/http/inc/THttpServer.h @@ -16,6 +16,10 @@ #include "TMutex.h" #endif +#ifndef ROOT_TNamed +#include "TNamed.h" +#endif + #ifndef ROOT_THttpCallArg #include "THttpCallArg.h" #endif diff --git a/roofit/histfactory/inc/RooStats/HistFactory/HistFactoryNavigation.h b/roofit/histfactory/inc/RooStats/HistFactory/HistFactoryNavigation.h index d5eee88dfa980..578a3133247fc 100644 --- a/roofit/histfactory/inc/RooStats/HistFactory/HistFactoryNavigation.h +++ b/roofit/histfactory/inc/RooStats/HistFactory/HistFactoryNavigation.h @@ -10,10 +10,9 @@ #include "RooRealVar.h" #include "RooProduct.h" #include "RooStats/HistFactory/Measurement.h" -#include "RooStats/ModelConfig.h" - namespace RooStats { + class ModelConfig; namespace HistFactory { class HistFactoryNavigation { diff --git a/roofit/histfactory/src/HistFactoryNavigation.cxx b/roofit/histfactory/src/HistFactoryNavigation.cxx index 86c63e4789326..1ccd8b3eca8d2 100644 --- a/roofit/histfactory/src/HistFactoryNavigation.cxx +++ b/roofit/histfactory/src/HistFactoryNavigation.cxx @@ -15,6 +15,7 @@ #include "RooSimultaneous.h" #include "RooWorkspace.h" +#include "RooStats/ModelConfig.h" #include "RooStats/HistFactory/HistFactoryNavigation.h" #include "RooStats/HistFactory/HistFactoryException.h" diff --git a/roofit/histfactory/src/PiecewiseInterpolation.cxx b/roofit/histfactory/src/PiecewiseInterpolation.cxx index a64135f4ba45b..738c6c62f3e10 100644 --- a/roofit/histfactory/src/PiecewiseInterpolation.cxx +++ b/roofit/histfactory/src/PiecewiseInterpolation.cxx @@ -9,14 +9,13 @@ // END_HTML // -#include +#include "RooStats/HistFactory/PiecewiseInterpolation.h" + #include "RooFit.h" #include "Riostream.h" -#include "Riostream.h" -#include +#include "TBuffer.h" -#include "RooStats/HistFactory/PiecewiseInterpolation.h" #include "RooAbsReal.h" #include "RooAbsPdf.h" #include "RooErrorHandler.h" @@ -28,6 +27,9 @@ #include "RooNumIntConfig.h" #include "RooTrace.h" +#include +#include + using namespace std; ClassImp(PiecewiseInterpolation) diff --git a/roofit/roofitcore/src/RooAbsArg.cxx b/roofit/roofitcore/src/RooAbsArg.cxx index 55d7219735eb4..9221c7a04a65f 100644 --- a/roofit/roofitcore/src/RooAbsArg.cxx +++ b/roofit/roofitcore/src/RooAbsArg.cxx @@ -36,6 +36,7 @@ setting/clearing/testing named attributes. #include "RooFit.h" #include "Riostream.h" +#include "TBuffer.h" #include "TClass.h" #include "TObjString.h" #include "TVirtualStreamerInfo.h" diff --git a/roofit/roofitcore/src/RooBinning.cxx b/roofit/roofitcore/src/RooBinning.cxx index 786874e9df0b4..80fd6aab574e0 100644 --- a/roofit/roofitcore/src/RooBinning.cxx +++ b/roofit/roofitcore/src/RooBinning.cxx @@ -29,7 +29,6 @@ #include #include "RooFit.h" -#include "Riostream.h" #include "Riostream.h" #include "RooBinning.h" #include "RooDouble.h" @@ -37,6 +36,7 @@ #include "RooRealVar.h" #include "RooNumber.h" #include "RooMsgService.h" +#include "TBuffer.h" #include "TList.h" using namespace std; diff --git a/roofit/roofitcore/src/RooMinimizer.cxx b/roofit/roofitcore/src/RooMinimizer.cxx index 9f207b0699035..cdfb8d2c16eb6 100644 --- a/roofit/roofitcore/src/RooMinimizer.cxx +++ b/roofit/roofitcore/src/RooMinimizer.cxx @@ -53,6 +53,7 @@ #include "TH2.h" #include "TMarker.h" #include "TGraph.h" +#include "Fit/FitConfig.h" #include "TStopwatch.h" #include "TDirectory.h" #include "TMatrixDSym.h" diff --git a/tmva/tmva/inc/TMVA/NodekNN.h b/tmva/tmva/inc/TMVA/NodekNN.h index a08313bcd83d7..6d16d85e9a9e0 100644 --- a/tmva/tmva/inc/TMVA/NodekNN.h +++ b/tmva/tmva/inc/TMVA/NodekNN.h @@ -27,6 +27,7 @@ #define ROOT_TMVA_NodekNN // C++ +#include #include #include #include diff --git a/tmva/tmva/inc/TMVA/ROCCalc.h b/tmva/tmva/inc/TMVA/ROCCalc.h index 8f93f9926b63e..7f07adf2b4f54 100644 --- a/tmva/tmva/inc/TMVA/ROCCalc.h +++ b/tmva/tmva/inc/TMVA/ROCCalc.h @@ -1,5 +1,8 @@ #ifndef ROOT_TMVA_ROCCalc #define ROOT_TMVA_ROCCalc + +#include "RtypesCore.h" + #include #include #include @@ -9,6 +12,7 @@ class TList; class TTree; class TString; class TH1; +class TH1D; class TH2; class TH2F; class TSpline; diff --git a/tmva/tmva/src/MethodBase.cxx b/tmva/tmva/src/MethodBase.cxx index a29e68b4da618..1593bbff5927d 100644 --- a/tmva/tmva/src/MethodBase.cxx +++ b/tmva/tmva/src/MethodBase.cxx @@ -84,6 +84,8 @@ #include "TSpline.h" #include "TMatrix.h" #include "TMath.h" +#include "TH1F.h" +#include "TH2F.h" #include "TFile.h" #include "TKey.h" #include "TGraph.h" diff --git a/tmva/tmva/src/MethodBoost.cxx b/tmva/tmva/src/MethodBoost.cxx index 8dbb372cf97b8..5019ca951aedd 100644 --- a/tmva/tmva/src/MethodBoost.cxx +++ b/tmva/tmva/src/MethodBoost.cxx @@ -47,6 +47,7 @@ #include "TMath.h" #include "TObjString.h" #include "TH1F.h" +#include "TH2F.h" #include "TGraph.h" #include "TSpline.h" #include "TDirectory.h" diff --git a/tmva/tmva/src/ModulekNN.cxx b/tmva/tmva/src/ModulekNN.cxx index f24d15ae4aa5f..cb94fa453eda6 100644 --- a/tmva/tmva/src/ModulekNN.cxx +++ b/tmva/tmva/src/ModulekNN.cxx @@ -33,6 +33,7 @@ #include #include "TMath.h" +#include "TRandom3.h" // TMVA #include "TMVA/MsgLogger.h" diff --git a/tmva/tmva/src/ResultsRegression.cxx b/tmva/tmva/src/ResultsRegression.cxx index 060a8e8176b06..3ed3c7f9b6028 100644 --- a/tmva/tmva/src/ResultsRegression.cxx +++ b/tmva/tmva/src/ResultsRegression.cxx @@ -34,6 +34,7 @@ #include "TMVA/VariableInfo.h" #include "TH1F.h" +#include "TH2F.h" #include "TString.h" #include diff --git a/tmva/tmva/src/VariableGaussTransform.cxx b/tmva/tmva/src/VariableGaussTransform.cxx index 6bcad8d161687..c2cfc559ab578 100644 --- a/tmva/tmva/src/VariableGaussTransform.cxx +++ b/tmva/tmva/src/VariableGaussTransform.cxx @@ -43,6 +43,7 @@ #include "TMVA/Version.h" #include "TCanvas.h" +#include "TGraph.h" #include "TH1F.h" #include "TMath.h" #include "TVectorF.h" diff --git a/tree/treeplayer/inc/TTreeGeneratorBase.h b/tree/treeplayer/inc/TTreeGeneratorBase.h index 256cca9939cc3..ea8cee226b047 100644 --- a/tree/treeplayer/inc/TTreeGeneratorBase.h +++ b/tree/treeplayer/inc/TTreeGeneratorBase.h @@ -33,6 +33,7 @@ class TBranchElement; class TClass; class TStreamerElement; class TTree; +class TVirtualStreamerInfo; namespace ROOT { namespace Internal { diff --git a/tree/treeplayer/src/TTreePlayer.cxx b/tree/treeplayer/src/TTreePlayer.cxx index 8a2b21a3e664d..d9fee87849832 100644 --- a/tree/treeplayer/src/TTreePlayer.cxx +++ b/tree/treeplayer/src/TTreePlayer.cxx @@ -79,6 +79,7 @@ extra libraries (Histogram, display, etc). #include "HFitInterface.h" #include "Foption.h" +#include "Fit/DataVector.h" #include "Fit/UnBinData.h" #include "Math/MinimizerOptions.h"