diff --git a/bindings/pyroot/inc/TPyArg.h b/bindings/pyroot/inc/TPyArg.h
index bebe58a78b3bb403502b5c008744bd3ea373664f..888b08d05ef9a12c582048b742b625f4a3e85740 100644
--- a/bindings/pyroot/inc/TPyArg.h
+++ b/bindings/pyroot/inc/TPyArg.h
@@ -14,9 +14,7 @@
// ROOT
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
// Python
struct _object;
diff --git a/bindings/pyroot/inc/TPyDispatcher.h b/bindings/pyroot/inc/TPyDispatcher.h
index dec4ae3092c311463c9c1cc7441f6a1b226b8f42..2a5d993ade7a57a8039e513a662fa62a15f4c8c8 100644
--- a/bindings/pyroot/inc/TPyDispatcher.h
+++ b/bindings/pyroot/inc/TPyDispatcher.h
@@ -13,9 +13,7 @@
// ROOT
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TDNDData;
class TEveDigitSet;
diff --git a/bindings/pyroot/inc/TPyException.h b/bindings/pyroot/inc/TPyException.h
index f4a23684c50ea47e1b87a963ca53ed9d746e00c1..a51a0236f6f5d8e94be215d474545a0c1f6a8f4b 100644
--- a/bindings/pyroot/inc/TPyException.h
+++ b/bindings/pyroot/inc/TPyException.h
@@ -30,12 +30,8 @@
//////////////////////////////////////////////////////////////////////////////
// ROOT
-#ifndef ROOT_DllImport
#include "DllImport.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
// Standard
#include <exception>
diff --git a/bindings/pyroot/inc/TPyFitFunction.h b/bindings/pyroot/inc/TPyFitFunction.h
index d1f209baae3b7a1b9d6106df101257cce85c2ab4..ad0ae03447a8082b1b5b3a67d9b6e33e4e5dae3f 100644
--- a/bindings/pyroot/inc/TPyFitFunction.h
+++ b/bindings/pyroot/inc/TPyFitFunction.h
@@ -13,12 +13,8 @@
//- ROOT
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
// Python
struct _object;
diff --git a/bindings/pyroot/inc/TPyROOTApplication.h b/bindings/pyroot/inc/TPyROOTApplication.h
index 86ba274a3629b635d8dab21a67623702756baf8c..05a27c05469c6f3ca87acc7d1971ea15586dae18 100644
--- a/bindings/pyroot/inc/TPyROOTApplication.h
+++ b/bindings/pyroot/inc/TPyROOTApplication.h
@@ -13,9 +13,7 @@
// ROOT
-#ifndef ROOT_TApplication
#include "TApplication.h"
-#endif
namespace PyROOT {
diff --git a/bindings/pyroot/inc/TPyReturn.h b/bindings/pyroot/inc/TPyReturn.h
index 0c9e467d875ddbbe07a4b9a815fce8776fed7710..62d166e74ce7b860b9614b99647b8828f4276b7a 100644
--- a/bindings/pyroot/inc/TPyReturn.h
+++ b/bindings/pyroot/inc/TPyReturn.h
@@ -14,9 +14,7 @@
// ROOT
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
// Python
struct _object;
diff --git a/bindings/pyroot/inc/TPySelector.h b/bindings/pyroot/inc/TPySelector.h
index e16135b6a8e0893c8607e60eb6a26c2146b5ea4c..59476184486826949d4973dc1b294b1c6460d4a5 100644
--- a/bindings/pyroot/inc/TPySelector.h
+++ b/bindings/pyroot/inc/TPySelector.h
@@ -13,13 +13,9 @@
//- ROOT
-#ifndef ROOT_TSelector
#include "TSelector.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
// Python
struct _object;
diff --git a/bindings/pyroot/inc/TPython.h b/bindings/pyroot/inc/TPython.h
index 6bbc278e208421f9b22e2f5eb5eeaa071c126364..6972d291f36db15c267045d3fede74cc258c1766 100644
--- a/bindings/pyroot/inc/TPython.h
+++ b/bindings/pyroot/inc/TPython.h
@@ -17,9 +17,7 @@
#include "TPyReturn.h"
// ROOT
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TPython {
diff --git a/bindings/pyroot/src/TPyClassGenerator.h b/bindings/pyroot/src/TPyClassGenerator.h
index a5bbbab03452e62abb24131770183c65a68a1c6c..6e8f3e6b91d0f944865bb2d828f4a5221ce65cb8 100644
--- a/bindings/pyroot/src/TPyClassGenerator.h
+++ b/bindings/pyroot/src/TPyClassGenerator.h
@@ -5,9 +5,7 @@
#define ROOT_TPyClassGenerator
// ROOT
-#ifndef ROOT_TClassGenerator
#include "TClassGenerator.h"
-#endif
class TPyClassGenerator : public TClassGenerator {
diff --git a/bindings/r/inc/RExports.h b/bindings/r/inc/RExports.h
index 5b57a2b719c0d58f6e038366498c787eaf88f4b4..262c736fb3d9e945cd31a0c5102e5b6cc8044120 100644
--- a/bindings/r/inc/RExports.h
+++ b/bindings/r/inc/RExports.h
@@ -12,33 +12,19 @@
#ifndef ROOT_R_RExports
#define ROOT_R_RExports
//ROOT headers
-#ifndef ROOT_Rtypes
-#include<Rtypes.h>
-#endif
+#include <Rtypes.h>
-#ifndef ROOT_TString
-#include<TString.h>
-#endif
+#include <TString.h>
-#ifndef ROOT_TVector
-#include<TVector.h>
-#endif
+#include <TVector.h>
-#ifndef ROOT_TMatrixT
-#include<TMatrixT.h>
-#endif
+#include <TMatrixT.h>
-#ifndef ROOT_TArrayD
-#include<TArrayD.h>
-#endif
+#include <TArrayD.h>
-#ifndef ROOT_TArrayF
-#include<TArrayF.h>
-#endif
+#include <TArrayF.h>
-#ifndef ROOT_TArrayI
-#include<TArrayI.h>
-#endif
+#include <TArrayI.h>
//std headers
#include<string>
diff --git a/bindings/r/inc/TRDataFrame.h b/bindings/r/inc/TRDataFrame.h
index 2aef6b3617cc9847e58ac7350bfec2695e363c47..76fd593ae61013f436ecb3842fff63ea26683b6c 100644
--- a/bindings/r/inc/TRDataFrame.h
+++ b/bindings/r/inc/TRDataFrame.h
@@ -12,17 +12,11 @@
#ifndef ROOT_R_TRDataFrame
#define ROOT_R_TRDataFrame
-#ifndef ROOT_R_RExports
-#include<RExports.h>
-#endif
+#include <RExports.h>
-#ifndef ROOT_R_TRObject
-#include<TRObject.h>
-#endif
+#include <TRObject.h>
-#ifndef ROOT_R_TRFunctionImport
-#include<TRFunctionImport.h>
-#endif
+#include <TRFunctionImport.h>
namespace ROOT {
diff --git a/bindings/r/inc/TRFunctionExport.h b/bindings/r/inc/TRFunctionExport.h
index 406158e79991e959efcfe5e61d2f47ba000c268c..9c1ccba62554a4af32f37112ade143acaa85440e 100644
--- a/bindings/r/inc/TRFunctionExport.h
+++ b/bindings/r/inc/TRFunctionExport.h
@@ -12,9 +12,7 @@
#ifndef ROOT_R_TRFunctionExport
#define ROOT_R_TRFunctionExport
-#ifndef ROOT_R_TRInternalFunction
-#include<TRInternalFunction.h>
-#endif
+#include <TRInternalFunction.h>
namespace ROOT {
diff --git a/bindings/r/inc/TRFunctionImport.h b/bindings/r/inc/TRFunctionImport.h
index 8d13a21a9dbf52044458c5a56f37c9e1581e6f03..a6ad580aa3eb661010421dca64a91c13b26025c6 100644
--- a/bindings/r/inc/TRFunctionImport.h
+++ b/bindings/r/inc/TRFunctionImport.h
@@ -13,13 +13,9 @@
#define ROOT_R_TRFunctionImport
-#ifndef ROOT_R_RExports
-#include<RExports.h>
-#endif
+#include <RExports.h>
-#ifndef ROOT_R_TRObject
-#include<TRObject.h>
-#endif
+#include <TRObject.h>
#ifndef Rcpp_hpp
#include <Rcpp.h>
diff --git a/bindings/r/inc/TRInterface.h b/bindings/r/inc/TRInterface.h
index 68b793623ea4210748160ac31a397e5827577c8b..cf12a7b11ff0bacd28fbe04b84124d69e0fd2b7d 100644
--- a/bindings/r/inc/TRInterface.h
+++ b/bindings/r/inc/TRInterface.h
@@ -12,25 +12,15 @@
#ifndef ROOT_R_TRInterface
#define ROOT_R_TRInterface
-#ifndef ROOT_R_TRObject
-#include<TRObject.h>
-#endif
+#include <TRObject.h>
-#ifndef ROOT_R_TRDataFrame
-#include<TRDataFrame.h>
-#endif
+#include <TRDataFrame.h>
-#ifndef ROOT_R_TFunctionExport
-#include<TRFunctionExport.h>
-#endif
+#include <TRFunctionExport.h>
-#ifndef ROOT_R_TFunctionImport
-#include<TRFunctionImport.h>
-#endif
+#include <TRFunctionImport.h>
-#ifndef ROOT_TThread
-#include<TThread.h>
-#endif
+#include <TThread.h>
/**
@namespace ROOT::R
diff --git a/bindings/r/inc/TRInternalFunction.h b/bindings/r/inc/TRInternalFunction.h
index db366bb8e637d814584fc0fc0b43935e61363d97..6b24d504356afe29ca81cbb6b934df62f773904c 100644
--- a/bindings/r/inc/TRInternalFunction.h
+++ b/bindings/r/inc/TRInternalFunction.h
@@ -12,9 +12,7 @@
#ifndef ROOT_R_TRInternalFunction
#define ROOT_R_TRInternalFunction
-#ifndef ROOT_R_RExports
-#include<RExports.h>
-#endif
+#include <RExports.h>
#ifndef Rcpp_hpp
#include <Rcpp.h>
diff --git a/bindings/r/inc/TRObject.h b/bindings/r/inc/TRObject.h
index 04697f92d4ba714aea02c0786a312523abc83009..35f3b98ba763fb85bda97aa1671c63162cc07bd7 100644
--- a/bindings/r/inc/TRObject.h
+++ b/bindings/r/inc/TRObject.h
@@ -11,9 +11,7 @@
#ifndef ROOT_R_TRObject
#define ROOT_R_TRObject
-#ifndef ROOT_R_RExports
-#include<RExports.h>
-#endif
+#include <RExports.h>
namespace ROOT {
diff --git a/bindings/r/src/TRCompletion.h b/bindings/r/src/TRCompletion.h
index 73f929e1c38f016e1360a7b77d28f50a22009106..fc9e1bd5069f0e40a2eaec2fcc1940e15aef953d 100644
--- a/bindings/r/src/TRCompletion.h
+++ b/bindings/r/src/TRCompletion.h
@@ -4,9 +4,7 @@
#ifndef ROOT_R_TRCompletion
#define ROOT_R_TRCompletion
-#ifndef ROOT_R_RExports
-#include<RExports.h>
-#endif
+#include <RExports.h>
#if !defined(_READLINE_H_)
diff --git a/bindings/r/src/TRFunctionImport.cxx b/bindings/r/src/TRFunctionImport.cxx
index fb8c142a889397dd463a0e622391fe40d4f975e8..5a45017c83c2b6cc4a8141437dd2aec9e865b7e2 100644
--- a/bindings/r/src/TRFunctionImport.cxx
+++ b/bindings/r/src/TRFunctionImport.cxx
@@ -8,9 +8,7 @@
#include<TRFunctionImport.h>
#include <TRObject.h>
-#ifndef Rcpp_Function_h
-#include<Rcpp/Function.h>
-#endif
+#include <Rcpp/Function.h>
//______________________________________________________________________________
/* Begin_Html
diff --git a/bindings/ruby/inc/TRuby.h b/bindings/ruby/inc/TRuby.h
index 92a83aa02f6c66cbf448698a22a1428769363732..83de3862bf54bb8f069309f1ce0eba69997fd154 100644
--- a/bindings/ruby/inc/TRuby.h
+++ b/bindings/ruby/inc/TRuby.h
@@ -4,9 +4,7 @@
#ifndef ROOT_TRuby
#define ROOT_TRuby
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TRuby {
diff --git a/core/base/inc/Bytes.h b/core/base/inc/Bytes.h
index 8235e5cbb0e183603c62b11c3f004809eecc7f1c..00379494fffc860d3f2a0bbb14c6ea6f8cb5f189 100644
--- a/core/base/inc/Bytes.h
+++ b/core/base/inc/Bytes.h
@@ -32,9 +32,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#ifndef __CINT__
#include <string.h>
diff --git a/core/base/inc/GuiTypes.h b/core/base/inc/GuiTypes.h
index c4e596f2e755522b906cc0247e2cdb17a34bf005..2a291d2b840fa4440187e7bdf7865aad9116c0a3 100644
--- a/core/base/inc/GuiTypes.h
+++ b/core/base/inc/GuiTypes.h
@@ -19,9 +19,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
// Basic GUI types
typedef ULong_t Handle_t; //Generic resource handle
diff --git a/core/base/inc/KeySymbols.h b/core/base/inc/KeySymbols.h
index b8446de199d90823dd564e2b4bb730fc576f53ab..f8d0815584c84ac609549f9cd07f7bb6ce0d10b4 100644
--- a/core/base/inc/KeySymbols.h
+++ b/core/base/inc/KeySymbols.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
enum EKeySym {
kKey_Escape = 0x1000, // misc keys
diff --git a/core/base/inc/RConfig.h b/core/base/inc/RConfig.h
index f6f32a0373eefbb06c0babb28cb0033a037cb683..f67b5de901692a58ff34e5c8c15a7e0c93658c74 100644
--- a/core/base/inc/RConfig.h
+++ b/core/base/inc/RConfig.h
@@ -19,9 +19,7 @@
* *
*************************************************************************/
-#ifndef ROOT_RVersion
#include "RVersion.h"
-#endif
/*---- new C++ features ------------------------------------------------------*/
diff --git a/core/base/inc/RStipples.h b/core/base/inc/RStipples.h
index c4fcf45c615a26779f7cca19d9f4a849c0c8f737..bb44e7681c6a1c9ddede004b61d6772c661338a1 100644
--- a/core/base/inc/RStipples.h
+++ b/core/base/inc/RStipples.h
@@ -11,9 +11,7 @@
#ifndef ROOT_Stipples
#define ROOT_Stipples
-#ifndef ROOT_RConfig
#include "RConfig.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/core/base/inc/Rstrstream.h b/core/base/inc/Rstrstream.h
index cfefd45f03c1f004f16371423d9693a0a0661bdb..6ac19ab5ef45692689703741fedffa7a26c49932 100644
--- a/core/base/inc/Rstrstream.h
+++ b/core/base/inc/Rstrstream.h
@@ -12,9 +12,7 @@
#ifndef ROOT_Rstrstream
#define ROOT_Rstrstream
-#ifndef ROOT_RConfig
#include "RConfig.h"
-#endif
#if defined(R__ANSISTREAM)
# if defined(R__SSTREAM)
diff --git a/core/base/inc/Rtypes.h b/core/base/inc/Rtypes.h
index 75afb731e147419e8e271c0600031494720e6f74..bbd299d915eac4e201a90de587f688e914e59781 100644
--- a/core/base/inc/Rtypes.h
+++ b/core/base/inc/Rtypes.h
@@ -20,12 +20,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_RtypesCore
#include "RtypesCore.h"
-#endif
-#ifndef ROOT_DllImport
#include "DllImport.h"
-#endif
#include "snprintf.h" // part of stdio.h on systems that have it
#include "strlcpy.h" // part of string.h on systems that have it
@@ -186,13 +182,8 @@ namespace ROOT {
// The macros below use TGenericClassInfo and TInstrumentedIsAProxy, so let's
// ensure they are included.
-#ifndef ROOT_TGenericClassInfo
#include "TGenericClassInfo.h"
-#endif
-#ifndef ROOT_TIsAProxy
#include "TIsAProxy.h"
-#endif
-
typedef std::atomic<TClass*> atomic_TClass_ptr;
diff --git a/core/base/inc/RtypesCore.h b/core/base/inc/RtypesCore.h
index 157eb43b3dc42caf6bd82afa1a39d8cdd0368fce..9727a3eaf8a2111155d22a16cd7efb41ac73694c 100644
--- a/core/base/inc/RtypesCore.h
+++ b/core/base/inc/RtypesCore.h
@@ -20,9 +20,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_RConfig
#include "RConfig.h"
-#endif
#include <stddef.h>
diff --git a/core/base/inc/Strlen.h b/core/base/inc/Strlen.h
index 5c62ce28ca992feeccb061768405a47a68079920..80ee8434f4742d6c718509f417bc3737668347f6 100644
--- a/core/base/inc/Strlen.h
+++ b/core/base/inc/Strlen.h
@@ -11,9 +11,7 @@
#ifndef ROOT_Strlen
#define ROOT_Strlen
-#ifndef ROOT_RConfig
#include "RConfig.h"
-#endif
#ifdef NEED_STRING
#include <string.h>
diff --git a/core/base/inc/TApplication.h b/core/base/inc/TApplication.h
index 1413f70eabf9a01b091967b3cc443d8120ebf430..f6e52c7c8051b4f734430bb2fe7fb65c46ca92fd 100644
--- a/core/base/inc/TApplication.h
+++ b/core/base/inc/TApplication.h
@@ -25,17 +25,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
-#ifndef ROOT_TApplicationImp
#include "TApplicationImp.h"
-#endif
class TObjArray;
class TTimer;
diff --git a/core/base/inc/TApplicationImp.h b/core/base/inc/TApplicationImp.h
index 65e6b4f543b7e544d3cd8f41a6f33f935c74ab04..49875f2853e27afd10fe418244f2d8774017fc92 100644
--- a/core/base/inc/TApplicationImp.h
+++ b/core/base/inc/TApplicationImp.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TGWin32Command;
diff --git a/core/base/inc/TAtt3D.h b/core/base/inc/TAtt3D.h
index c9bafde9b270a20478a5a1b2e6c0b5d225743697..174b378618e5229789a92ac1da240b81f5d83809 100644
--- a/core/base/inc/TAtt3D.h
+++ b/core/base/inc/TAtt3D.h
@@ -13,9 +13,7 @@
#define ROOT_TAtt3D
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TAtt3D {
diff --git a/core/base/inc/TAttAxis.h b/core/base/inc/TAttAxis.h
index 618f83070c9505eabd2e779e6f571bae39cc44fb..215d67996611142358a418ebab80fd55d1e04fa6 100644
--- a/core/base/inc/TAttAxis.h
+++ b/core/base/inc/TAttAxis.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TAttAxis
#define ROOT_TAttAxis
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TAttAxis {
diff --git a/core/base/inc/TAttBBox.h b/core/base/inc/TAttBBox.h
index d8f0258cc87a24a8cad25525c40fca8bfa42c642..9e300fd045f61db741c8252fd305ea5c2712e7a3 100644
--- a/core/base/inc/TAttBBox.h
+++ b/core/base/inc/TAttBBox.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TAttBBox
#define ROOT_TAttBBox
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TAttBBox
{
diff --git a/core/base/inc/TAttBBox2D.h b/core/base/inc/TAttBBox2D.h
index 9385749d2a401aed3e5fa34e1768906386a5c2bb..2fe81da56556480410264fff80fa837a7606e6ba 100644
--- a/core/base/inc/TAttBBox2D.h
+++ b/core/base/inc/TAttBBox2D.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TAttBBox2D
#define ROOT_TAttBBox2D
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TPoint;
class TAttBBox2D {
diff --git a/core/base/inc/TAttFill.h b/core/base/inc/TAttFill.h
index f390514e460567731a04e20099a31cff86b1ab97..37c6ad0ff5357b5fff96c34da06418864d7b2ccb 100644
--- a/core/base/inc/TAttFill.h
+++ b/core/base/inc/TAttFill.h
@@ -13,9 +13,7 @@
#define ROOT_TAttFill
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TAttFill {
diff --git a/core/base/inc/TAttLine.h b/core/base/inc/TAttLine.h
index 0ac5b302631bb49615c3f4b50b475257d8ef5950..c1b0b9bdea638a88803b9f253ea4f46051966681 100644
--- a/core/base/inc/TAttLine.h
+++ b/core/base/inc/TAttLine.h
@@ -13,9 +13,7 @@
#define ROOT_TAttLine
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TAttLine {
diff --git a/core/base/inc/TAttMarker.h b/core/base/inc/TAttMarker.h
index e4797e14492e0dda7fdb79ef76294dfe30938671..9299b0c6e46f9f7ca223b78a231bd05b55dc4379 100644
--- a/core/base/inc/TAttMarker.h
+++ b/core/base/inc/TAttMarker.h
@@ -13,9 +13,7 @@
#define ROOT_TAttMarker
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TAttMarker {
diff --git a/core/base/inc/TAttPad.h b/core/base/inc/TAttPad.h
index e018d997044521073211b3d70f9160ca768c73ca..57f2d1fb1db38fc933834b7db5fcce38f73b61b7 100644
--- a/core/base/inc/TAttPad.h
+++ b/core/base/inc/TAttPad.h
@@ -13,9 +13,7 @@
#define ROOT_TAttPad
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TAttPad {
diff --git a/core/base/inc/TAttText.h b/core/base/inc/TAttText.h
index 463c1ca6d416ef5ea7d144c1897e73e8c6aa21fb..95b31bd5734cc56a31f258d3a38383952d4d83c9 100644
--- a/core/base/inc/TAttText.h
+++ b/core/base/inc/TAttText.h
@@ -13,9 +13,7 @@
#define ROOT_TAttText
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TAttText {
diff --git a/core/base/inc/TBase64.h b/core/base/inc/TBase64.h
index 59d6f4d2e32c9fb902f1dcedcdf875b7d0a7ebba..1609fe29aadea818973a51af56638fd102bee75e 100644
--- a/core/base/inc/TBase64.h
+++ b/core/base/inc/TBase64.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TBase64 {
diff --git a/core/base/inc/TBenchmark.h b/core/base/inc/TBenchmark.h
index 6633a77284a01867c1a5ee668378dd482128c79f..4b75bf6fa763a03a60712b040fbc86c3fd7a9ca2 100644
--- a/core/base/inc/TBenchmark.h
+++ b/core/base/inc/TBenchmark.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TStopwatch
#include "TStopwatch.h"
-#endif
class TBenchmark : public TNamed {
diff --git a/core/base/inc/TBrowser.h b/core/base/inc/TBrowser.h
index 4e0f7e1f71839967e379f48e06e45899dfebdb04..aa378eda18c594a4ef59dd62d55625938ed84d40 100644
--- a/core/base/inc/TBrowser.h
+++ b/core/base/inc/TBrowser.h
@@ -26,12 +26,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TBrowserImp
#include "TBrowserImp.h"
-#endif
class TContextMenu;
diff --git a/core/base/inc/TBrowserImp.h b/core/base/inc/TBrowserImp.h
index 63fecf075864abff5eaf4aa0448a88dd866f42b1..66ac894c158cf593f7c4200492f84371ed5d9ae1 100644
--- a/core/base/inc/TBrowserImp.h
+++ b/core/base/inc/TBrowserImp.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TBrowser;
class TGMainFrame;
diff --git a/core/base/inc/TBuffer.h b/core/base/inc/TBuffer.h
index f907118f7db01415297fe6743310c2ca1c463367..9791d038358611ff5a6cc45879b88750b94df580 100644
--- a/core/base/inc/TBuffer.h
+++ b/core/base/inc/TBuffer.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
#include <vector>
diff --git a/core/base/inc/TBuffer3D.h b/core/base/inc/TBuffer3D.h
index 7fb5f6ff8393556532a77724b2a2f889504523ab..4fee42431d8118ea2f0d3de88d91f751014fadab 100644
--- a/core/base/inc/TBuffer3D.h
+++ b/core/base/inc/TBuffer3D.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TBuffer3D
#define ROOT_TBuffer3D
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TBuffer3D : public TObject
{
diff --git a/core/base/inc/TCanvasImp.h b/core/base/inc/TCanvasImp.h
index a5086dc13809dfb6833aab997c3684c710c9a5c7..8e624db5b5706342f250899e17b51f067ab7862f 100644
--- a/core/base/inc/TCanvasImp.h
+++ b/core/base/inc/TCanvasImp.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TCanvas;
diff --git a/core/base/inc/TColor.h b/core/base/inc/TColor.h
index b304059bb9cb017e22cd6dabeec2e85fd87d1ff8..6f9d5c925a74634c9bfa2d39f1dfb4d844e3a9cf 100644
--- a/core/base/inc/TColor.h
+++ b/core/base/inc/TColor.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TColor
#define ROOT_TColor
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TArrayI
#include "TArrayI.h"
-#endif
class TColor : public TNamed {
diff --git a/core/base/inc/TColorGradient.h b/core/base/inc/TColorGradient.h
index 35d7111f2064993325ce8d61762798dba506c263..ec49d830d6297a8a4c92689c6cef43d1d7e4cbce 100644
--- a/core/base/inc/TColorGradient.h
+++ b/core/base/inc/TColorGradient.h
@@ -27,13 +27,9 @@
#include <vector>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TColor
#include "TColor.h"
-#endif
class TColorGradient : public TColor {
diff --git a/core/base/inc/TContextMenu.h b/core/base/inc/TContextMenu.h
index 601104168c88d4ca0e95bfac39ab17ac6289420b..4215dd544b076323da34d78ad8e46455085b5691 100644
--- a/core/base/inc/TContextMenu.h
+++ b/core/base/inc/TContextMenu.h
@@ -23,13 +23,9 @@
// //
////////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TContextMenuImp
#include "TContextMenuImp.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TMethod;
class TFunction;
diff --git a/core/base/inc/TContextMenuImp.h b/core/base/inc/TContextMenuImp.h
index f75fc173715e020d568c600d0f5a45e8287136c1..c0ede90b473781e049c8d76fae382e6f9bdeefec 100644
--- a/core/base/inc/TContextMenuImp.h
+++ b/core/base/inc/TContextMenuImp.h
@@ -22,9 +22,7 @@
// //
////////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TContextMenu;
class TObject;
diff --git a/core/base/inc/TControlBarImp.h b/core/base/inc/TControlBarImp.h
index 67c7b97287c5d09de69113b289bad81b7011a799..4d467bd31c9a3ffee04202c69b13f926d4fd49d6 100644
--- a/core/base/inc/TControlBarImp.h
+++ b/core/base/inc/TControlBarImp.h
@@ -21,9 +21,7 @@
// //
////////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TControlBar;
diff --git a/core/base/inc/TDatime.h b/core/base/inc/TDatime.h
index 0cff74080644844721af4ed15fb53a598407cd78..cffd64ce1f81492f32ab45caa9eee31686c39376 100644
--- a/core/base/inc/TDatime.h
+++ b/core/base/inc/TDatime.h
@@ -31,9 +31,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TDatime {
diff --git a/core/base/inc/TDirectory.h b/core/base/inc/TDirectory.h
index cb52d6ff2e4e38e06cea1e1d3a0db04fe10deb64..f47851e1b1fcfb653ea321b528c3fded09d94eea 100644
--- a/core/base/inc/TDirectory.h
+++ b/core/base/inc/TDirectory.h
@@ -21,21 +21,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBuffer
#include "TBuffer.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TDatime
#include "TDatime.h"
-#endif
-#ifndef ROOT_TUUID
#include "TUUID.h"
-#endif
class TBrowser;
class TKey;
diff --git a/core/base/inc/TEnv.h b/core/base/inc/TEnv.h
index ea11469f3976e5ce63472f23fd3d56774bfb647d..4f968ef77f347d3e945ef3e41dfac41642eeddbf 100644
--- a/core/base/inc/TEnv.h
+++ b/core/base/inc/TEnv.h
@@ -58,12 +58,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class THashList;
class TEnv;
diff --git a/core/base/inc/TError.h b/core/base/inc/TError.h
index 1e1ca6a113d1e825d71f3bbb8b6415ae4c37616a..1e924b6f282c300866cb754fd6ff11870d3a4c8b 100644
--- a/core/base/inc/TError.h
+++ b/core/base/inc/TError.h
@@ -26,9 +26,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <stdarg.h>
diff --git a/core/base/inc/TException.h b/core/base/inc/TException.h
index f1095de46d326324a7d7818e5490da7f589e9ecd..162cd4dd441f9499e8a35a6e7580b22867118df1 100644
--- a/core/base/inc/TException.h
+++ b/core/base/inc/TException.h
@@ -29,12 +29,8 @@ struct sigjmp_buf;
struct jmp_buf;
#endif
-#ifndef ROOT_RConfig
#include "RConfig.h"
-#endif
-#ifndef ROOT_DllImport
#include "DllImport.h"
-#endif
struct ExceptionContext_t {
#ifdef NEED_SIGJMP
diff --git a/core/base/inc/TExec.h b/core/base/inc/TExec.h
index fb4de4fb51c02de6fb588df4d00b9938bf568266..f8a543514d2eeef0f669eba48b4a7ec9727112eb 100644
--- a/core/base/inc/TExec.h
+++ b/core/base/inc/TExec.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TExec : public TNamed {
diff --git a/core/base/inc/TFileCollection.h b/core/base/inc/TFileCollection.h
index efdf1860f25f245d54af17bf775a284efbc6f37f..3efbcaa1a22fec6b3b873f696b5f85c8dac53b13 100644
--- a/core/base/inc/TFileCollection.h
+++ b/core/base/inc/TFileCollection.h
@@ -23,13 +23,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class THashList;
class TMap;
diff --git a/core/base/inc/TFileInfo.h b/core/base/inc/TFileInfo.h
index 86b10654a84db86ce168848ad9e7562167aecdc3..3653b35ce812a4241dfdff9113d834ea11fce920 100644
--- a/core/base/inc/TFileInfo.h
+++ b/core/base/inc/TFileInfo.h
@@ -20,29 +20,17 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_Turl
#include "TUrl.h"
-#endif
-#ifndef ROOT_TUUID
#include "TUUID.h"
-#endif
-#ifndef ROOT_TMD5
#include "TMD5.h"
-#endif
-#ifndef ROOT_TObjString
#include "TObjString.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TFileInfoMeta;
diff --git a/core/base/inc/TFolder.h b/core/base/inc/TFolder.h
index daf4cce63fa219c5b121b8c09d1465170c9d2601..ffd0aa74436f06ab45b86103fa4747a2244fef2c 100644
--- a/core/base/inc/TFolder.h
+++ b/core/base/inc/TFolder.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TCollection;
class TBrowser;
diff --git a/core/base/inc/TGuiFactory.h b/core/base/inc/TGuiFactory.h
index 878cc508df5103bd9ce040d68078b7414a07fbb2..1c8fc15eb502c7faa7a16f52bdb53f1686b4eb5e 100644
--- a/core/base/inc/TGuiFactory.h
+++ b/core/base/inc/TGuiFactory.h
@@ -25,9 +25,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TApplicationImp;
class TCanvasImp;
diff --git a/core/base/inc/TInetAddress.h b/core/base/inc/TInetAddress.h
index ead67313a13518e790282c858d8c589903111d42..071b773b87483fa6580a3fb274b942c4b9b8f2d3 100644
--- a/core/base/inc/TInetAddress.h
+++ b/core/base/inc/TInetAddress.h
@@ -24,12 +24,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#include <vector>
#ifdef R__GLOBALSTL
diff --git a/core/base/inc/TInspectorImp.h b/core/base/inc/TInspectorImp.h
index 14c3e06ba55574aced1f39fb341fa52c9c869e63..f78dec681863d5b26c77691837cfc4358c1395fe 100644
--- a/core/base/inc/TInspectorImp.h
+++ b/core/base/inc/TInspectorImp.h
@@ -22,9 +22,7 @@
// //
////////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TObject;
diff --git a/core/base/inc/TMD5.h b/core/base/inc/TMD5.h
index 6531f8d12647b572a133d8c7c0b21905c84b7144..63533b78af03bc579556c7e6322c980766d5270a 100644
--- a/core/base/inc/TMD5.h
+++ b/core/base/inc/TMD5.h
@@ -33,9 +33,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
// forward declaration
class TBuffer;
diff --git a/core/base/inc/TMacro.h b/core/base/inc/TMacro.h
index f521c877e391852eb1d0fc48acf2d90b68c498fd..622e7e248d42c0e45058e66fb9dd89d363d7aac3 100644
--- a/core/base/inc/TMacro.h
+++ b/core/base/inc/TMacro.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TList;
class TObjString;
diff --git a/core/base/inc/TMathBase.h b/core/base/inc/TMathBase.h
index 259be26e4d5e2f1c563094eb09c7a07b7d79607a..6191b6f743af9fa4ce2ab3e4ce9aa7ea8acf7ca1 100644
--- a/core/base/inc/TMathBase.h
+++ b/core/base/inc/TMathBase.h
@@ -26,9 +26,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <cstdlib>
#include <cmath>
diff --git a/core/base/inc/TMessageHandler.h b/core/base/inc/TMessageHandler.h
index 239deea2684200f54cd50b03d521e9f97b883e0a..bdac263ff4ff6127986528bfe8254fefb9e59ade 100644
--- a/core/base/inc/TMessageHandler.h
+++ b/core/base/inc/TMessageHandler.h
@@ -28,12 +28,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
class TMessageHandler : public TNamed, public TQObject {
diff --git a/core/base/inc/TNamed.h b/core/base/inc/TNamed.h
index d7c908b4a616dd233bbce85e2a415094d9cfe3a5..bdbb6c96ddfda59f2354d3d0e5c9d2475f663c3b 100644
--- a/core/base/inc/TNamed.h
+++ b/core/base/inc/TNamed.h
@@ -22,12 +22,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TNamed : public TObject {
diff --git a/core/base/inc/TObjString.h b/core/base/inc/TObjString.h
index 13fcc69120c22081d970926c595521b85409c756..3aec1708fb407db3b82f6ff711737cd8d48b16db 100644
--- a/core/base/inc/TObjString.h
+++ b/core/base/inc/TObjString.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TObjString : public TObject {
diff --git a/core/base/inc/TObjectSpy.h b/core/base/inc/TObjectSpy.h
index dd6aec1054d0add7f736e3770e678bf6acb233f8..a24ab7a5c5699dee42329fb9cc94933f575736a3 100644
--- a/core/base/inc/TObjectSpy.h
+++ b/core/base/inc/TObjectSpy.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TObjectSpy : public TObject {
diff --git a/core/base/inc/TPRegexp.h b/core/base/inc/TPRegexp.h
index 2e3646e40668d5deb36790105c69b6f57a9ae8af..57b9b0e103a9239e01f2878e0a8af79d9d1cbbb5 100644
--- a/core/base/inc/TPRegexp.h
+++ b/core/base/inc/TPRegexp.h
@@ -26,15 +26,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TArrayI
#include "TArrayI.h"
-#endif
struct PCREPriv_t;
diff --git a/core/base/inc/TParameter.h b/core/base/inc/TParameter.h
index ae591ad1586a074c9571b89a669e8e419016c249..00660defeb84a910a88162267ec99bf6f7810abf 100644
--- a/core/base/inc/TParameter.h
+++ b/core/base/inc/TParameter.h
@@ -21,29 +21,17 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Riostream
#include "Riostream.h"
-#endif
-#ifndef ROOT_TClass
#include "TClass.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TCollection
#include "TCollection.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TROOT
#include "TROOT.h"
-#endif
template <class AParamType>
class TParameter : public TObject {
diff --git a/core/base/inc/TPluginManager.h b/core/base/inc/TPluginManager.h
index 8289544dd668c6a0726086179448bcdb4f6dd96b..97284a2a4a5ade1c106abaa12c272832542ff063 100644
--- a/core/base/inc/TPluginManager.h
+++ b/core/base/inc/TPluginManager.h
@@ -85,21 +85,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMethodCall
#include "TMethodCall.h"
-#endif
-#ifndef ROOT_TVirtualMutex
#include "TVirtualMutex.h"
-#endif
-#ifndef ROOT_TInterpreter
#include "TInterpreter.h"
-#endif
class TEnv;
class TList;
diff --git a/core/base/inc/TPoint.h b/core/base/inc/TPoint.h
index fbc3cda0c3a87be8ce9f0327ad3f0515e7239c36..5153a93b7bfc740af1189edccde99690104270f0 100644
--- a/core/base/inc/TPoint.h
+++ b/core/base/inc/TPoint.h
@@ -25,9 +25,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TPoint {
diff --git a/core/base/inc/TProcessID.h b/core/base/inc/TProcessID.h
index d1d0f67891dff7808d32470e950ee3f6ff4b50b2..d3d833b8a0cd143f10cc3877e13ad49ea7dde40d 100644
--- a/core/base/inc/TProcessID.h
+++ b/core/base/inc/TProcessID.h
@@ -22,12 +22,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
#include <atomic>
#include <type_traits>
diff --git a/core/base/inc/TProcessUUID.h b/core/base/inc/TProcessUUID.h
index 6df83f966957ee580a49b169bd5e860dc69d0a1b..587eeab3141aef8dfbe773b5d3ea9b6277f63a5d 100644
--- a/core/base/inc/TProcessUUID.h
+++ b/core/base/inc/TProcessUUID.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProcessID
#include "TProcessID.h"
-#endif
class THashList;
class TBits;
diff --git a/core/base/inc/TQClass.h b/core/base/inc/TQClass.h
index df5406a72dbd5fc37f51c508a35455fdc7f2ea92..2d87508ed33716e69f96c92cfb2b387c41449289 100644
--- a/core/base/inc/TQClass.h
+++ b/core/base/inc/TQClass.h
@@ -25,12 +25,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
-#ifndef ROOT_TClass
#include "TClass.h"
-#endif
// This class makes it possible to have a single connection from
// all objects of the same class
diff --git a/core/base/inc/TQCommand.h b/core/base/inc/TQCommand.h
index 8c25c102c1408e5f136705c66a4dbafc5b5e7525..ad9a6c2a456453aff956bd6c975f48115b9007c3 100644
--- a/core/base/inc/TQCommand.h
+++ b/core/base/inc/TQCommand.h
@@ -18,13 +18,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
class TQConnection;
diff --git a/core/base/inc/TQObject.h b/core/base/inc/TQObject.h
index 34c673efc6a36e159f412d7a38769bbfaedc90d9..445724eb77cf70940851f3d3dc21089c95e5ae54 100644
--- a/core/base/inc/TQObject.h
+++ b/core/base/inc/TQObject.h
@@ -267,10 +267,8 @@ extern Bool_t ConnectCINT(TQObject *sender, const char *signal,
// This include makes it possible to have a single connection
// from all objects of the same class but is only needed in
// the dictionary.
-#ifndef ROOT_TQClass
#include "TQClass.h"
#endif
-#endif
//---- ClassImpQ macro ----------------------------------------------
diff --git a/core/base/inc/TROOT.h b/core/base/inc/TROOT.h
index c1e6b4d14a0ac3fc122dd64a29f5e02f8cc102ac..91921001fcdf2f3daaafd08dd997e322397cea18 100644
--- a/core/base/inc/TROOT.h
+++ b/core/base/inc/TROOT.h
@@ -25,15 +25,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDirectory
#include "TDirectory.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_RConfigure
#include "RConfigure.h"
-#endif
#include <atomic>
diff --git a/core/base/inc/TRedirectOutputGuard.h b/core/base/inc/TRedirectOutputGuard.h
index f16803ed6392e9cc7dce873430afdfe3b758d14b..9172f6d349900a550788eaf3617aac3e65525218 100644
--- a/core/base/inc/TRedirectOutputGuard.h
+++ b/core/base/inc/TRedirectOutputGuard.h
@@ -31,9 +31,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
class TRedirectOutputGuard {
diff --git a/core/base/inc/TRef.h b/core/base/inc/TRef.h
index f3b330f4aad8a66b6b98f629c82d36bd3f0e9750..bcb9d374e17667f1324c8958e81e04dd8981415d 100644
--- a/core/base/inc/TRef.h
+++ b/core/base/inc/TRef.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TProcessID;
class TFile;
diff --git a/core/base/inc/TRefCnt.h b/core/base/inc/TRefCnt.h
index 9edf747fe0591086d7eec5df0da6ab85da70454d..12bf4caed598764df69182eaa99a6003d8aceb44 100644
--- a/core/base/inc/TRefCnt.h
+++ b/core/base/inc/TRefCnt.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TRefCnt {
diff --git a/core/base/inc/TRegexp.h b/core/base/inc/TRegexp.h
index daf4d378f59a141d7039921a81d1344e656b6e37..4604e26f6041323099974e78076a995f63292c61 100644
--- a/core/base/inc/TRegexp.h
+++ b/core/base/inc/TRegexp.h
@@ -21,13 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_Match
#include "Match.h"
-#endif
class TString;
diff --git a/core/base/inc/TRemoteObject.h b/core/base/inc/TRemoteObject.h
index ee547b9c9b68c63d03bd31f3efeaab29c70da2d8..528d14e90329849799054dcefa1f976fbd98f5c3 100644
--- a/core/base/inc/TRemoteObject.h
+++ b/core/base/inc/TRemoteObject.h
@@ -27,17 +27,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSystemDirectory
#include "TSystemDirectory.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
class TRemoteObject : public TNamed {
diff --git a/core/base/inc/TStopwatch.h b/core/base/inc/TStopwatch.h
index 05b5fea2bb7de5cf6b1f42fa7223d22f05f87859..e411799a5bee8a4da53971638de4a887b0146e46 100644
--- a/core/base/inc/TStopwatch.h
+++ b/core/base/inc/TStopwatch.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TStopwatch : public TObject {
diff --git a/core/base/inc/TString.h b/core/base/inc/TString.h
index 132ceb8cd9a23128f3686d070151a07d049c0c48..7e38ce0dfe36cf9fb39fc32812fe8fb1998b2da2 100644
--- a/core/base/inc/TString.h
+++ b/core/base/inc/TString.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMathBase
#include "TMathBase.h"
-#endif
#include "RStringView.h"
diff --git a/core/base/inc/TStringLong.h b/core/base/inc/TStringLong.h
index 639c3ba314b792dc2407f4c2c1047bae823db6f9..85160eccc15d60584772f79d7842fe1ea1632d41 100644
--- a/core/base/inc/TStringLong.h
+++ b/core/base/inc/TStringLong.h
@@ -26,9 +26,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TStringLong : public TString {
diff --git a/core/base/inc/TStyle.h b/core/base/inc/TStyle.h
index 35e819796891c1bd7d568561af40e522bdae5588..91ea6a0ca55262810963d6b20b3b35d152843039 100644
--- a/core/base/inc/TStyle.h
+++ b/core/base/inc/TStyle.h
@@ -13,30 +13,14 @@
#define ROOT_TStyle
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttAxis
#include "TAttAxis.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
-#ifndef ROOT_TArrayI
#include "TArrayI.h"
-#endif
-#ifndef ROOT_TColor
#include "TColor.h"
-#endif
class TBrowser;
diff --git a/core/base/inc/TSysEvtHandler.h b/core/base/inc/TSysEvtHandler.h
index 3043032252d376ec2d8e8a402f7587317f3c81c0..841f11713c3a59cbae894e37b663ce618ebcd491 100644
--- a/core/base/inc/TSysEvtHandler.h
+++ b/core/base/inc/TSysEvtHandler.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
class TSysEvtHandler : public TObject, public TQObject {
diff --git a/core/base/inc/TSystem.h b/core/base/inc/TSystem.h
index c1b341084dcc1cdd129e0d9bf961306f596a9ecd..8cf43cf154da30e94f013ca291249160ec40ca6a 100644
--- a/core/base/inc/TSystem.h
+++ b/core/base/inc/TSystem.h
@@ -31,21 +31,11 @@
#endif
#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TInetAddress
#include "TInetAddress.h"
-#endif
-#ifndef ROOT_TTimer
#include "TTimer.h"
-#endif
-#ifndef ROOT_ThreadLocalStorage
#include "ThreadLocalStorage.h"
-#endif
class TSeqCollection;
class TFdSet;
diff --git a/core/base/inc/TSystemDirectory.h b/core/base/inc/TSystemDirectory.h
index 9043c3612e510c8f976ea3d079d1adc3450e6678..c00c1f6a322a74a7b3b84d7f46ffcc3f3f4d25bd 100644
--- a/core/base/inc/TSystemDirectory.h
+++ b/core/base/inc/TSystemDirectory.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSystemFile
#include "TSystemFile.h"
-#endif
class TOrdCollection;
class TList;
diff --git a/core/base/inc/TSystemFile.h b/core/base/inc/TSystemFile.h
index 34f42ec714181122060e019c23defee740bdbc13..a6e853188634930d849176e19f68de91d5d956ab 100644
--- a/core/base/inc/TSystemFile.h
+++ b/core/base/inc/TSystemFile.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TBrowser;
diff --git a/core/base/inc/TTask.h b/core/base/inc/TTask.h
index 27d92bed2f06a356c822c61d387b336850675cda..910bc960a057a99dc1479afb495265b605f94566 100644
--- a/core/base/inc/TTask.h
+++ b/core/base/inc/TTask.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TBrowser;
diff --git a/core/base/inc/TThreadSlots.h b/core/base/inc/TThreadSlots.h
index 1b28a1ba21ace01e90a2e20778c8e675a5159387..bfa1626d7fc3c356b314ff63f4ef7e791684d20a 100644
--- a/core/base/inc/TThreadSlots.h
+++ b/core/base/inc/TThreadSlots.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TThreadSlots
#define ROOT_TThreadSlots
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
namespace ROOT {
diff --git a/core/base/inc/TTime.h b/core/base/inc/TTime.h
index 9e3f614579e1b7e67dddb247d792fa9c4e0c5e1b..f91fa7e163cabf221b6be9b38d9e6b2d8e60bfca 100644
--- a/core/base/inc/TTime.h
+++ b/core/base/inc/TTime.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TTime {
diff --git a/core/base/inc/TTimeStamp.h b/core/base/inc/TTimeStamp.h
index f35e364a7c9a10827317f588b6e388995b012831..75ad264fe875557e50b0bf625c451762c0b18e84 100644
--- a/core/base/inc/TTimeStamp.h
+++ b/core/base/inc/TTimeStamp.h
@@ -39,9 +39,7 @@
//
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <ctime>
diff --git a/core/base/inc/TTimer.h b/core/base/inc/TTimer.h
index b234436a47de705da9322210a54dd5915f2fd8eb..c6f6b89f27c9f211bec5adbec5a13387ef03317c 100644
--- a/core/base/inc/TTimer.h
+++ b/core/base/inc/TTimer.h
@@ -42,15 +42,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSysEvtHandler
#include "TSysEvtHandler.h"
-#endif
-#ifndef ROOT_TTime
#include "TTime.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
diff --git a/core/base/inc/TUUID.h b/core/base/inc/TUUID.h
index 6360ddb822096d389ccff9a3bf05fa5e788c14b3..a2c6db4b6ed61513474ccf9ac75645d3cc2a9d7b 100644
--- a/core/base/inc/TUUID.h
+++ b/core/base/inc/TUUID.h
@@ -30,9 +30,7 @@
#ifdef WIN32
#undef GetCurrentTime
#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
// forward declaration
class TBuffer;
diff --git a/core/base/inc/TUri.h b/core/base/inc/TUri.h
index bb781d88223be712bc73b950def71f5dee74db37..c70bb237e4c378075bdaafa017a38b8d1600828d 100644
--- a/core/base/inc/TUri.h
+++ b/core/base/inc/TUri.h
@@ -24,12 +24,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TUri;
diff --git a/core/base/inc/TUrl.h b/core/base/inc/TUrl.h
index 83def8e5e77ef9ceeeb929f8f33b2502b0948e5c..8de2fc2f668fce0893696d6b43a3ca3553b00274 100644
--- a/core/base/inc/TUrl.h
+++ b/core/base/inc/TUrl.h
@@ -24,15 +24,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class THashList;
diff --git a/core/base/inc/TVersionCheck.h b/core/base/inc/TVersionCheck.h
index 6f7882bd30d7e4c371b75ade89e20aeb1a0c0e2c..f8a5c2b87add452861efc639f30ef64b802c2d44 100644
--- a/core/base/inc/TVersionCheck.h
+++ b/core/base/inc/TVersionCheck.h
@@ -27,9 +27,7 @@
#endif
#endif // R__CXXMODULES
-#ifndef ROOT_RVersion
#include "RVersion.h"
-#endif
class TVersionCheck {
public:
diff --git a/core/base/inc/TVirtualAuth.h b/core/base/inc/TVirtualAuth.h
index 44b3767ca805a0992948be2dc2f4c5aa70ebc3bc..e5efc1bd6503418693886b186f29f9ea63f1f3a0 100644
--- a/core/base/inc/TVirtualAuth.h
+++ b/core/base/inc/TVirtualAuth.h
@@ -19,9 +19,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TSecContext;
class TSocket;
diff --git a/core/base/inc/TVirtualFFT.h b/core/base/inc/TVirtualFFT.h
index e4a174c0dcae92c5a05ddffcea85da82e7a87bf5..36eea689df965f4dc585638416b177c8d9c2008c 100644
--- a/core/base/inc/TVirtualFFT.h
+++ b/core/base/inc/TVirtualFFT.h
@@ -79,13 +79,9 @@
//
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TComplex;
diff --git a/core/base/inc/TVirtualGL.h b/core/base/inc/TVirtualGL.h
index d015bcea72c2ea562d32ea8336dba276f1421963..7c067491d667b048d4ab23cc04f82150862971db 100644
--- a/core/base/inc/TVirtualGL.h
+++ b/core/base/inc/TVirtualGL.h
@@ -28,15 +28,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
-#ifndef ROOT_GLConstants
#include "GLConstants.h"
-#endif
class TVirtualViewer3D;
class TPoints3DABC;
diff --git a/core/base/inc/TVirtualMonitoring.h b/core/base/inc/TVirtualMonitoring.h
index 5925884061aae4754c5b937318908bbf916cdfe1..a779f336f653604a70a640e2e918a9a2d52e8685 100644
--- a/core/base/inc/TVirtualMonitoring.h
+++ b/core/base/inc/TVirtualMonitoring.h
@@ -20,16 +20,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class TFile;
diff --git a/core/base/inc/TVirtualMutex.h b/core/base/inc/TVirtualMutex.h
index db809b5b6570a5b1d5bbf37332b0fd0213d170a2..ff331209b725ab6bc9f7dbe6dd14d832f21a9382 100644
--- a/core/base/inc/TVirtualMutex.h
+++ b/core/base/inc/TVirtualMutex.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TVirtualMutex;
diff --git a/core/base/inc/TVirtualPS.h b/core/base/inc/TVirtualPS.h
index a635cf83daa6b92d462c20d2156c8703027ad973..6607efa1579233052fc9891ede1dfe8f2a0599fe 100644
--- a/core/base/inc/TVirtualPS.h
+++ b/core/base/inc/TVirtualPS.h
@@ -21,21 +21,11 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
class TVirtualPS : public TNamed, public TAttLine, public TAttFill, public TAttMarker, public TAttText {
diff --git a/core/base/inc/TVirtualPad.h b/core/base/inc/TVirtualPad.h
index e4fcf249fd4f1b915c5d308fabdfaf0b03baaa8c..c6bc0fc00a03c3ee1f4d0294e2ea1f6201c29277 100644
--- a/core/base/inc/TVirtualPad.h
+++ b/core/base/inc/TVirtualPad.h
@@ -22,25 +22,15 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TAttPad
#include "TAttPad.h"
-#endif
-#ifndef ROOT_TVirtualX
#include "TVirtualX.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_Buttons
#include "Buttons.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
// forward declarations
class TAxis;
diff --git a/core/base/inc/TVirtualPadEditor.h b/core/base/inc/TVirtualPadEditor.h
index 46ef1aefce06f14f118014078bc69c0ee13e721f..5c2333e7806b222a19ed00dead9247199f3ac413 100644
--- a/core/base/inc/TVirtualPadEditor.h
+++ b/core/base/inc/TVirtualPadEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TCanvas;
diff --git a/core/base/inc/TVirtualPadPainter.h b/core/base/inc/TVirtualPadPainter.h
index a98425a2f0e81b147ef3f40ce3c41242cfcf6654..66a2fe9747126367abfa9f533e0283548df283f1 100644
--- a/core/base/inc/TVirtualPadPainter.h
+++ b/core/base/inc/TVirtualPadPainter.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TVirtualPadPainter
#define ROOT_TVirtualPadPainter
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TVirtualPad;
diff --git a/core/base/inc/TVirtualPerfStats.h b/core/base/inc/TVirtualPerfStats.h
index c0a513731019cd5e9e134cc4f96a450fc23069df..86eb9622ddbfd213f8ead382797dc9ed4bb0090c 100644
--- a/core/base/inc/TVirtualPerfStats.h
+++ b/core/base/inc/TVirtualPerfStats.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TFile;
diff --git a/core/base/inc/TVirtualTableInterface.h b/core/base/inc/TVirtualTableInterface.h
index ef8f4f9f68dfc0e19d6f4ea2a322520efed36165..780746d90a1e667027eb1928c8034c0990389608 100644
--- a/core/base/inc/TVirtualTableInterface.h
+++ b/core/base/inc/TVirtualTableInterface.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TVirtualTableInterface
#define ROOT_TVirtualTableInterface
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TVirtualTableInterface {
diff --git a/core/base/inc/TVirtualViewer3D.h b/core/base/inc/TVirtualViewer3D.h
index 82d3e716d452c9add4743467b3a806f324764f54..2b68dfe9e52e0180d4512f4f1e1a2f65a63a6955 100644
--- a/core/base/inc/TVirtualViewer3D.h
+++ b/core/base/inc/TVirtualViewer3D.h
@@ -24,17 +24,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
class TBuffer3D;
class TVirtualPad;
diff --git a/core/base/inc/TVirtualX.h b/core/base/inc/TVirtualX.h
index dbe708cfc40e89afb25943b8f6d85e0bb65a9205..e1d2efe5a02a1c4ba2d6cf17e3ebfe194d0d0072 100644
--- a/core/base/inc/TVirtualX.h
+++ b/core/base/inc/TVirtualX.h
@@ -27,24 +27,12 @@
#include <utility>
#include <vector>
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
// WM Atoms are initialized in TGClient
diff --git a/core/base/src/TListOfTypes.h b/core/base/src/TListOfTypes.h
index c3a4b38ad896d3cc73e50259e9ac64601cb59714..8be940422b45b4df6080b0d5e44087a8c2eb6152 100644
--- a/core/base/src/TListOfTypes.h
+++ b/core/base/src/TListOfTypes.h
@@ -23,9 +23,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_THastTable
#include "THashTable.h"
-#endif
class TDataType;
diff --git a/core/clib/inc/snprintf.h b/core/clib/inc/snprintf.h
index 3a5029377d1d12487326a5c821dc3aae2dce4c90..fd6b916953b2882634c3ace04cee7cdc83b18eb0 100644
--- a/core/clib/inc/snprintf.h
+++ b/core/clib/inc/snprintf.h
@@ -10,9 +10,7 @@
#ifndef ROOT_snprintf
#define ROOT_snprintf
-#ifndef ROOT_RConfig
#include "RConfig.h"
-#endif
#ifndef __CINT__
diff --git a/core/clib/inc/strlcpy.h b/core/clib/inc/strlcpy.h
index 3dfdff06ddde42e79dc2a4cf5b8da57d93ef31e5..4f7d5eda9924a5a7fecc0400b7c2dd561f3a0f63 100644
--- a/core/clib/inc/strlcpy.h
+++ b/core/clib/inc/strlcpy.h
@@ -9,9 +9,7 @@
#ifndef ROOT_strlcpy
#define ROOT_strlcpy
-#ifndef ROOT_RConfig
#include "RConfig.h"
-#endif
#include "Rtypes.h"
#ifndef HAS_STRLCPY
diff --git a/core/clib/res/mmconfig.h b/core/clib/res/mmconfig.h
index 52d4e0249c0bf85ac268e49a1c97a1372a3e3c6d..e6b9633363be068b650af99beb28dbc577391137 100644
--- a/core/clib/res/mmconfig.h
+++ b/core/clib/res/mmconfig.h
@@ -11,9 +11,7 @@
#ifndef MMCONFIG_H
#define MMCONFIG_H
-#ifndef ROOT_RConfig
#include "RConfig.h"
-#endif
#ifndef WIN32
# ifndef INVALID_HANDLE_VALUE
diff --git a/core/clingutils/res/TClingUtils.h b/core/clingutils/res/TClingUtils.h
index 1207dfb793ffe5e48e1ad270d0318df032375977..83d30a3b83c7f627bea0db8cbe6ba0da0d19363d 100644
--- a/core/clingutils/res/TClingUtils.h
+++ b/core/clingutils/res/TClingUtils.h
@@ -73,9 +73,7 @@ namespace cling {
// for TClassEdit::TInterpreterLookupHelper
#include "TClassEdit.h"
-#ifndef ROOT_Varargs
#include "Varargs.h"
-#endif
namespace ROOT {
namespace TMetaUtils {
diff --git a/core/clingutils/src/RStl.cxx b/core/clingutils/src/RStl.cxx
index c974dd3de48e5126183c9b47a8a6606f76c80ce2..2e750f06410372905514c6f807b571d147bcecc8 100644
--- a/core/clingutils/src/RStl.cxx
+++ b/core/clingutils/src/RStl.cxx
@@ -30,9 +30,7 @@ using namespace TClassEdit;
#include "clang/Frontend/CompilerInstance.h"
#include "clang/AST/DeclTemplate.h"
-#ifndef ROOT_Varargs
#include "Varargs.h"
-#endif
//
// ROOT::Internal::RStl is the rootcint STL handling class.
diff --git a/core/cont/inc/TArray.h b/core/cont/inc/TArray.h
index d593e7b49aa57ad3b6db5e225e5d3b607b4ef932..1cb5041ef1e8e5f1bcbfaf58058c35f82d7b0134 100644
--- a/core/cont/inc/TArray.h
+++ b/core/cont/inc/TArray.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <string.h>
class TBuffer;
diff --git a/core/cont/inc/TArrayC.h b/core/cont/inc/TArrayC.h
index 999b4dd8fe7a507070e5c37436ceb63304cfd4df..9f21385534a5c71d5b53a66e47a7f6c1bbbb3109 100644
--- a/core/cont/inc/TArrayC.h
+++ b/core/cont/inc/TArrayC.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TArray
#include "TArray.h"
-#endif
class TArrayC : public TArray {
diff --git a/core/cont/inc/TArrayD.h b/core/cont/inc/TArrayD.h
index 637ea3cba00b319932d2ac3376cf200f350b96b0..582767a814403bf89558e4c360fc1124306bd10e 100644
--- a/core/cont/inc/TArrayD.h
+++ b/core/cont/inc/TArrayD.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TArray
#include "TArray.h"
-#endif
class TArrayD : public TArray {
diff --git a/core/cont/inc/TArrayF.h b/core/cont/inc/TArrayF.h
index 0cf5ca4ef9064a70652e7d65800bd5edfa3ec1d7..0bd6106848cbbc3d02a437934f2b7e88351b5f34 100644
--- a/core/cont/inc/TArrayF.h
+++ b/core/cont/inc/TArrayF.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TArray
#include "TArray.h"
-#endif
class TArrayF : public TArray {
diff --git a/core/cont/inc/TArrayI.h b/core/cont/inc/TArrayI.h
index 54537dcd3e90b5ff6f9d2debcfdaa2338d044736..978c86c9801678283e2029bea20faf2a2f9cd1f1 100644
--- a/core/cont/inc/TArrayI.h
+++ b/core/cont/inc/TArrayI.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TArray
#include "TArray.h"
-#endif
class TArrayI : public TArray {
diff --git a/core/cont/inc/TArrayL.h b/core/cont/inc/TArrayL.h
index 8af0c2eab91730a8bde2cf8e7435226bb08c7cd8..c51e90b8b51292f05eb82e1625e284c8f2b2e32e 100644
--- a/core/cont/inc/TArrayL.h
+++ b/core/cont/inc/TArrayL.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TArray
#include "TArray.h"
-#endif
class TArrayL : public TArray {
diff --git a/core/cont/inc/TArrayL64.h b/core/cont/inc/TArrayL64.h
index 92fe39902d4fecebf985095beb2b4025d83dd358..e41afb5e29a780439febbbb8fa32d6cc0adaa02d 100644
--- a/core/cont/inc/TArrayL64.h
+++ b/core/cont/inc/TArrayL64.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TArray
#include "TArray.h"
-#endif
class TArrayL64 : public TArray {
diff --git a/core/cont/inc/TArrayS.h b/core/cont/inc/TArrayS.h
index d371421ea54cd9f9545bb75a9bc205ddf2702a1d..556c03fc8bcb3e1bd38ae5221fe323ae25a6b4a8 100644
--- a/core/cont/inc/TArrayS.h
+++ b/core/cont/inc/TArrayS.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TArray
#include "TArray.h"
-#endif
class TArrayS : public TArray {
diff --git a/core/cont/inc/TBits.h b/core/cont/inc/TBits.h
index ed1e6a82d9a7707d18ac2510227ac5fae4f56831..2ac4981e0b7db7278d76faacecbb40327201a2d4 100644
--- a/core/cont/inc/TBits.h
+++ b/core/cont/inc/TBits.h
@@ -21,9 +21,7 @@
//////////////////////////////////////////////////////////////////////////
#include "Rtypes.h"
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
#ifndef __CINT__
#include <string.h>
#endif
diff --git a/core/cont/inc/TBtree.h b/core/cont/inc/TBtree.h
index 66169d7eb5531aea747776a14dee0d215f262ceb..1fd62be8e06368b59a07fef41d1ac38ab5072497 100644
--- a/core/cont/inc/TBtree.h
+++ b/core/cont/inc/TBtree.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSeqCollection
#include "TSeqCollection.h"
-#endif
-#ifndef ROOT_TError
#include "TError.h"
-#endif
#include <iterator>
diff --git a/core/cont/inc/TClassTable.h b/core/cont/inc/TClassTable.h
index e7d6c4ed6a861872581c94a4ce98936e60ce3e27..ee3ffcb43a78dfb438416ea1d3e75a8e74ea5a1f 100644
--- a/core/cont/inc/TClassTable.h
+++ b/core/cont/inc/TClassTable.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TProtoClass;
diff --git a/core/cont/inc/TClonesArray.h b/core/cont/inc/TClonesArray.h
index 63a1fa4f180ba7981a97d832504d53073f70867f..4296ebc6bc38c97956c96383fd1c93e5785924c6 100644
--- a/core/cont/inc/TClonesArray.h
+++ b/core/cont/inc/TClonesArray.h
@@ -24,9 +24,7 @@
#include "Rtypes.h"
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
class TClass;
diff --git a/core/cont/inc/TCollection.h b/core/cont/inc/TCollection.h
index 138c203743244face3368d940e0d81fe9eb525bb..12f7f96282585ae1e09addf4f9ab477fc0374e29 100644
--- a/core/cont/inc/TCollection.h
+++ b/core/cont/inc/TCollection.h
@@ -22,17 +22,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TIterator
#include "TIterator.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TClass;
diff --git a/core/cont/inc/TCollectionProxyInfo.h b/core/cont/inc/TCollectionProxyInfo.h
index 394263226e007fdaa4a37d12617d2baad772c5e5..51addc924115f58ac0f763b644ffd4277c910eba 100644
--- a/core/cont/inc/TCollectionProxyInfo.h
+++ b/core/cont/inc/TCollectionProxyInfo.h
@@ -19,9 +19,7 @@
//
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TError
#include "TError.h"
-#endif
#include <vector>
#include <forward_list>
diff --git a/core/cont/inc/TExMap.h b/core/cont/inc/TExMap.h
index 1a6815c3fcedd8b4a3386dee9c8cf5acf7adb2e4..58453c69b0d23d451df319c702bb94831266b586 100644
--- a/core/cont/inc/TExMap.h
+++ b/core/cont/inc/TExMap.h
@@ -25,9 +25,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TExMapIter;
diff --git a/core/cont/inc/THashList.h b/core/cont/inc/THashList.h
index 330986e2ca0f890c987c5dd4b3d02201d2695038..883249f0b17b2edc31578ca088a8e1a60c7fcb12 100644
--- a/core/cont/inc/THashList.h
+++ b/core/cont/inc/THashList.h
@@ -26,9 +26,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class THashTable;
diff --git a/core/cont/inc/THashTable.h b/core/cont/inc/THashTable.h
index 2c7ab7904a0dec8ab8fd195fc8b435bc962f924e..0b4b4744a96eb1fde93f093748f2e48431622361 100644
--- a/core/cont/inc/THashTable.h
+++ b/core/cont/inc/THashTable.h
@@ -24,12 +24,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TCollection
#include "TCollection.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TList;
class TListIter;
diff --git a/core/cont/inc/TIterator.h b/core/cont/inc/TIterator.h
index 1a15ffb4a76b835d71696751fd6a7ec5a4c7deb3..bc92b7f38657557eecc9f0b1707d51c125b03a9b 100644
--- a/core/cont/inc/TIterator.h
+++ b/core/cont/inc/TIterator.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TCollection;
class TObject;
diff --git a/core/cont/inc/TList.h b/core/cont/inc/TList.h
index ee016e13a3c105a263a1b51c0d6d1c65a1626028..1b7f563d2861ea13f2c5313acdcd29bb6eb4a5b0 100644
--- a/core/cont/inc/TList.h
+++ b/core/cont/inc/TList.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSeqCollection
#include "TSeqCollection.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#include <iterator>
diff --git a/core/cont/inc/TMap.h b/core/cont/inc/TMap.h
index f5334f82d4007161607e6d7af070078def768d30..6ca73cb7f5d869e6d79e606baa9286571d3c54f4 100644
--- a/core/cont/inc/TMap.h
+++ b/core/cont/inc/TMap.h
@@ -25,12 +25,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TCollection
#include "TCollection.h"
-#endif
-#ifndef ROOT_THashTable
#include "THashTable.h"
-#endif
#include <iterator>
diff --git a/core/cont/inc/TObjArray.h b/core/cont/inc/TObjArray.h
index 05e61360dc6a1fca0fa844f15224ba2591e3d08f..31fa9348ef91e3b9684457ae39f4df86c0b13117 100644
--- a/core/cont/inc/TObjArray.h
+++ b/core/cont/inc/TObjArray.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSeqCollection
#include "TSeqCollection.h"
-#endif
#include <iterator>
diff --git a/core/cont/inc/TObjectTable.h b/core/cont/inc/TObjectTable.h
index 62c59e24faf341e5d7e7a57c9e0a8d388fd7d19e..eea82231f209885da77327f6ec401fe06c6886d6 100644
--- a/core/cont/inc/TObjectTable.h
+++ b/core/cont/inc/TObjectTable.h
@@ -27,9 +27,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TClass;
diff --git a/core/cont/inc/TOrdCollection.h b/core/cont/inc/TOrdCollection.h
index e20dd8bef9525cb027f802052f2f2ff75df96678..50437a9ca6e0c38db12e2e6abc6229ed32bf1f5f 100644
--- a/core/cont/inc/TOrdCollection.h
+++ b/core/cont/inc/TOrdCollection.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSeqCollection
#include "TSeqCollection.h"
-#endif
#include <iterator>
diff --git a/core/cont/inc/TRefArray.h b/core/cont/inc/TRefArray.h
index f082123ff4b3ca6b312f0d3ff74a553aa37b23c4..66acb2c26e3e7ce14552ceacd7f417c22ce632c1 100644
--- a/core/cont/inc/TRefArray.h
+++ b/core/cont/inc/TRefArray.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSeqCollection
#include "TSeqCollection.h"
-#endif
-#ifndef ROOT_TProcessID
#include "TProcessID.h"
-#endif
#include <iterator>
diff --git a/core/cont/inc/TRefTable.h b/core/cont/inc/TRefTable.h
index e06c158a19eafc960a3f711493d02e09a214a2b2..052c43ae46f7f72f18208ae7818b07da99d029f3 100644
--- a/core/cont/inc/TRefTable.h
+++ b/core/cont/inc/TRefTable.h
@@ -24,9 +24,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
#include <string>
#include <vector>
diff --git a/core/cont/inc/TSeqCollection.h b/core/cont/inc/TSeqCollection.h
index 1e813f2571674edc62dba74d2d5d760c75ff625b..b90fdc3e4df0713a4c51005e80bf580f9afcd035 100644
--- a/core/cont/inc/TSeqCollection.h
+++ b/core/cont/inc/TSeqCollection.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TCollection
#include "TCollection.h"
-#endif
class TSeqCollection : public TCollection {
diff --git a/core/cont/inc/TSortedList.h b/core/cont/inc/TSortedList.h
index 9df4fdd0c08737232248a6f0789d168141e3dc16..ceab9f43d30d6786cd83d634c75c92784df55700 100644
--- a/core/cont/inc/TSortedList.h
+++ b/core/cont/inc/TSortedList.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TSortedList : public TList {
diff --git a/core/cont/inc/TVirtualCollectionProxy.h b/core/cont/inc/TVirtualCollectionProxy.h
index 4914e5ad3ae9b979d5ca13d5ed147e6f5f419576..5063171d9a5c6f04475aed9cfae4ae294c0c7550 100644
--- a/core/cont/inc/TVirtualCollectionProxy.h
+++ b/core/cont/inc/TVirtualCollectionProxy.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
#include "TClassRef.h"
#include "TDataType.h"
diff --git a/core/foundation/inc/TClassEdit.h b/core/foundation/inc/TClassEdit.h
index e79e12ecd533b4ade28d87353eef2b0e39f5f22e..8279d41eb0d26894899b0e4d1680bbc4d059e1a6 100644
--- a/core/foundation/inc/TClassEdit.h
+++ b/core/foundation/inc/TClassEdit.h
@@ -32,9 +32,7 @@ extern "C" {
#include <vector>
#include <array>
-#ifndef ROOT_ESTLType
#include "ESTLType.h"
-#endif
#ifdef R__OLDHPACC
namespace std {
diff --git a/core/foundation/res/RConversionRuleParser.h b/core/foundation/res/RConversionRuleParser.h
index 8c6a544e13049117b09ee0cb97fc85d0f090bc17..68966912ac8a1df2a0b7344bcc0f053d9d10e4f8 100644
--- a/core/foundation/res/RConversionRuleParser.h
+++ b/core/foundation/res/RConversionRuleParser.h
@@ -10,9 +10,7 @@
#include <ostream>
#include <utility>
-#ifndef ROOT_RConfigure
#include "RConfigure.h"
-#endif
#include "TSchemaType.h"
diff --git a/core/foundation/res/TSchemaRuleProcessor.h b/core/foundation/res/TSchemaRuleProcessor.h
index d1a538f0fbe94738fce14ff0f15a31fb365d413c..1897c7ba55e27e9d2d3add8b93df22373506dc2f 100644
--- a/core/foundation/res/TSchemaRuleProcessor.h
+++ b/core/foundation/res/TSchemaRuleProcessor.h
@@ -15,9 +15,7 @@
#include <iostream>
#include "RtypesCore.h"
-#ifndef R__TSCHEMATYPE_H
#include "TSchemaType.h"
-#endif
namespace ROOT {
namespace Internal {
diff --git a/core/meta/inc/TBaseClass.h b/core/meta/inc/TBaseClass.h
index 980bd7f581ab4d3c784ae034a47c0e8d949070ab..708451f61db0a104da31dfbd9cdcdf0631acf5d8 100644
--- a/core/meta/inc/TBaseClass.h
+++ b/core/meta/inc/TBaseClass.h
@@ -22,12 +22,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
-#ifndef ROOT_TClassRef
#include "TClassRef.h"
-#endif
class TBrowser;
class TClass;
diff --git a/core/meta/inc/TClass.h b/core/meta/inc/TClass.h
index bfb0534af34d165358fe115a26fb817ee42782b6..57d60cddea0265e298b52ad9a12142a1324ca128 100644
--- a/core/meta/inc/TClass.h
+++ b/core/meta/inc/TClass.h
@@ -21,18 +21,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TObjString
#include "TObjString.h"
-#endif
#include <map>
#include <string>
@@ -41,9 +33,7 @@
#include <vector>
#include <atomic>
-#ifndef ROOT_ThreadLocalStorage
#include "ThreadLocalStorage.h"
-#endif
class TBaseClass;
class TBrowser;
class TDataMember;
diff --git a/core/meta/inc/TClassGenerator.h b/core/meta/inc/TClassGenerator.h
index f767876e94d5862d1a65292590138ba85f81f32d..64e35aa5f3d720157c52ac480dbf5082d0d3433c 100644
--- a/core/meta/inc/TClassGenerator.h
+++ b/core/meta/inc/TClassGenerator.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TClass;
diff --git a/core/meta/inc/TClassMenuItem.h b/core/meta/inc/TClassMenuItem.h
index 6a4cf324cbcad6cedd9143c11261779c1b487f01..aeab75007230e202863c038d2d92ca50a9568364 100644
--- a/core/meta/inc/TClassMenuItem.h
+++ b/core/meta/inc/TClassMenuItem.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TList;
class TClass;
diff --git a/core/meta/inc/TClassRef.h b/core/meta/inc/TClassRef.h
index 1d68233765e77d3fe884f943e5a51db7fcf2db0d..729b6989daa7e13e2ca347847668c0cda27f8c61 100644
--- a/core/meta/inc/TClassRef.h
+++ b/core/meta/inc/TClassRef.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TClass
#include "TClass.h"
-#endif
-#ifndef ROOT_TRef
#include "TRef.h"
-#endif
#include <string>
diff --git a/core/meta/inc/TDataMember.h b/core/meta/inc/TDataMember.h
index 16bd035625bd28e7f04112763508a7b0a07379ae..071c7672fd7d19f0332beffa5c3834037a845bf7 100644
--- a/core/meta/inc/TDataMember.h
+++ b/core/meta/inc/TDataMember.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
class TList;
class TClass;
diff --git a/core/meta/inc/TDataType.h b/core/meta/inc/TDataType.h
index 922dc725e7a4c871dcd2e5724037e8d0c2fe4e4e..3ede9b4118c462d6ae4be182488306f6710cdfee 100644
--- a/core/meta/inc/TDataType.h
+++ b/core/meta/inc/TDataType.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
enum EDataType {
diff --git a/core/meta/inc/TDictAttributeMap.h b/core/meta/inc/TDictAttributeMap.h
index 11e9ec4ee50c9f5ea8fbabdad519d3e399278efc..41fe9b2f746c2a2e84b61e983c6cfd2e58f62a1b 100644
--- a/core/meta/inc/TDictAttributeMap.h
+++ b/core/meta/inc/TDictAttributeMap.h
@@ -22,12 +22,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_THashTable
#include "THashTable.h"
-#endif
class TDictAttributeMap : public TObject
diff --git a/core/meta/inc/TDictionary.h b/core/meta/inc/TDictionary.h
index 0b8af41ddd6f94e7095f1517b7978c23748de6ba..f62a652bdf6868c273541bda0861b000e103b099 100644
--- a/core/meta/inc/TDictionary.h
+++ b/core/meta/inc/TDictionary.h
@@ -41,13 +41,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_ESTLType
#include "ESTLType.h"
-#endif
// The following are opaque type and are never really declared
// The specific implemenation of TInterpreter will cast the
diff --git a/core/meta/inc/TEnum.h b/core/meta/inc/TEnum.h
index 382a49721893e6cfa7aa30efdbe6f6237dadedb9..bac4c762c291e0c5b0cfa8b669f67911455f8cd5 100644
--- a/core/meta/inc/TEnum.h
+++ b/core/meta/inc/TEnum.h
@@ -20,18 +20,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_THashList
#include "THashList.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
class TClass;
class TEnumConstant;
diff --git a/core/meta/inc/TEnumConstant.h b/core/meta/inc/TEnumConstant.h
index 696df6fc932b75992ccc7fafd36307210a781ae9..184c7d40045d5ae7d79767e10a30fda9cbf68ffc 100644
--- a/core/meta/inc/TEnumConstant.h
+++ b/core/meta/inc/TEnumConstant.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGlobal
#include "TGlobal.h"
-#endif
-#ifndef ROOT_TEnum
#include "TEnum.h"
-#endif
class TEnum;
diff --git a/core/meta/inc/TFileMergeInfo.h b/core/meta/inc/TFileMergeInfo.h
index 8c96708ace98dd0bf3dbc17941df8c25b3e18af7..8a0ae487e907a4084d1c9a0b89559921cf8df71f 100644
--- a/core/meta/inc/TFileMergeInfo.h
+++ b/core/meta/inc/TFileMergeInfo.h
@@ -29,13 +29,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TDirectory;
diff --git a/core/meta/inc/TFunction.h b/core/meta/inc/TFunction.h
index 62cbd41ce4ca3e0904a667365e95d2065cf5c934..fa9887e4b8d3becf3d89caabc5b68c930cac52fc 100644
--- a/core/meta/inc/TFunction.h
+++ b/core/meta/inc/TFunction.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
class TMethodCall;
diff --git a/core/meta/inc/TFunctionTemplate.h b/core/meta/inc/TFunctionTemplate.h
index 8d91c9e99048b037f5ec413855d196c05a2aa8c7..c2c73a0dc87096ad24c3a04e3350207ea4f308c6 100644
--- a/core/meta/inc/TFunctionTemplate.h
+++ b/core/meta/inc/TFunctionTemplate.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
class TFunctionTemplate : public TDictionary {
protected:
diff --git a/core/meta/inc/TGlobal.h b/core/meta/inc/TGlobal.h
index a024bef6299113bfeb5243e7915fe3cfaed6af02..9c6ce449c2502f1628fd416544132a879388d1ab 100644
--- a/core/meta/inc/TGlobal.h
+++ b/core/meta/inc/TGlobal.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
class TGlobal : public TDictionary {
diff --git a/core/meta/inc/TInterpreter.h b/core/meta/inc/TInterpreter.h
index 3687baceff123eaf5a792522e8cac187155b1111..404c40f99c9cdc850dda39f7a2f54ddaaa24a1e5 100644
--- a/core/meta/inc/TInterpreter.h
+++ b/core/meta/inc/TInterpreter.h
@@ -22,13 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
-#ifndef ROOT_TVirtualMutex
#include "TVirtualMutex.h"
-#endif
#include <map>
#include <typeinfo>
diff --git a/core/meta/inc/TInterpreterValue.h b/core/meta/inc/TInterpreterValue.h
index b6e982793711199c8a4adf9b7386eb6385f27ad0..a554c7735f7eba269bf879805246e56765fff25c 100644
--- a/core/meta/inc/TInterpreterValue.h
+++ b/core/meta/inc/TInterpreterValue.h
@@ -24,9 +24,7 @@
#ifndef ROOT_TInterpreterValue
#define ROOT_TInterpreterValue
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <string>
diff --git a/core/meta/inc/TIsAProxy.h b/core/meta/inc/TIsAProxy.h
index c7622747aa86b8af8d01265e99e36bceb97d1d0a..8188374696ac90de626ba73306fcc6cb506c5749 100644
--- a/core/meta/inc/TIsAProxy.h
+++ b/core/meta/inc/TIsAProxy.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TIsAProxy
#define ROOT_TIsAProxy
-#ifndef ROOT_TVirtualIsAProxy
#include "TVirtualIsAProxy.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <atomic>
class TClass;
diff --git a/core/meta/inc/TListOfDataMembers.h b/core/meta/inc/TListOfDataMembers.h
index 6b44c25187b4b7215fe2ed9407f3c44370838f0c..f6a756b8bae8226479fc294470cb59fa9d810bee 100644
--- a/core/meta/inc/TListOfDataMembers.h
+++ b/core/meta/inc/TListOfDataMembers.h
@@ -22,13 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_THastList
#include "THashList.h"
-#endif
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
class TExMap;
class TDataMember;
diff --git a/core/meta/inc/TListOfEnums.h b/core/meta/inc/TListOfEnums.h
index fe6b3da1b056d8e282de392f7e07865467bdfeca..63c688ce4d48df8aba3dd43e66cab125708efc51 100644
--- a/core/meta/inc/TListOfEnums.h
+++ b/core/meta/inc/TListOfEnums.h
@@ -22,13 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_THastList
#include "THashList.h"
-#endif
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
class TExMap;
class TEnum;
diff --git a/core/meta/inc/TListOfEnumsWithLock.h b/core/meta/inc/TListOfEnumsWithLock.h
index 117d3da2ed490e27e0bb0df5a8584883fe6410ce..6401dce0b7ce330e07f686a95c6dfc06197731e3 100644
--- a/core/meta/inc/TListOfEnumsWithLock.h
+++ b/core/meta/inc/TListOfEnumsWithLock.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TListOfEnums
#include "TListOfEnums.h"
-#endif
class TExMap;
class TEnum;
diff --git a/core/meta/inc/TListOfFunctionTemplates.h b/core/meta/inc/TListOfFunctionTemplates.h
index a5781d4bf9e157fa2187ca062f828915d8912526..1534cdc68052da79f7170a373e7c9004f4dac53e 100644
--- a/core/meta/inc/TListOfFunctionTemplates.h
+++ b/core/meta/inc/TListOfFunctionTemplates.h
@@ -22,17 +22,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_THastList
#include "THashList.h"
-#endif
-#ifndef ROOT_THastTable
#include "THashTable.h"
-#endif
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
class TExMap;
class TFunctionTemplate;
diff --git a/core/meta/inc/TListOfFunctions.h b/core/meta/inc/TListOfFunctions.h
index 3747dd0cd12b230553828ca1e9e48d2d15ad0f80..58fae3025dee02fc9c74fb337a4f21f3a4927b84 100644
--- a/core/meta/inc/TListOfFunctions.h
+++ b/core/meta/inc/TListOfFunctions.h
@@ -22,17 +22,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_THastList
#include "THashList.h"
-#endif
-#ifndef ROOT_THastTable
#include "THashTable.h"
-#endif
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
class TExMap;
class TFunction;
diff --git a/core/meta/inc/TMethod.h b/core/meta/inc/TMethod.h
index 999919cfc552dbb77b60d5cf8a21a8cc7560832a..5bd7204ae430e9980bb0cb6109064f8a1535b7ba 100644
--- a/core/meta/inc/TMethod.h
+++ b/core/meta/inc/TMethod.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFunction
#include "TFunction.h"
-#endif
class TList;
class TDataMember;
diff --git a/core/meta/inc/TMethodArg.h b/core/meta/inc/TMethodArg.h
index 5d50c685108329aa22365ebf9a98c685db391fe9..348a89178d994504255079004fd3066fae12698c 100644
--- a/core/meta/inc/TMethodArg.h
+++ b/core/meta/inc/TMethodArg.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
#include "TDataMember.h"
diff --git a/core/meta/inc/TMethodCall.h b/core/meta/inc/TMethodCall.h
index a6e5895882a7a1dc9eb78b4b3192fbf33aad19ae..578d4c9ffe959cc2214c02701dd762c0e32d412d 100644
--- a/core/meta/inc/TMethodCall.h
+++ b/core/meta/inc/TMethodCall.h
@@ -27,13 +27,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
-#ifndef ROOT_TInterpreter
#include "TInterpreter.h"
-#endif
class TClass;
class TFunction;
diff --git a/core/meta/inc/TProtoClass.h b/core/meta/inc/TProtoClass.h
index 70e9a98067c682dc8152b966119b5618cb4150e1..3d435e0910e47d6f2784545caacbf5481f68b099 100644
--- a/core/meta/inc/TProtoClass.h
+++ b/core/meta/inc/TProtoClass.h
@@ -13,9 +13,7 @@
#ifndef ROOT_TProtoClass
#define ROOT_TProtoClass
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TClass;
class TList;
diff --git a/core/meta/inc/TRealData.h b/core/meta/inc/TRealData.h
index 9d91d6b26a603a9eb7ac383750e31fb5ef7b8e53..bd84870d3769f82665505b4e133128935236f06a 100644
--- a/core/meta/inc/TRealData.h
+++ b/core/meta/inc/TRealData.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TDataMember;
diff --git a/core/meta/inc/TStreamerElement.h b/core/meta/inc/TStreamerElement.h
index 898d3bf34a77d042992c51c76fb9a7d997b76e26..1c1bec63e06176db67fd439b5cacea02110a549e 100644
--- a/core/meta/inc/TStreamerElement.h
+++ b/core/meta/inc/TStreamerElement.h
@@ -21,13 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_ESTLType
#include "ESTLType.h"
-#endif
class TMethodCall;
class TClass;
diff --git a/core/meta/inc/TToggle.h b/core/meta/inc/TToggle.h
index 05b3d5befaca6f66195884e4f9c47491ad1cde7a..96e5ceebe7f317651c8d11a21465dfd62db43dfd 100644
--- a/core/meta/inc/TToggle.h
+++ b/core/meta/inc/TToggle.h
@@ -34,18 +34,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TMethodCall
#include "TMethodCall.h"
-#endif
-#ifndef ROOT_TMethod
#include "TMethod.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TToggle: public TNamed {
diff --git a/core/meta/inc/TToggleGroup.h b/core/meta/inc/TToggleGroup.h
index 4df92bd77f9d6e0c6ed7a9f85ad574f69f693134..451299785d0cd037aa5471c68555971a9fc269a6 100644
--- a/core/meta/inc/TToggleGroup.h
+++ b/core/meta/inc/TToggleGroup.h
@@ -22,15 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TToggle
#include "TToggle.h"
-#endif
-#ifndef ROOT_TOrdCollection
#include "TOrdCollection.h"
-#endif
class TToggleGroup : public TNamed {
diff --git a/core/meta/inc/TVirtualRefProxy.h b/core/meta/inc/TVirtualRefProxy.h
index 9978eb780b441bbe05ae58dc682adf6cd1ffd2b0..bf6f038f8938a679dbf06cf45b4cc143d0683760 100644
--- a/core/meta/inc/TVirtualRefProxy.h
+++ b/core/meta/inc/TVirtualRefProxy.h
@@ -12,9 +12,7 @@
#define ROOT_TVirtualRefProxy
// Framework include files
-#ifndef ROOT_Rtypes
-#include "Rtypes.h"
-#endif // ROOT_Rtypes
+#include "Rtypes.h" // ROOT_Rtypes
// Forward declarations
class TClass;
diff --git a/core/meta/inc/TVirtualStreamerInfo.h b/core/meta/inc/TVirtualStreamerInfo.h
index 025bebec3e6fac6d17c096d7bca734c68c6df91c..2a9ae8803b11a919d2b70cbb0b1e76b02ce6665e 100644
--- a/core/meta/inc/TVirtualStreamerInfo.h
+++ b/core/meta/inc/TVirtualStreamerInfo.h
@@ -21,13 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_ESTLType
#include "ESTLType.h"
-#endif
class TFile;
class TClass;
diff --git a/core/meta/src/TViewPubDataMembers.h b/core/meta/src/TViewPubDataMembers.h
index cd1b4c051ba7481b7f8724ed7bd3ec899cdaceed..c73386a6881a4fd2f9c545ebdbf943cc26e0dfc6 100644
--- a/core/meta/src/TViewPubDataMembers.h
+++ b/core/meta/src/TViewPubDataMembers.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TClass;
diff --git a/core/meta/src/TViewPubFunctions.h b/core/meta/src/TViewPubFunctions.h
index 3fb5422f24700d1aabb2a84bd22122d2e1161268..eca09dc51677ec734fbfb0df1a2ff920d3ff0c13 100644
--- a/core/meta/src/TViewPubFunctions.h
+++ b/core/meta/src/TViewPubFunctions.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TClass;
diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
index 95caa32f44de2746f7d01a4feb8b17934dd05b30..b5bacd7944d987a924832a544bd77f4b719d899e 100644
--- a/core/metacling/src/TCling.cxx
+++ b/core/metacling/src/TCling.cxx
@@ -283,9 +283,7 @@ static int DeclFileLine() { return __LINE__; }
// The macros below use ::Error, so let's ensure it is included
static const std::string gClassDefInterpMacro = R"ICF(
-#ifndef ROOT_TError
#include "TError.h"
-#endif
#define _ClassDefInterp_(name,id,virtual_keyword, overrd) \
private: \
diff --git a/core/metacling/src/TCling.h b/core/metacling/src/TCling.h
index 1b56c68c105285d29ee947217b9b4fd25d4cc8db..05d9809591adf8d4ea649418b506250eb3e209d6 100644
--- a/core/metacling/src/TCling.h
+++ b/core/metacling/src/TCling.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TInterpreter
#include "TInterpreter.h"
-#endif
#include <set>
#include <unordered_set>
diff --git a/core/metacling/src/TClingValue.h b/core/metacling/src/TClingValue.h
index a13dfe0aca345d471350116d37fa210f5c6ecee4..47d64b7722d01fcac368b40e053ef68f1895b62e 100644
--- a/core/metacling/src/TClingValue.h
+++ b/core/metacling/src/TClingValue.h
@@ -24,12 +24,8 @@
#ifndef ROOT_TClingValue
#define ROOT_TClingValue
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TInterpreterValue
#include "TInterpreterValue.h"
-#endif
namespace cling {
class Value;
diff --git a/core/rint/inc/TRint.h b/core/rint/inc/TRint.h
index f89809aab64622a4c303500c79ed5c2f225c054d..554132cb5df3b7ae84e6b1a2d90f07c195eb0935 100644
--- a/core/rint/inc/TRint.h
+++ b/core/rint/inc/TRint.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TApplication
#include "TApplication.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TFileHandler;
diff --git a/core/rint/inc/TTabCom.h b/core/rint/inc/TTabCom.h
index 203145b18f11a375b4d0bb54d8333f5e24031167..3b43a583d24c827c0356f0110f06c8ed8e936aee 100644
--- a/core/rint/inc/TTabCom.h
+++ b/core/rint/inc/TTabCom.h
@@ -36,12 +36,8 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObjString
#include "TObjString.h"
-#endif
-#ifndef ROOT_TRegExp
#include "TRegexp.h"
-#endif
#define MAX_LEN_PAT 1024 // maximum length of a pattern
diff --git a/core/textinput/inc/Getline.h b/core/textinput/inc/Getline.h
index cd654a213843f27f8e8074d5d3f1a6fd2954c979..cda85d67e5454df5fa57bb17c8f9781258ef7d76 100644
--- a/core/textinput/inc/Getline.h
+++ b/core/textinput/inc/Getline.h
@@ -12,9 +12,7 @@
#ifndef ROOT_Getline
#define ROOT_Getline
-#ifndef ROOT_DllImport
#include "DllImport.h"
-#endif
#ifndef __CINT__
#ifdef __cplusplus
diff --git a/core/thread/inc/TAtomicCount.h b/core/thread/inc/TAtomicCount.h
index 12752a939b7b66018caa6dcea833dae22e544ae0..a047f58bede351afe071cda7a2fc966264c37572 100644
--- a/core/thread/inc/TAtomicCount.h
+++ b/core/thread/inc/TAtomicCount.h
@@ -54,12 +54,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_RConfigure
#include "RConfigure.h"
-#endif
#if (defined(__GLIBCPP__) || defined(__GLIBCXX__)) && !defined(__CINT__)
#include "TAtomicCountGcc.h"
diff --git a/core/thread/inc/TCondition.h b/core/thread/inc/TCondition.h
index 36decacf723de811a70bf67a382b2f4a87ef73b2..3d5a32873f3df0b51f1fffc1cdd1bdeb38897c2f 100644
--- a/core/thread/inc/TCondition.h
+++ b/core/thread/inc/TCondition.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TConditionImp
#include "TConditionImp.h"
-#endif
class TMutex;
diff --git a/core/thread/inc/TConditionImp.h b/core/thread/inc/TConditionImp.h
index 9310bd04eeb114c6bfbb5626baf961818891980b..4caa39eca74e7d35f1b143c8a865bdeb30326426 100644
--- a/core/thread/inc/TConditionImp.h
+++ b/core/thread/inc/TConditionImp.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TConditionImp : public TObject {
diff --git a/core/thread/inc/TMutex.h b/core/thread/inc/TMutex.h
index 00af1bcf5cb212f385dbe9c90f40f7efdfb496d5..07c3aa01c44038eb484d4dd6d9b301d8a696a274 100644
--- a/core/thread/inc/TMutex.h
+++ b/core/thread/inc/TMutex.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualMutex
#include "TVirtualMutex.h"
-#endif
-#ifndef ROOT_TMutexImp
#include "TMutexImp.h"
-#endif
class TMutex : public TVirtualMutex {
diff --git a/core/thread/inc/TMutexImp.h b/core/thread/inc/TMutexImp.h
index 86140eb5484fa22d75dbaff8952acbb3e0e5e65e..f503c8ec9f8a73e231e21639ddd54f1acb15cfca 100644
--- a/core/thread/inc/TMutexImp.h
+++ b/core/thread/inc/TMutexImp.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TMutexImp : public TObject {
diff --git a/core/thread/inc/TPosixCondition.h b/core/thread/inc/TPosixCondition.h
index 73149cd68cedc8d98cb0e961b0def40e656d4739..93e289190ab76381fb6b4ccec1c7b1d1cf257f0b 100644
--- a/core/thread/inc/TPosixCondition.h
+++ b/core/thread/inc/TPosixCondition.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TConditionImp
#include "TConditionImp.h"
-#endif
#ifndef __CINT__
#include <pthread.h>
diff --git a/core/thread/inc/TPosixMutex.h b/core/thread/inc/TPosixMutex.h
index 4cfdfd79e25aa55253de30d293daa970501f27a0..132b69f76a33bdcec4c40f1bf4d72b8078382828 100644
--- a/core/thread/inc/TPosixMutex.h
+++ b/core/thread/inc/TPosixMutex.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMutexImp
#include "TMutexImp.h"
-#endif
#ifndef __CINT__
#include <pthread.h>
diff --git a/core/thread/inc/TPosixThread.h b/core/thread/inc/TPosixThread.h
index 032c71181d17ad0c67dcf37912360a06c04428f3..b73f9485ff25d2b67a8b10800f8cf82456e82f9d 100644
--- a/core/thread/inc/TPosixThread.h
+++ b/core/thread/inc/TPosixThread.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TThreadImp
#include "TThreadImp.h"
-#endif
#ifndef __CINT__
#include <pthread.h>
diff --git a/core/thread/inc/TPosixThreadFactory.h b/core/thread/inc/TPosixThreadFactory.h
index 8cdeaf5d5e2bff33960c671df8f6a299012c8897..285845f937bde6c303fb4fac9e6ddde0d14146b7 100644
--- a/core/thread/inc/TPosixThreadFactory.h
+++ b/core/thread/inc/TPosixThreadFactory.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TThreadFactory
#include "TThreadFactory.h"
-#endif
class TMutexImp;
class TConditionImp;
diff --git a/core/thread/inc/TRWLock.h b/core/thread/inc/TRWLock.h
index 101055f22340080de6f43edf9d1c3e626d017eda..0f5a32ef27eccc984bc9a3708dea90722679d7c8 100644
--- a/core/thread/inc/TRWLock.h
+++ b/core/thread/inc/TRWLock.h
@@ -23,15 +23,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TMutex
#include "TMutex.h"
-#endif
-#ifndef ROOT_TCondition
#include "TCondition.h"
-#endif
class TRWLock : public TObject {
diff --git a/core/thread/inc/TSemaphore.h b/core/thread/inc/TSemaphore.h
index 87ce77cb9d6f6b8a6beecd5cf9f6c9ac15a39651..b677dd5a791679ec05c34123503f5a0d92da47b3 100644
--- a/core/thread/inc/TSemaphore.h
+++ b/core/thread/inc/TSemaphore.h
@@ -24,9 +24,7 @@
#include <mutex>
#include <condition_variable>
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TSemaphore : public TObject {
diff --git a/core/thread/inc/TThread.h b/core/thread/inc/TThread.h
index b220476185f7de42bf2923f6b3508c0b31e181c5..a023ef19c3ecdf26b23e95bfebb95e330c8447f2 100644
--- a/core/thread/inc/TThread.h
+++ b/core/thread/inc/TThread.h
@@ -24,21 +24,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TCondition
#include "TCondition.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
-#ifndef ROOT_TTimer
#include "TTimer.h"
-#endif
-#ifndef ROOT_Varargs
#include "Varargs.h"
-#endif
class TMutex;
class TThreadImp;
diff --git a/core/thread/inc/TThreadFactory.h b/core/thread/inc/TThreadFactory.h
index 064d4586b46796ae08e57d0ff5c26806891b77b1..b1a2c74b79545da9c7799f77146ce69994984564 100644
--- a/core/thread/inc/TThreadFactory.h
+++ b/core/thread/inc/TThreadFactory.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TMutexImp;
class TConditionImp;
diff --git a/core/thread/inc/TThreadImp.h b/core/thread/inc/TThreadImp.h
index 1d8ce881cf4e4097b242db4dae765099b515fad9..cbe353a392607523500ae7757fb90ada0fbca51a 100644
--- a/core/thread/inc/TThreadImp.h
+++ b/core/thread/inc/TThreadImp.h
@@ -24,12 +24,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TThread
#include "TThread.h"
-#endif
class TThreadImp : public TObject {
public:
diff --git a/core/thread/inc/TThreadPool.h b/core/thread/inc/TThreadPool.h
index 578bebfef3307446f444bda38e36b008ad72fc4b..acf106511c28de62d6cb075141915786c27e8ebb 100644
--- a/core/thread/inc/TThreadPool.h
+++ b/core/thread/inc/TThreadPool.h
@@ -20,15 +20,9 @@
//////////////////////////////////////////////////////////////////////////
// ROOT
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TMutex
#include "TMutex.h"
-#endif
-#ifndef ROOT_TCondition
#include "TCondition.h"
-#endif
#include "TThread.h"
// STD
#include <queue>
diff --git a/core/thread/inc/TWin32Condition.h b/core/thread/inc/TWin32Condition.h
index 10f01fd497f71e5483b7b7104fa22504645351ae..de8b845f75fadeb63dad27cf541b849fc78b1d84 100644
--- a/core/thread/inc/TWin32Condition.h
+++ b/core/thread/inc/TWin32Condition.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TConditionImp
#include "TConditionImp.h"
-#endif
#include "Windows4Root.h"
diff --git a/core/thread/inc/TWin32Mutex.h b/core/thread/inc/TWin32Mutex.h
index eb1fe1809f664cf8db8b72230873a95065f82a7d..29a10a6d08187c63a84b680d50c17092da594c29 100644
--- a/core/thread/inc/TWin32Mutex.h
+++ b/core/thread/inc/TWin32Mutex.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMutexImp
#include "TMutexImp.h"
-#endif
#include "Windows4Root.h"
diff --git a/core/thread/inc/TWin32Thread.h b/core/thread/inc/TWin32Thread.h
index 7d8ebc431b1bdcb1ce1ea24d7b479c3dfeeacbce..4477815df007641326e809d4e61c708f142df667 100644
--- a/core/thread/inc/TWin32Thread.h
+++ b/core/thread/inc/TWin32Thread.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TThreadImp
#include "TThreadImp.h"
-#endif
#include "Windows4Root.h"
diff --git a/core/thread/inc/TWin32ThreadFactory.h b/core/thread/inc/TWin32ThreadFactory.h
index e08ddba55b73d3599ba606aca285116d3236357b..e52bd826f6fcdd33457384254f52a22ddad3b5a5 100644
--- a/core/thread/inc/TWin32ThreadFactory.h
+++ b/core/thread/inc/TWin32ThreadFactory.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TThreadFactory
#include "TThreadFactory.h"
-#endif
class TMutexImp;
class TConditionImp;
diff --git a/core/thread/inc/ThreadLocalStorage.h b/core/thread/inc/ThreadLocalStorage.h
index 5df21516e1500b1fb69d07aa29c0bb0e4e638ade..109943b613c5afa9cefcfcd80c7ddcf43736b879 100644
--- a/core/thread/inc/ThreadLocalStorage.h
+++ b/core/thread/inc/ThreadLocalStorage.h
@@ -61,13 +61,9 @@
#include "Rtypes.h"
#endif
-#ifndef ROOT_RConfig
#include "RConfig.h"
-#endif
-#ifndef ROOT_RConfigure
#include "RConfigure.h"
-#endif
#if defined(R__MACOSX)
# if defined(__clang__) && defined(MAC_OS_X_VERSION_10_7) && (defined(__x86_64__) || defined(__i386__))
diff --git a/core/unix/inc/TUnixSystem.h b/core/unix/inc/TUnixSystem.h
index 3df4f2b1fdc83dcc3c58c36eaf47dd4a7232948b..c3c1bbf1cc4544f039c013a57bf71852ed321b0b 100644
--- a/core/unix/inc/TUnixSystem.h
+++ b/core/unix/inc/TUnixSystem.h
@@ -21,15 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
-#ifndef ROOT_TSysEvtHandler
#include "TSysEvtHandler.h"
-#endif
-#ifndef ROOT_TTimer
#include "TTimer.h"
-#endif
typedef void (*SigHandler_t)(ESignals);
diff --git a/core/winnt/inc/TWin32SplashThread.h b/core/winnt/inc/TWin32SplashThread.h
index 605e468c8a793fcf5c0cb003f9456041a20f4734..e89c54eef17a971826a9b85cab5f7fdf22ee80fa 100644
--- a/core/winnt/inc/TWin32SplashThread.h
+++ b/core/winnt/inc/TWin32SplashThread.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TWin32SplashThread
#define ROOT_TWin32SplashThread
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
///////////////////////////////////////////////////////////////////////////////
class TWin32SplashThread {
diff --git a/core/winnt/inc/TWinNTSystem.h b/core/winnt/inc/TWinNTSystem.h
index b411c54622d61828855fe678dd61459910bc9afc..5a6d2719ebcff30867ac6f56e36ca3f71b8fb7b2 100644
--- a/core/winnt/inc/TWinNTSystem.h
+++ b/core/winnt/inc/TWinNTSystem.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
#if !defined(__CINT__)
diff --git a/core/winnt/inc/Win32Constants.h b/core/winnt/inc/Win32Constants.h
index c3ff444399c063ee71340376ba6e7d181dbccc05..e061f35e25155f3f504fdb17a1c9f76574a7a7fb 100644
--- a/core/winnt/inc/Win32Constants.h
+++ b/core/winnt/inc/Win32Constants.h
@@ -10,9 +10,7 @@
#ifndef ROOT_Win32Constants
#define ROOT_Win32Constants
-#ifndef ROOT_Windows4Root
#include "Windows4Root.h"
-#endif
#if 0
#define ColorOffset 10
diff --git a/geom/gdml/inc/TGDMLParse.h b/geom/gdml/inc/TGDMLParse.h
index 989cfc99928db531020da83b9a2f9dfb9276a860..92e060b36572b6890ec7180262edd4397ba8fdfd 100644
--- a/geom/gdml/inc/TGDMLParse.h
+++ b/geom/gdml/inc/TGDMLParse.h
@@ -12,17 +12,11 @@
#ifndef ROOT_TGDMLParse
#define ROOT_TGDMLParse
-#ifndef ROOT_TGeoMatrix
#include "TGeoMatrix.h"
-#endif
-#ifndef ROOT_TXMLEngine
#include "TXMLEngine.h"
-#endif
-#ifndef ROOT_TGeoVolume
#include "TGeoVolume.h"
-#endif
#include "TFormula.h"
diff --git a/geom/gdml/inc/TGDMLWrite.h b/geom/gdml/inc/TGDMLWrite.h
index 90e080f251f72b17fd9ff3efa9806b89ccbefb4a..449fbd758090ee8126ed65ec54275f093f8ecbd8 100644
--- a/geom/gdml/inc/TGDMLWrite.h
+++ b/geom/gdml/inc/TGDMLWrite.h
@@ -12,89 +12,47 @@
#ifndef ROOT_TGDMLWRITE
#define ROOT_TGDMLWRITE
-#ifndef ROOT_TGeoMatrix
#include "TGeoMatrix.h"
-#endif
-#ifndef ROOT_TXMLEngine
#include "TXMLEngine.h"
-#endif
-#ifndef ROOT_TGeoVolume
#include "TGeoVolume.h"
-#endif
-#ifndef ROOT_TGeoParaboloid
#include "TGeoParaboloid.h"
-#endif
-#ifndef ROOT_TGeoSphere
#include "TGeoSphere.h"
-#endif
-#ifndef ROOT_TGeoArb8
#include "TGeoArb8.h"
-#endif
-#ifndef ROOT_TGeoCone
#include "TGeoCone.h"
-#endif
-#ifndef ROOT_TGeoPara
#include "TGeoPara.h"
-#endif
-#ifndef ROOT_TGeoTrd1
#include "TGeoTrd1.h"
-#endif
-#ifndef ROOT_TGeoTrd2
#include "TGeoTrd2.h"
-#endif
-#ifndef ROOT_TGeoTube
#include "TGeoTube.h"
-#endif
-#ifndef ROOT_TGeoPcon
#include "TGeoPcon.h"
-#endif
-#ifndef ROOT_TGeoTorus
#include "TGeoTorus.h"
-#endif
-#ifndef ROOT_TGeoPgon
#include "TGeoPgon.h"
-#endif
-#ifndef ROOT_TGeoXtru
#include "TGeoXtru.h"
-#endif
-#ifndef ROOT_TGeoPgon
#include "TGeoPgon.h"
-#endif
-#ifndef ROOT_TGeoEltu
#include "TGeoEltu.h"
-#endif
-#ifndef ROOT_TGeoHype
#include "TGeoHype.h"
-#endif
-#ifndef ROOT_TGeoBoolNode
#include "TGeoBoolNode.h"
-#endif
-#ifndef ROOT_TGeoCompositeShape
#include "TGeoCompositeShape.h"
-#endif
-#ifndef ROOT_TGeoScaledShape
#include "TGeoScaledShape.h"
-#endif
#include <map>
#include <vector>
diff --git a/geom/geocad/inc/TGeoToOCC.h b/geom/geocad/inc/TGeoToOCC.h
index a523e461fb584f92319edd4bfe127d6dd808a4a0..42361514beb0fcdd20f6c7c89200445bfb746cf2 100644
--- a/geom/geocad/inc/TGeoToOCC.h
+++ b/geom/geocad/inc/TGeoToOCC.h
@@ -21,12 +21,8 @@
#undef Printf
//Root
-#ifndef ROOT_TGeoXtru
#include "TGeoXtru.h"
-#endif
-#ifndef ROOT_TGeoCompositeShape
#include "TGeoCompositeShape.h"
-#endif
#include <fstream>
diff --git a/geom/geocad/inc/TGeoToStep.h b/geom/geocad/inc/TGeoToStep.h
index fd650580cfbfe669a1b2ce64090c0f554ad7f1ce..d862acbafa541fb844752940a9eb8207f1b640c2 100644
--- a/geom/geocad/inc/TGeoToStep.h
+++ b/geom/geocad/inc/TGeoToStep.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoToStep
#define ROOT_TGeoToStep
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TGeoManager;
class TOCCToStep;
diff --git a/geom/geocad/inc/TOCCToStep.h b/geom/geocad/inc/TOCCToStep.h
index 0fd09d8a929bc98c411d39f067bd3e76dabfe2e2..949185ef810b305762e6a32d59f3762f212c33c8 100644
--- a/geom/geocad/inc/TOCCToStep.h
+++ b/geom/geocad/inc/TOCCToStep.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TOCCToStep
#define ROOT_TOCCToStep
-#ifndef ROOT_TGeoNode
#include "TGeoNode.h"
-#endif
-#ifndef ROOT_TGeoMatrix
#include "TGeoMatrix.h"
-#endif
-#ifndef ROOT_TGeoToOCC
#include "TGeoToOCC.h"
-#endif
#include <TDF_Label.hxx>
#include <XCAFDoc_ShapeTool.hxx>
diff --git a/geom/geom/inc/TGeoArb8.h b/geom/geom/inc/TGeoArb8.h
index d7c733c54ce2b2af3c3f10d775d477b08c128ca2..1645ad6e607a4ef638db1de532d6346caa1cbea2 100644
--- a/geom/geom/inc/TGeoArb8.h
+++ b/geom/geom/inc/TGeoArb8.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoArb8
#define ROOT_TGeoArb8
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoArb8 : public TGeoBBox
{
diff --git a/geom/geom/inc/TGeoAtt.h b/geom/geom/inc/TGeoAtt.h
index ab2cd7d50553c1139e5874d7484e3f3b11285d94..d73424652819cee9693c80cea62f0a3dbe71e87a 100644
--- a/geom/geom/inc/TGeoAtt.h
+++ b/geom/geom/inc/TGeoAtt.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoAtt
#define ROOT_TGeoAtt
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TGeoAtt
{
diff --git a/geom/geom/inc/TGeoBBox.h b/geom/geom/inc/TGeoBBox.h
index 5e216c80802d12914755f023cb2e90e674702e4c..dc300807dea13e04d8ab16228a85155b29ea920a 100644
--- a/geom/geom/inc/TGeoBBox.h
+++ b/geom/geom/inc/TGeoBBox.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoBBox
#define ROOT_TGeoBBox
-#ifndef ROOT_TGeoShape
#include "TGeoShape.h"
-#endif
class TGeoBBox : public TGeoShape
{
diff --git a/geom/geom/inc/TGeoBoolNode.h b/geom/geom/inc/TGeoBoolNode.h
index d93baba0fcbdf9439d6fc53d851d0bd4b8f77e4a..9fb475da75a79f9f0b08091a8075fa7a78474e7e 100644
--- a/geom/geom/inc/TGeoBoolNode.h
+++ b/geom/geom/inc/TGeoBoolNode.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoBoolNode
#define ROOT_TGeoBoolNode
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
// forward declarations
class TGeoShape;
diff --git a/geom/geom/inc/TGeoBranchArray.h b/geom/geom/inc/TGeoBranchArray.h
index 7a0636ee95ba7aa558dfa4e5d16afecb64558a0c..f4b336ddd3f201997b19366ec6d2e7aa94210c0a 100644
--- a/geom/geom/inc/TGeoBranchArray.h
+++ b/geom/geom/inc/TGeoBranchArray.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TGeoBranchArray
#define ROOT_TGeoBranchArray
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TGeoMatrix
#include "TGeoMatrix.h"
-#endif
class TGeoNavigator;
class TGeoNode;
diff --git a/geom/geom/inc/TGeoBuilder.h b/geom/geom/inc/TGeoBuilder.h
index 046f80c585b23e742843721f202a326d59f10ce1..c5e1cb74d6f6c207185039467492df2369e9925c 100644
--- a/geom/geom/inc/TGeoBuilder.h
+++ b/geom/geom/inc/TGeoBuilder.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoBuilder
#define ROOT_TGeoBuilder
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TGeoMaterial;
class TGeoMatrix;
diff --git a/geom/geom/inc/TGeoCache.h b/geom/geom/inc/TGeoCache.h
index f98ffc74958a8336a74f9891997fba08f16e226d..56c6e0d19cfdeb37a2793aec264fb141e83894c7 100644
--- a/geom/geom/inc/TGeoCache.h
+++ b/geom/geom/inc/TGeoCache.h
@@ -13,13 +13,9 @@
#ifndef ROOT_TGeoCache
#define ROOT_TGeoCache
-#ifndef ROOT_TGeoNode
#include "TGeoNode.h"
-#endif
-#ifndef ROOT_TGeoStateInfo
#include "TGeoStateInfo.h"
-#endif
// forward declarations
class TGeoManager;
diff --git a/geom/geom/inc/TGeoCompositeShape.h b/geom/geom/inc/TGeoCompositeShape.h
index 0e91557710606dd2fba45a7bce93a5e6a087347d..18da894a9b4107e9c95b15b3154401d38d1123ae 100644
--- a/geom/geom/inc/TGeoCompositeShape.h
+++ b/geom/geom/inc/TGeoCompositeShape.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoCompositeShape
#define ROOT_TGeoCompositeShape
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
////////////////////////////////////////////////////////////////////////////
// //
diff --git a/geom/geom/inc/TGeoCone.h b/geom/geom/inc/TGeoCone.h
index 2b26811dbf66dbc0c4387ac90f74881ef31f86ae..8cff80b0fa1a3f1bb168c08eb358e5100af934ef 100644
--- a/geom/geom/inc/TGeoCone.h
+++ b/geom/geom/inc/TGeoCone.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoCone
#define ROOT_TGeoCone
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoCone : public TGeoBBox
{
diff --git a/geom/geom/inc/TGeoElement.h b/geom/geom/inc/TGeoElement.h
index 84269fca31288640853b529e97b54022b5638975..1b9a1feee76d3e6d1ffcbb4ec810391c680cbcdf 100644
--- a/geom/geom/inc/TGeoElement.h
+++ b/geom/geom/inc/TGeoElement.h
@@ -12,25 +12,15 @@
#ifndef ROOT_TGeoElement
#define ROOT_TGeoElement
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
#include <map>
diff --git a/geom/geom/inc/TGeoEltu.h b/geom/geom/inc/TGeoEltu.h
index e315838f9689fc3a97c5876d2b2ea89a9f830bf3..07e7e45c1b01c41e64c091d2909490fd57bb0a5b 100644
--- a/geom/geom/inc/TGeoEltu.h
+++ b/geom/geom/inc/TGeoEltu.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoEltu
#define ROOT_TGeoEltu
-#ifndef ROOT_TGeoTube
#include "TGeoTube.h"
-#endif
class TGeoEltu : public TGeoTube
{
diff --git a/geom/geom/inc/TGeoExtension.h b/geom/geom/inc/TGeoExtension.h
index 92bf2b18c9373343f7f9512ac07adaa34cfb5408..1caad690e31d4337d81155859f802931391847db 100644
--- a/geom/geom/inc/TGeoExtension.h
+++ b/geom/geom/inc/TGeoExtension.h
@@ -14,9 +14,7 @@
#include <cassert>
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TGeoExtension : public TObject
{
diff --git a/geom/geom/inc/TGeoGlobalMagField.h b/geom/geom/inc/TGeoGlobalMagField.h
index d09f84596878ad1e107eb18b5accdff27d91974e..1cfa449bc018d8f8d306221802097eee1514c337 100644
--- a/geom/geom/inc/TGeoGlobalMagField.h
+++ b/geom/geom/inc/TGeoGlobalMagField.h
@@ -11,13 +11,9 @@
#ifndef ROOT_TGeoGlobalMagField
#define ROOT_TGeoGlobalMagField
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TVirtualMagField
#include "TVirtualMagField.h"
-#endif
class TGeoGlobalMagField : public TObject
{
diff --git a/geom/geom/inc/TGeoHalfSpace.h b/geom/geom/inc/TGeoHalfSpace.h
index 1399ed532538e928a16d0c2bff65e0e15776253f..d9e8326bcc63d783a0e4092b03d584e2b927c6f4 100644
--- a/geom/geom/inc/TGeoHalfSpace.h
+++ b/geom/geom/inc/TGeoHalfSpace.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoHalfSpace
#define ROOT_TGeoHalfSpace
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoHalfSpace : public TGeoBBox
{
diff --git a/geom/geom/inc/TGeoHelix.h b/geom/geom/inc/TGeoHelix.h
index 749d03522818f1cfd4740daf273abc84dee25fb7..7f3d0e6fbd05ea1e7eb6a1c5de7552eda6649ac7 100644
--- a/geom/geom/inc/TGeoHelix.h
+++ b/geom/geom/inc/TGeoHelix.h
@@ -13,9 +13,7 @@
#define ROOT_TGeoHelix
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TGeoHMatrix;
diff --git a/geom/geom/inc/TGeoHype.h b/geom/geom/inc/TGeoHype.h
index affff91cc6c2d728705a4a75e9abb1b019ba40cc..587a4e3ff260157a49a5b0238d67f22b74d56199 100644
--- a/geom/geom/inc/TGeoHype.h
+++ b/geom/geom/inc/TGeoHype.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoHype
#define ROOT_TGeoHype
-#ifndef ROOT_TGeoTube
#include "TGeoTube.h"
-#endif
class TGeoHype : public TGeoTube
{
diff --git a/geom/geom/inc/TGeoManager.h b/geom/geom/inc/TGeoManager.h
index 0d75f67f8ebec2a6d78b129b08ad4f1aa418f419..63774a031d0e5399f526527ba73ee14c3582cd6b 100644
--- a/geom/geom/inc/TGeoManager.h
+++ b/geom/geom/inc/TGeoManager.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TGeoManager
#define ROOT_TGeoManager
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TGeoNavigator
#include "TGeoNavigator.h"
-#endif
// forward declarations
class TVirtualGeoTrack;
diff --git a/geom/geom/inc/TGeoMaterial.h b/geom/geom/inc/TGeoMaterial.h
index 956d50870c55780fe6a0fb04a87cd8d9fee38fa1..acf274a5aa5d046e58601cfca64c8d75494c7497 100644
--- a/geom/geom/inc/TGeoMaterial.h
+++ b/geom/geom/inc/TGeoMaterial.h
@@ -12,17 +12,11 @@
#ifndef ROOT_TGeoMaterial
#define ROOT_TGeoMaterial
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TGeoElement
#include "TGeoElement.h"
-#endif
// forward declarations
diff --git a/geom/geom/inc/TGeoMatrix.h b/geom/geom/inc/TGeoMatrix.h
index 6ab81e8b1fcbe011c8708038b9d73e583267349b..acc7e287bc0e8c9345a6079b2ca4817f63d3d5c9 100644
--- a/geom/geom/inc/TGeoMatrix.h
+++ b/geom/geom/inc/TGeoMatrix.h
@@ -18,9 +18,7 @@
* *
*************************************************************************/
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
//--- globals
const Double_t kNullVector[3] = {0.0, 0.0, 0.0};
diff --git a/geom/geom/inc/TGeoMedium.h b/geom/geom/inc/TGeoMedium.h
index cd3ddd8d4cf8405383d8c277c6c9bef22ee3c4cb..f8c72056cf55962ec31f8e95570d4947a8644d19 100644
--- a/geom/geom/inc/TGeoMedium.h
+++ b/geom/geom/inc/TGeoMedium.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoMedium
#define ROOT_TGeoMedium
-#ifndef ROOT_TGeoMaterial
#include "TGeoMaterial.h"
-#endif
////////////////////////////////////////////////////////////////////////////
// //
diff --git a/geom/geom/inc/TGeoNavigator.h b/geom/geom/inc/TGeoNavigator.h
index 7ec3354efd17c63876ce49def5b9bab5702985c2..6722ec28679ca942f0975a7f1d359fa6710afbdb 100644
--- a/geom/geom/inc/TGeoNavigator.h
+++ b/geom/geom/inc/TGeoNavigator.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TGeoNavigator
#define ROOT_TGeoNavigator
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TGeoNodeCache
#include "TGeoCache.h"
-#endif
////////////////////////////////////////////////////////////////////////////
// //
@@ -208,9 +204,7 @@ public :
ClassDef(TGeoNavigator, 0) // geometry navigator class
};
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
////////////////////////////////////////////////////////////////////////////
// //
diff --git a/geom/geom/inc/TGeoNode.h b/geom/geom/inc/TGeoNode.h
index 47d53f1260888b7f5a253626fe6a27342b2fb64b..7ed9fedfc0f48f222646e3cca4b00f97576a0a22 100644
--- a/geom/geom/inc/TGeoNode.h
+++ b/geom/geom/inc/TGeoNode.h
@@ -12,21 +12,13 @@
#ifndef ROOT_TGeoNode
#define ROOT_TGeoNode
-#ifndef ROOT_TGeoAtt
#include "TGeoAtt.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TGeoVolume
#include "TGeoVolume.h"
-#endif
-#ifndef ROOT_TGeoPatternFinder
#include "TGeoPatternFinder.h"
-#endif
// forward declarations
class TString;
diff --git a/geom/geom/inc/TGeoPara.h b/geom/geom/inc/TGeoPara.h
index c5d91c5863af48cb16810d9d8ea4c3c12db17a99..38fb1b10106f5838cc13ba16f164b23e5277301d 100644
--- a/geom/geom/inc/TGeoPara.h
+++ b/geom/geom/inc/TGeoPara.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoPara
#define ROOT_TGeoPara
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoPara : public TGeoBBox
{
diff --git a/geom/geom/inc/TGeoParaboloid.h b/geom/geom/inc/TGeoParaboloid.h
index 7b4be722bfc80f6b3ce593011f9828197e460022..54bfdfc271519f096e9f1743ac566cad44ec7e76 100644
--- a/geom/geom/inc/TGeoParaboloid.h
+++ b/geom/geom/inc/TGeoParaboloid.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoParaboloid
#define ROOT_TGeoParaboloid
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoParaboloid : public TGeoBBox
{
diff --git a/geom/geom/inc/TGeoParallelWorld.h b/geom/geom/inc/TGeoParallelWorld.h
index 649cc0a7672a6a47eb6a1778060ead9707ea8449..a6c3801869b475c1ff25f8b30d23b9dc29981f43 100644
--- a/geom/geom/inc/TGeoParallelWorld.h
+++ b/geom/geom/inc/TGeoParallelWorld.h
@@ -12,9 +12,7 @@
#define ROOT_TGeoParallelWorld
-#ifndef ROOT_TGeoVolume
#include "TGeoVolume.h"
-#endif
// forward declarations
class TGeoManager;
diff --git a/geom/geom/inc/TGeoPatternFinder.h b/geom/geom/inc/TGeoPatternFinder.h
index 5224e5d5ead6b2147cf6c7a34f3a42a2cc09777e..fed54fa4007a603d47e3f209d4a707bb83691794 100644
--- a/geom/geom/inc/TGeoPatternFinder.h
+++ b/geom/geom/inc/TGeoPatternFinder.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TGeoPatternFinder
#define ROOT_TGeoPatternFinder
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TGeoVolume
#include "TGeoVolume.h"
-#endif
class TGeoMatrix;
diff --git a/geom/geom/inc/TGeoPcon.h b/geom/geom/inc/TGeoPcon.h
index 32fe2586873632e6200af8e582da05f041e2fe78..ff3c6ba76e80f5e01bb244e196f6d0c4e34fb0ac 100644
--- a/geom/geom/inc/TGeoPcon.h
+++ b/geom/geom/inc/TGeoPcon.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoPcon
#define ROOT_TGeoPcon
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoPcon : public TGeoBBox
{
diff --git a/geom/geom/inc/TGeoPgon.h b/geom/geom/inc/TGeoPgon.h
index 7d456335761d7b5018f8398892b5b1bf4c9d5149..a5b76e08403efd6800aef4d1e46fb5cb8113b0cc 100644
--- a/geom/geom/inc/TGeoPgon.h
+++ b/geom/geom/inc/TGeoPgon.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoPgon
#define ROOT_TGeoPgon
-#ifndef ROOT_TGeoPcon
#include "TGeoPcon.h"
-#endif
class TGeoPgon : public TGeoPcon
{
diff --git a/geom/geom/inc/TGeoPhysicalNode.h b/geom/geom/inc/TGeoPhysicalNode.h
index 9b952d0aebe174733138ab032debf4d8a0986535..496c4628d55aefd25574e7fc4845b744fce7581b 100644
--- a/geom/geom/inc/TGeoPhysicalNode.h
+++ b/geom/geom/inc/TGeoPhysicalNode.h
@@ -12,17 +12,11 @@
#ifndef ROOT_TGeoPhysicalNode
#define ROOT_TGeoPhysicalNode
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
// forward declarations
class TGeoHMatrix;
diff --git a/geom/geom/inc/TGeoPolygon.h b/geom/geom/inc/TGeoPolygon.h
index a19ee005f053b4b8d45e7182b8822b280bb3ec9a..1e64d7cd7f27942d67ae4ea0c3263856cc0755ea 100644
--- a/geom/geom/inc/TGeoPolygon.h
+++ b/geom/geom/inc/TGeoPolygon.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TGeoPolygon
#define ROOT_TGeoPolygon
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
class TGeoPolygon : public TObject
{
diff --git a/geom/geom/inc/TGeoScaledShape.h b/geom/geom/inc/TGeoScaledShape.h
index 199bc853b111c8824f5e4cd0e8e5b3e044013d9a..ef37d217b176141cdfb3523ffc20ce860414cd0d 100644
--- a/geom/geom/inc/TGeoScaledShape.h
+++ b/geom/geom/inc/TGeoScaledShape.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoScaledShape
#define ROOT_TGeoScaledShape
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoScale;
class TGeoShape;
diff --git a/geom/geom/inc/TGeoShape.h b/geom/geom/inc/TGeoShape.h
index 13623add0c6a6047473fdcc769f8d26f5f62d712..64aff4c0e29d6b8dee941cfd07ecd4c3df6bdfcd 100644
--- a/geom/geom/inc/TGeoShape.h
+++ b/geom/geom/inc/TGeoShape.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoShape
#define ROOT_TGeoShape
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
// forward declarations
class TGeoBoolCombinator;
diff --git a/geom/geom/inc/TGeoShapeAssembly.h b/geom/geom/inc/TGeoShapeAssembly.h
index 59f175218e2844b74e6b68f67443ed4f9b2bf7d4..b5fb5056b3bfcd7c94bba092761d385bf3086e2f 100644
--- a/geom/geom/inc/TGeoShapeAssembly.h
+++ b/geom/geom/inc/TGeoShapeAssembly.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoShapeAssembly
#define ROOT_TGeoShapeAssembly
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoVolumeAssembly;
diff --git a/geom/geom/inc/TGeoSphere.h b/geom/geom/inc/TGeoSphere.h
index 6d14ddd27b8a2f4a8dab925fbe23679729616fe8..de0a8c4bb4b72bf6f0c20a19e7f649e84d723c24 100644
--- a/geom/geom/inc/TGeoSphere.h
+++ b/geom/geom/inc/TGeoSphere.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoSphere
#define ROOT_TGeoSphere
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoSphere : public TGeoBBox
{
diff --git a/geom/geom/inc/TGeoStateInfo.h b/geom/geom/inc/TGeoStateInfo.h
index 1f9bdb669bd609f8af3d2daabf4017436165c649..2fd9058b6e0b639905734a111273b8e099f921dd 100644
--- a/geom/geom/inc/TGeoStateInfo.h
+++ b/geom/geom/inc/TGeoStateInfo.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoStateInfo
#define ROOT_TGeoStateInfo
-#ifndef ROOT_TGeoMatrix
#include "TGeoMatrix.h"
-#endif
class TGeoNode;
class TGeoPolygon;
diff --git a/geom/geom/inc/TGeoTorus.h b/geom/geom/inc/TGeoTorus.h
index f81f6bb66afeb4893cc4beacdb493c492ca0084f..88dc8ef6e3abc0cf7e503640b4b657271df87bf5 100644
--- a/geom/geom/inc/TGeoTorus.h
+++ b/geom/geom/inc/TGeoTorus.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoTorus
#define ROOT_TGeoTorus
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoTorus : public TGeoBBox
{
diff --git a/geom/geom/inc/TGeoTrd1.h b/geom/geom/inc/TGeoTrd1.h
index 5ec71db7a934ca6ae3aa7f54af1db224803b5359..9deb957f2043f74db7fadff6e85c76f9f6c214f0 100644
--- a/geom/geom/inc/TGeoTrd1.h
+++ b/geom/geom/inc/TGeoTrd1.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoTrd1
#define ROOT_TGeoTrd1
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoTrd1 : public TGeoBBox
{
diff --git a/geom/geom/inc/TGeoTrd2.h b/geom/geom/inc/TGeoTrd2.h
index fa1065d47d35f1b65f4d2b181ee752e1f75f48a7..187b7c522e3b170b33c30350fdecdac7d2186b17 100644
--- a/geom/geom/inc/TGeoTrd2.h
+++ b/geom/geom/inc/TGeoTrd2.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoTrd2
#define ROOT_TGeoTrd2
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoTrd2 : public TGeoBBox
{
diff --git a/geom/geom/inc/TGeoTube.h b/geom/geom/inc/TGeoTube.h
index f40dfea0a912ef3ace2b109f70209701696f8cf2..ac0a228296d1d8ec76579ffe545a63ce06a040ac 100644
--- a/geom/geom/inc/TGeoTube.h
+++ b/geom/geom/inc/TGeoTube.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoTube
#define ROOT_TGeoTube
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoTube : public TGeoBBox
{
diff --git a/geom/geom/inc/TGeoUniformMagField.h b/geom/geom/inc/TGeoUniformMagField.h
index 9d95cfd82d6658be3949dfbe00577f751a838bc6..b42352b7422e715b2ba4321f2e390836c08a4b14 100644
--- a/geom/geom/inc/TGeoUniformMagField.h
+++ b/geom/geom/inc/TGeoUniformMagField.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TGeoUniformMagField
#define ROOT_TGeoUniformMagField
-#ifndef ROOT_TVirtualMagField
#include "TVirtualMagField.h"
-#endif
////////////////////////////////////////////////////////////////////////////
// //
diff --git a/geom/geom/inc/TGeoVolume.h b/geom/geom/inc/TGeoVolume.h
index 620e6460550aacd78bdb2c025d70c941aa15a331..12d04a3e9525180234f4f1ab93329fdb659af869 100644
--- a/geom/geom/inc/TGeoVolume.h
+++ b/geom/geom/inc/TGeoVolume.h
@@ -14,33 +14,19 @@
#define ROOT_TGeoVolume
-#ifndef ROOT_TGeoAtt
#include "TGeoAtt.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAtt3D
#include "TAtt3D.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TGeoMedium
#include "TGeoMedium.h"
-#endif
-#ifndef ROOT_TGeoShape
#include "TGeoShape.h"
-#endif
// forward declarations
class TH2F;
diff --git a/geom/geom/inc/TGeoVoxelFinder.h b/geom/geom/inc/TGeoVoxelFinder.h
index 8deab864edbd0c69629d1ba16b3cca78dae4e985..6963449bb47cb1bdd75c63856ef35e9995c75971 100644
--- a/geom/geom/inc/TGeoVoxelFinder.h
+++ b/geom/geom/inc/TGeoVoxelFinder.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoVoxelFinder
#define ROOT_TGeoVoxelFinder
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TGeoVolume;
struct TGeoStateInfo;
diff --git a/geom/geom/inc/TGeoXtru.h b/geom/geom/inc/TGeoXtru.h
index b252f1eba4a7862263ff3dcfd5e115fe4cf34475..bf6128e76ad2254e245c0e44f78fcaed3b08ae04 100644
--- a/geom/geom/inc/TGeoXtru.h
+++ b/geom/geom/inc/TGeoXtru.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoXtru
#define ROOT_TGeoXtru
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
class TGeoPolygon;
diff --git a/geom/geom/inc/TVirtualGeoConverter.h b/geom/geom/inc/TVirtualGeoConverter.h
index 6561b66b813e4755c4a2dad83bb882704ea0910b..ab6d716246c777286b7328f37d1523424ad00d91 100644
--- a/geom/geom/inc/TVirtualGeoConverter.h
+++ b/geom/geom/inc/TVirtualGeoConverter.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TVirtualGeoConverter
#define ROOT_TVirtualGeoConverter
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TGeoManager;
diff --git a/geom/geom/inc/TVirtualGeoPainter.h b/geom/geom/inc/TVirtualGeoPainter.h
index 432f203a875eb85f9685f625c18736e8dc738864..327c7f5ebf22d59e88b387167f8d8230fe6b6638 100644
--- a/geom/geom/inc/TVirtualGeoPainter.h
+++ b/geom/geom/inc/TVirtualGeoPainter.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TVirtualGeoPainter
#define ROOT_TVirtualGeoPainter
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TGeoVolume;
class TGeoNode;
diff --git a/geom/geom/inc/TVirtualGeoTrack.h b/geom/geom/inc/TVirtualGeoTrack.h
index c166feedf820d001a64758df7a057b72ecd5f30d..5e755083d44f6075757d08d41940312e6b5c6028 100644
--- a/geom/geom/inc/TVirtualGeoTrack.h
+++ b/geom/geom/inc/TVirtualGeoTrack.h
@@ -12,21 +12,13 @@
#ifndef ROOT_TVirtualGeoTrack
#define ROOT_TVirtualGeoTrack
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TGeoAtt
#include "TGeoAtt.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
class TVirtualGeoTrack : public TObject,
public TGeoAtt,
diff --git a/geom/geom/inc/TVirtualMagField.h b/geom/geom/inc/TVirtualMagField.h
index 4d638a06cc3122c6c9ac0030a985b9de9981a8cb..511d0b9373b7cb2fa081c07edf264b32875ec740 100644
--- a/geom/geom/inc/TVirtualMagField.h
+++ b/geom/geom/inc/TVirtualMagField.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TVirtualMagField
#define ROOT_TVirtualMagField
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TVirtualMagField : public TNamed
{
diff --git a/geom/geombuilder/inc/TGeoBBoxEditor.h b/geom/geombuilder/inc/TGeoBBoxEditor.h
index 498e6ef89ee85d89d6718f2722bb1aec14c92347..c364aa1a7f1f2ceb5f59f7f495aa5d06999b3c4c 100644
--- a/geom/geombuilder/inc/TGeoBBoxEditor.h
+++ b/geom/geombuilder/inc/TGeoBBoxEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoBBox;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoConeEditor.h b/geom/geombuilder/inc/TGeoConeEditor.h
index 62bbb2380c7aedf376e1d288f5aa5239804c9ac7..92993966e44a112c178e9f314208f005850c3ce5 100644
--- a/geom/geombuilder/inc/TGeoConeEditor.h
+++ b/geom/geombuilder/inc/TGeoConeEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoCone;
class TGeoConeSeg;
diff --git a/geom/geombuilder/inc/TGeoEltuEditor.h b/geom/geombuilder/inc/TGeoEltuEditor.h
index 3b8625f4a063a93d3c76bc1aadfcbd6e80bc1072..a8c20bc5396d18dc387018ed4fddcb0cd47f30e9 100644
--- a/geom/geombuilder/inc/TGeoEltuEditor.h
+++ b/geom/geombuilder/inc/TGeoEltuEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoEltu;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoGedFrame.h b/geom/geombuilder/inc/TGeoGedFrame.h
index 74eabbd76d43b8af45b5a58d4b281ab7d4274850..92471b29e1aee6897b04c45c30a5d87407786604 100644
--- a/geom/geombuilder/inc/TGeoGedFrame.h
+++ b/geom/geombuilder/inc/TGeoGedFrame.h
@@ -12,9 +12,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TGTab;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoHypeEditor.h b/geom/geombuilder/inc/TGeoHypeEditor.h
index 9febdedbc69f7e77d19ea044843b16e802d4b711..a79766f1c9b8b2f98043da05d711f95330c4e2b0 100644
--- a/geom/geombuilder/inc/TGeoHypeEditor.h
+++ b/geom/geombuilder/inc/TGeoHypeEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoHype;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoManagerEditor.h b/geom/geombuilder/inc/TGeoManagerEditor.h
index d703c6bed0e979adfdb2e4db836fee334020b0d2..3456f4a4d365047ec91e9a952a40c82146fed8b5 100644
--- a/geom/geombuilder/inc/TGeoManagerEditor.h
+++ b/geom/geombuilder/inc/TGeoManagerEditor.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoManager;
class TGeoVolume;
diff --git a/geom/geombuilder/inc/TGeoMaterialEditor.h b/geom/geombuilder/inc/TGeoMaterialEditor.h
index a14f29d540a6012e89917b07c49c83a69ca9c165..ee62995656861b0539e912b141d00d371bf2a2bb 100644
--- a/geom/geombuilder/inc/TGeoMaterialEditor.h
+++ b/geom/geombuilder/inc/TGeoMaterialEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoMaterial;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoMatrixEditor.h b/geom/geombuilder/inc/TGeoMatrixEditor.h
index 755da8099b88a0249929e960f9c3b256988191e2..623bb0ec5c953124a3069edff95313c12eb4d590 100644
--- a/geom/geombuilder/inc/TGeoMatrixEditor.h
+++ b/geom/geombuilder/inc/TGeoMatrixEditor.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoTranslation;
class TGeoRotation;
diff --git a/geom/geombuilder/inc/TGeoMediumEditor.h b/geom/geombuilder/inc/TGeoMediumEditor.h
index f773d484e11de183da5aee0b3441beaaa2cbe17a..ced44058d6021abebc6950c7d03bc62e4b028f54 100644
--- a/geom/geombuilder/inc/TGeoMediumEditor.h
+++ b/geom/geombuilder/inc/TGeoMediumEditor.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoMedium;
class TGeoMaterial;
diff --git a/geom/geombuilder/inc/TGeoNodeEditor.h b/geom/geombuilder/inc/TGeoNodeEditor.h
index d12bd5af64f53af4e17b5eb3719f08729df18447..073281252141ac1b69b743ef73eecfaa4fe5c8ae 100644
--- a/geom/geombuilder/inc/TGeoNodeEditor.h
+++ b/geom/geombuilder/inc/TGeoNodeEditor.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoNode;
class TGeoVolume;
diff --git a/geom/geombuilder/inc/TGeoParaEditor.h b/geom/geombuilder/inc/TGeoParaEditor.h
index d52fe4ec59e0999883f1af6cf4a5c77ca1eddd31..7a729f86a80f0fc60c1fb22e27dc0cd9916d8bae 100644
--- a/geom/geombuilder/inc/TGeoParaEditor.h
+++ b/geom/geombuilder/inc/TGeoParaEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoPara;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoPconEditor.h b/geom/geombuilder/inc/TGeoPconEditor.h
index 006d1531b558cd934aa2f09515cdb3a5a512eb6a..234364350d7735a8fa8625f2a3473f90e60ab77a 100644
--- a/geom/geombuilder/inc/TGeoPconEditor.h
+++ b/geom/geombuilder/inc/TGeoPconEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoPcon;
class TGeoPconSection;
diff --git a/geom/geombuilder/inc/TGeoPgonEditor.h b/geom/geombuilder/inc/TGeoPgonEditor.h
index eabe25de985acabb24f5600d0c8f96e02df842ca..c3f82176a93ee4fc68db6f7528c0de17a0cbc932 100644
--- a/geom/geombuilder/inc/TGeoPgonEditor.h
+++ b/geom/geombuilder/inc/TGeoPgonEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoPconEditor
#include "TGeoPconEditor.h"
-#endif
class TGNumberEntry;
class TGTab;
diff --git a/geom/geombuilder/inc/TGeoSphereEditor.h b/geom/geombuilder/inc/TGeoSphereEditor.h
index 13d7abeab2547e64e10c879970bbd011ae5bf2a4..69f5bd9dadf39259a65eeea025ebde1dfce5d944 100644
--- a/geom/geombuilder/inc/TGeoSphereEditor.h
+++ b/geom/geombuilder/inc/TGeoSphereEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoSphere;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoTabManager.h b/geom/geombuilder/inc/TGeoTabManager.h
index bfd434e9d7dc373ce6fd8ed41cddc66d4e2d1c3a..21ae04459cea1a9bf2db7a6e85d3c6ba09efb2ee 100644
--- a/geom/geombuilder/inc/TGeoTabManager.h
+++ b/geom/geombuilder/inc/TGeoTabManager.h
@@ -20,13 +20,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class TVirtualPad;
class TClass;
diff --git a/geom/geombuilder/inc/TGeoTorusEditor.h b/geom/geombuilder/inc/TGeoTorusEditor.h
index cf68eeef426549983024838c398c4fc3ee1bcf5a..766becf26771f09375d4dc40d63e28be96101768 100644
--- a/geom/geombuilder/inc/TGeoTorusEditor.h
+++ b/geom/geombuilder/inc/TGeoTorusEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoTorus;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoTrapEditor.h b/geom/geombuilder/inc/TGeoTrapEditor.h
index ac5286359b2fd68c767b03ca953e61ba45bf2835..26af4311aabb63e0acbceda41adabbf552bd3048 100644
--- a/geom/geombuilder/inc/TGeoTrapEditor.h
+++ b/geom/geombuilder/inc/TGeoTrapEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoTrap;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoTrd1Editor.h b/geom/geombuilder/inc/TGeoTrd1Editor.h
index 02120d33b76d93c93439da601d7461e72c0de0ee..b830d65c7d2083a85537a5fa3cb8ff9da42cbceb 100644
--- a/geom/geombuilder/inc/TGeoTrd1Editor.h
+++ b/geom/geombuilder/inc/TGeoTrd1Editor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoTrd1;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoTrd2Editor.h b/geom/geombuilder/inc/TGeoTrd2Editor.h
index 9aa22b86917c766449f0c8b20c070514adb9497b..32f3c40da1066bfe3e949e6fa08e905f6af59af3 100644
--- a/geom/geombuilder/inc/TGeoTrd2Editor.h
+++ b/geom/geombuilder/inc/TGeoTrd2Editor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoTrd2;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoTubeEditor.h b/geom/geombuilder/inc/TGeoTubeEditor.h
index 026bc24161d1cd355d3c490c61fd08f5cc61f47a..658b66832df8e3ea95118a4104e16463c5c546c9 100644
--- a/geom/geombuilder/inc/TGeoTubeEditor.h
+++ b/geom/geombuilder/inc/TGeoTubeEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoTube;
class TGeoTabManager;
diff --git a/geom/geombuilder/inc/TGeoVolumeEditor.h b/geom/geombuilder/inc/TGeoVolumeEditor.h
index 7bc97c2b57b58cde146a571a30c423b785aea277..08362d9ee79bf634787e98345ab7d168fee4f38d 100644
--- a/geom/geombuilder/inc/TGeoVolumeEditor.h
+++ b/geom/geombuilder/inc/TGeoVolumeEditor.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGeoGedFrame
#include "TGeoGedFrame.h"
-#endif
class TGeoManager;
class TGeoVolume;
diff --git a/geom/geompainter/inc/TGeoChecker.h b/geom/geompainter/inc/TGeoChecker.h
index 620eafb575928d7b189848f7d40033fb4cc7d380..0d85a7274ad0172d4358147f382753d6b959863b 100644
--- a/geom/geompainter/inc/TGeoChecker.h
+++ b/geom/geompainter/inc/TGeoChecker.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGeoChecker
#define ROOT_TGeoChecker
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
// forward declarations
class TTree;
diff --git a/geom/geompainter/inc/TGeoOverlap.h b/geom/geompainter/inc/TGeoOverlap.h
index d2c4e78f4260924ba4048dc9b210e17afb37191e..c2ad041d41ab7ecf7e4ea5d90b6392edbecfee55 100644
--- a/geom/geompainter/inc/TGeoOverlap.h
+++ b/geom/geompainter/inc/TGeoOverlap.h
@@ -12,25 +12,15 @@
#ifndef ROOT_TGeoOverlap
#define ROOT_TGeoOverlap
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAtt3D
#include "TAtt3D.h"
-#endif
-#ifndef ROOT_TGeoMatrix
#include "TGeoMatrix.h"
-#endif
///////////////////////////////////////////////////////////////////////////
// //
diff --git a/geom/geompainter/inc/TGeoPainter.h b/geom/geompainter/inc/TGeoPainter.h
index e2cca42f66c716881c2581d9f3da34981b9694ad..53a5649d9290e77ea9a5e09e15ddf5fc6270817e 100644
--- a/geom/geompainter/inc/TGeoPainter.h
+++ b/geom/geompainter/inc/TGeoPainter.h
@@ -20,13 +20,9 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualGeoPainter
#include "TVirtualGeoPainter.h"
-#endif
-#ifndef ROOT_TGeoManager
#include "TGeoManager.h"
-#endif
class TString;
class TGeoHMatrix;
diff --git a/geom/geompainter/inc/TGeoTrack.h b/geom/geompainter/inc/TGeoTrack.h
index db8a43ef1387b15cc742f1edda45532b2ebc6868..a46828a7ca5f4312d334af1c8ae86af2452c7f83 100644
--- a/geom/geompainter/inc/TGeoTrack.h
+++ b/geom/geompainter/inc/TGeoTrack.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TGeoTrack
#define ROOT_TGeoTrack
-#ifndef ROOT_TVirtualGeoTrack
#include "TVirtualGeoTrack.h"
-#endif
-#ifndef ROOT_TPolyLine3D
#include "TPolyLine3D.h"
-#endif
class TPolyMarker3D;
diff --git a/geom/vecgeom/inc/TGeoVGConverter.h b/geom/vecgeom/inc/TGeoVGConverter.h
index c60e7ea419671318c9ba4ac81c5a8e2b6635ddb8..0e696c695fe552fca63ff440bfff3988d815601b 100644
--- a/geom/vecgeom/inc/TGeoVGConverter.h
+++ b/geom/vecgeom/inc/TGeoVGConverter.h
@@ -19,13 +19,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualGeoConverter
#include "TVirtualGeoConverter.h"
-#endif
-#ifndef ROOT_TGeoManager
#include "TGeoManager.h"
-#endif
class TGeoVGConverter : public TVirtualGeoConverter {
public:
diff --git a/geom/vecgeom/inc/TGeoVGShape.h b/geom/vecgeom/inc/TGeoVGShape.h
index 36248004d602da5f802ded2ee621daafe13778c6..44b7372e32924386c7f0a7fe523e35120840bd27 100644
--- a/geom/vecgeom/inc/TGeoVGShape.h
+++ b/geom/vecgeom/inc/TGeoVGShape.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TGeoVGShape
#define ROOT_TGeoVGShape
-#ifndef ROOT_TGeoBBox
#include "TGeoBBox.h"
-#endif
////////////////////////////////////////////////////////////////////////////
// //
diff --git a/graf2d/asimage/inc/TASImage.h b/graf2d/asimage/inc/TASImage.h
index ba0c7a677a12a3d5d4542fe1ad0a0ea743bbcb57..6e91708495afea229027931b77da1f0258564bf8 100644
--- a/graf2d/asimage/inc/TASImage.h
+++ b/graf2d/asimage/inc/TASImage.h
@@ -21,9 +21,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TImage
#include "TImage.h"
-#endif
struct ASImage;
struct ASVisual;
diff --git a/graf2d/asimage/inc/TASImagePlugin.h b/graf2d/asimage/inc/TASImagePlugin.h
index a951d4b289a9655f66aa0142ddd82eb4a44f8de0..715973e6a7ab4bb028204648105a5fc6e4dcbbe4 100644
--- a/graf2d/asimage/inc/TASImagePlugin.h
+++ b/graf2d/asimage/inc/TASImagePlugin.h
@@ -19,9 +19,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TImagePlugin
#include "TImagePlugin.h"
-#endif
struct ASImage;
diff --git a/graf2d/asimage/inc/TASPaletteEditor.h b/graf2d/asimage/inc/TASPaletteEditor.h
index 2fe594c284ac8df255f61e2dd84c7dc3db057d32..21b6d3d6f54b888db21e4272aaf77b9a723f003a 100644
--- a/graf2d/asimage/inc/TASPaletteEditor.h
+++ b/graf2d/asimage/inc/TASPaletteEditor.h
@@ -22,15 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TAttImage
#include "TAttImage.h"
-#endif
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TLine
#include "TLine.h"
-#endif
class TVirtualPad;
diff --git a/graf2d/asimage/inc/TASPluginGS.h b/graf2d/asimage/inc/TASPluginGS.h
index 2b2a5a07df4cef9dcef617f643b6f447cc88ba02..58ef0f844fb37907a7e73a4741f23b9149196afa 100644
--- a/graf2d/asimage/inc/TASPluginGS.h
+++ b/graf2d/asimage/inc/TASPluginGS.h
@@ -19,9 +19,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TASImagePlugin
#include "TASImagePlugin.h"
-#endif
class TASPluginGS : public TASImagePlugin {
diff --git a/graf2d/cocoa/inc/FontCache.h b/graf2d/cocoa/inc/FontCache.h
index 91b1778826e3976fcb0b36d1f5cacf86483de1de..52184ac892342a1cf92076c52f636cdb644f54e9 100644
--- a/graf2d/cocoa/inc/FontCache.h
+++ b/graf2d/cocoa/inc/FontCache.h
@@ -19,12 +19,8 @@
#include <ApplicationServices/ApplicationServices.h>
-#ifndef ROOT_XLFDParser
#include "XLFDParser.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
#include "CocoaUtils.h"
diff --git a/graf2d/cocoa/inc/QuartzPixmap.h b/graf2d/cocoa/inc/QuartzPixmap.h
index 0b49a2bac6a097e4f508983380c302684b6e1983..bf261ee5acb85303930971171bc265c619d167a5 100644
--- a/graf2d/cocoa/inc/QuartzPixmap.h
+++ b/graf2d/cocoa/inc/QuartzPixmap.h
@@ -17,18 +17,10 @@
#include <Cocoa/Cocoa.h>
-#ifndef ROOT_CocoaGuiTypes
#include "CocoaGuiTypes.h"
-#endif
-#ifndef ROOT_CocoaUtils
#include "CocoaUtils.h"
-#endif
-#ifndef ROOT_X11Drawable
#include "X11Drawable.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
///////////////////////////////////////////////////////
// //
diff --git a/graf2d/cocoa/inc/QuartzWindow.h b/graf2d/cocoa/inc/QuartzWindow.h
index c78d54df3448d0e481a4b6c0d77b3a88841c7df0..cb510bfe474f65546cb0c26e4eeecb873ce4768e 100644
--- a/graf2d/cocoa/inc/QuartzWindow.h
+++ b/graf2d/cocoa/inc/QuartzWindow.h
@@ -14,18 +14,10 @@
#include <Cocoa/Cocoa.h>
-#ifndef ROOT_CocoaGuiTypes
#include "CocoaGuiTypes.h"
-#endif
-#ifndef ROOT_X11Drawable
#include "X11Drawable.h"
-#endif
-#ifndef ROOT_X11Events
#include "X11Events.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
////////////////////////////////////////////////
// //
diff --git a/graf2d/cocoa/inc/ROOTOpenGLView.h b/graf2d/cocoa/inc/ROOTOpenGLView.h
index 3c5cab393c49c2d78534805ec092db26f2fec2ac..0c0175dc31d8747b046b2fe9b5bdab225d6ae144 100644
--- a/graf2d/cocoa/inc/ROOTOpenGLView.h
+++ b/graf2d/cocoa/inc/ROOTOpenGLView.h
@@ -12,9 +12,7 @@
#ifndef ROOT_ROOTOpenGLView
#define ROOT_ROOTOpenGLView
-#ifndef ROOT_QuartzWindow
#include "QuartzWindow.h"
-#endif
///////////////////////////////////////////
// //
diff --git a/graf2d/cocoa/inc/TGOSXGL.h b/graf2d/cocoa/inc/TGOSXGL.h
index 5c53491a82f239307df63135227f580476976389..98606f738c23ac63eef935214880b197af159ec3 100644
--- a/graf2d/cocoa/inc/TGOSXGL.h
+++ b/graf2d/cocoa/inc/TGOSXGL.h
@@ -3,9 +3,7 @@
#include <map>
-#ifndef ROOT_TVirtualGL
#include "TVirtualGL.h"
-#endif
//
//TGLManager is a legacy interface (gl-context/window management):
diff --git a/graf2d/cocoa/inc/TGQuartz.h b/graf2d/cocoa/inc/TGQuartz.h
index f36b3e4d80ba3cc9aae7ebff0fdb79a5381efccd..a92ca775e20ded9a12d23d03f79edb6afd599319 100644
--- a/graf2d/cocoa/inc/TGQuartz.h
+++ b/graf2d/cocoa/inc/TGQuartz.h
@@ -14,15 +14,9 @@
#include <vector>
-#ifndef ROOT_TGCocoa
#include "TGCocoa.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
-#ifndef ROOT_TTF
#include "TTF.h"
-#endif
/** \class TGQuartz
\ingroup cocoa
diff --git a/graf2d/cocoa/inc/X11Atoms.h b/graf2d/cocoa/inc/X11Atoms.h
index e4ca790ce284693106977bbf62d61d16a9e49798..085aab04684b8d5b187e0097846d415b6a18f017 100644
--- a/graf2d/cocoa/inc/X11Atoms.h
+++ b/graf2d/cocoa/inc/X11Atoms.h
@@ -5,9 +5,7 @@
#include <vector>
#include <map>
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
namespace ROOT {
namespace MacOSX {
diff --git a/graf2d/cocoa/inc/X11Buffer.h b/graf2d/cocoa/inc/X11Buffer.h
index 5febe578c23fd8679cd05c69d27436f1c83b62ed..674479a6240fd096cb81d6e4824b5ff447b20fdc 100644
--- a/graf2d/cocoa/inc/X11Buffer.h
+++ b/graf2d/cocoa/inc/X11Buffer.h
@@ -17,12 +17,8 @@
#include <Cocoa/Cocoa.h>
-#ifndef ROOT_CocoaGuiTypes
#include "CocoaGuiTypes.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
//////////////////////////////////////////////////////////////////////////////////
// //
diff --git a/graf2d/cocoa/inc/X11Colors.h b/graf2d/cocoa/inc/X11Colors.h
index 034a8643fee8ad10b23a3895266cbb813dcfe77d..4c5ec0c4b60158370e15aa99af394f890d813ea4 100644
--- a/graf2d/cocoa/inc/X11Colors.h
+++ b/graf2d/cocoa/inc/X11Colors.h
@@ -24,12 +24,8 @@
#include <ApplicationServices/ApplicationServices.h>
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
namespace ROOT {
namespace MacOSX {
diff --git a/graf2d/cocoa/inc/X11Drawable.h b/graf2d/cocoa/inc/X11Drawable.h
index a226e6b4c44f938a58ae9c2b395dbeb1cafbaeba..1df9e7678fe505896da4118c7f50a3c12bcddba9 100644
--- a/graf2d/cocoa/inc/X11Drawable.h
+++ b/graf2d/cocoa/inc/X11Drawable.h
@@ -14,15 +14,9 @@
#include <Cocoa/Cocoa.h>
-#ifndef ROOT_CocoaGuiTypes
#include "CocoaGuiTypes.h"
-#endif
-#ifndef ROOT_TVirtualX
#include "TVirtualX.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
@class PassiveKeyGrab;
@class QuartzWindow;
diff --git a/graf2d/cocoa/inc/X11Events.h b/graf2d/cocoa/inc/X11Events.h
index f2fd24df3b17263dca822e3e1ac13e13c42beaa2..3923356144771e8aab0d3e67531f08b639e8e8eb 100644
--- a/graf2d/cocoa/inc/X11Events.h
+++ b/graf2d/cocoa/inc/X11Events.h
@@ -14,9 +14,7 @@
#include <deque>
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
#include <Foundation/Foundation.h>
diff --git a/graf2d/cocoa/src/CocoaPrivate.h b/graf2d/cocoa/src/CocoaPrivate.h
index 2614feeaeb7195f12d79133a8849e1f1fb4a227b..302e4ce4850904e344109340d33004312309ff31 100644
--- a/graf2d/cocoa/src/CocoaPrivate.h
+++ b/graf2d/cocoa/src/CocoaPrivate.h
@@ -16,21 +16,11 @@
#include <vector>
#include <map>
-#ifndef ROOT_CocoaUtils
#include "CocoaUtils.h"
-#endif
-#ifndef ROOT_X11Colors
#include "X11Colors.h"
-#endif
-#ifndef ROOT_X11Events
#include "X11Events.h"
-#endif
-#ifndef ROOT_X11Buffer
#include "X11Buffer.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
#ifndef ROOT_GuiFonts
#include "FontCache.h"
#endif
diff --git a/graf2d/fitsio/inc/TFITS.h b/graf2d/fitsio/inc/TFITS.h
index 9baa1efa3a7c5ae7b5f0e098adc47d0e9575fc32..af875fd57a40b91a4a1e8c9246ef94d513d5d764 100644
--- a/graf2d/fitsio/inc/TFITS.h
+++ b/graf2d/fitsio/inc/TFITS.h
@@ -20,15 +20,9 @@
// Please, see TFITS.cxx for info about implementation //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TVectorDfwd
#include "TVectorDfwd.h"
-#endif
class TArrayI;
class TArrayD;
diff --git a/graf2d/gpad/inc/TAttCanvas.h b/graf2d/gpad/inc/TAttCanvas.h
index e9b6e8de6801a987b38cfdaeba4aff78193f62dc..c4b2c59c9235467575c50bf8c81cf1fb2d61f8c8 100644
--- a/graf2d/gpad/inc/TAttCanvas.h
+++ b/graf2d/gpad/inc/TAttCanvas.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TAttCanvas
#define ROOT_TAttCanvas
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TAttCanvas {
private:
diff --git a/graf2d/gpad/inc/TButton.h b/graf2d/gpad/inc/TButton.h
index f976b04a5789223970b7aabb54dca0a2d78d0b7e..509cb459dc5352e3692698dc7ba31b81be99dbf3 100644
--- a/graf2d/gpad/inc/TButton.h
+++ b/graf2d/gpad/inc/TButton.h
@@ -13,9 +13,7 @@
#define ROOT_TButton
-#ifndef ROOT_TPad
#include "TPad.h"
-#endif
#include "TAttText.h"
class TButton : public TPad, public TAttText {
diff --git a/graf2d/gpad/inc/TCanvas.h b/graf2d/gpad/inc/TCanvas.h
index 3299f4e70c9a872a93faa6c6b7b299b5da09a1d6..6aac738929571fe101e91922785f1cd98e34523c 100644
--- a/graf2d/gpad/inc/TCanvas.h
+++ b/graf2d/gpad/inc/TCanvas.h
@@ -14,25 +14,15 @@
-#ifndef ROOT_TPad
#include "TPad.h"
-#endif
-#ifndef ROOT_TAttCanvas
#include "TAttCanvas.h"
-#endif
-#ifndef ROOT_TVirtualX
#include "TVirtualX.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TCanvasImp
#include "TCanvasImp.h"
-#endif
class TContextMenu;
class TControlBar;
diff --git a/graf2d/gpad/inc/TClassTree.h b/graf2d/gpad/inc/TClassTree.h
index a959222b6ee332bb506406993f912e07530a8f7e..4f67737cc95c1cc49a700ed52bc5180a72948f5e 100644
--- a/graf2d/gpad/inc/TClassTree.h
+++ b/graf2d/gpad/inc/TClassTree.h
@@ -13,9 +13,7 @@
#define ROOT_TClassTree
-#ifndef ROOT_TTnamed
#include "TNamed.h"
-#endif
class TClass;
class TObjString;
diff --git a/graf2d/gpad/inc/TColorWheel.h b/graf2d/gpad/inc/TColorWheel.h
index beede4096cc5472db5224d0ff3a3ffd9aa6e6e60..4476039366d958b1f5b2eeb69737f3caa1e0931b 100644
--- a/graf2d/gpad/inc/TColorWheel.h
+++ b/graf2d/gpad/inc/TColorWheel.h
@@ -13,9 +13,7 @@
#define ROOT_TColorWheel
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TCanvas;
class TArc;
diff --git a/graf2d/gpad/inc/TControlBar.h b/graf2d/gpad/inc/TControlBar.h
index 3f9287f295217860a4e74c784b768eba5855a042..ed6d7638b9a7401327957c80c4f15eae5fbd8ca3 100644
--- a/graf2d/gpad/inc/TControlBar.h
+++ b/graf2d/gpad/inc/TControlBar.h
@@ -13,13 +13,9 @@
#define ROOT_TControlBar
-#ifndef ROOT_TControlBarButton
#include "TControlBarButton.h"
-#endif
-#ifndef ROOT_TControlBarImp
#include "TControlBarImp.h"
-#endif
class TList;
diff --git a/graf2d/gpad/inc/TControlBarButton.h b/graf2d/gpad/inc/TControlBarButton.h
index 5138ef844dddaf03e98266d603c73fa8422966d1..6450b6503a11ef6a01b670d4a1c6e6dedd31592c 100644
--- a/graf2d/gpad/inc/TControlBarButton.h
+++ b/graf2d/gpad/inc/TControlBarButton.h
@@ -13,13 +13,9 @@
#define ROOT_TControlBarButton
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TControlBarButton : public TNamed {
diff --git a/graf2d/gpad/inc/TCreatePrimitives.h b/graf2d/gpad/inc/TCreatePrimitives.h
index d7487c260609ee94ca8d920a0ddbec042fecb657..688bdce9580d3f5e6ebf59fc2f92a82abc867dda 100644
--- a/graf2d/gpad/inc/TCreatePrimitives.h
+++ b/graf2d/gpad/inc/TCreatePrimitives.h
@@ -12,9 +12,7 @@
#define ROOT_TCreatePrimitives
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include "TLatex.h"
#include "TCurlyArc.h"
diff --git a/graf2d/gpad/inc/TDialogCanvas.h b/graf2d/gpad/inc/TDialogCanvas.h
index a3786b2efd9b960c901bf6c7d5edd0edde13a1b4..84034009818aa33daae6af26441317775400b8a9 100644
--- a/graf2d/gpad/inc/TDialogCanvas.h
+++ b/graf2d/gpad/inc/TDialogCanvas.h
@@ -13,12 +13,8 @@
#define ROOT_TDialogCanvas
-#ifndef ROOT_TCanvas
#include "TCanvas.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
class TDialogCanvas : public TCanvas, public TAttText {
diff --git a/graf2d/gpad/inc/TGroupButton.h b/graf2d/gpad/inc/TGroupButton.h
index 652f0389c8657c7f722462f172d8300c566ca052..b52f583699f77968079a4bf9905d0254a88a2e47 100644
--- a/graf2d/gpad/inc/TGroupButton.h
+++ b/graf2d/gpad/inc/TGroupButton.h
@@ -13,9 +13,7 @@
#define ROOT_TGroupButton
-#ifndef ROOT_TButton
#include "TButton.h"
-#endif
class TGroupButton : public TButton {
diff --git a/graf2d/gpad/inc/TInspectCanvas.h b/graf2d/gpad/inc/TInspectCanvas.h
index 150974584b4c78c5da0a1aea4201828ccd771e41..706d01e9344713e26131dde5c5ce45b469854487 100644
--- a/graf2d/gpad/inc/TInspectCanvas.h
+++ b/graf2d/gpad/inc/TInspectCanvas.h
@@ -13,12 +13,8 @@
#define ROOT_TInspectCanvas
-#ifndef ROOT_TCanvas
#include "TCanvas.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
class TButton;
diff --git a/graf2d/gpad/inc/TPad.h b/graf2d/gpad/inc/TPad.h
index 7a01ec0361fc12e04005305579bd78d750454504..068ef57174da85de8e4f9f6adeea5978ba810924 100644
--- a/graf2d/gpad/inc/TPad.h
+++ b/graf2d/gpad/inc/TPad.h
@@ -13,18 +13,10 @@
#define ROOT_TPad
-#ifndef ROOT_TVirtualPad
#include "TVirtualPad.h"
-#endif
-#ifndef ROOT_TAttBBox2D
#include "TAttBBox2D.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
class TVirtualViewer3D;
class TVirtualPadPainter;
diff --git a/graf2d/gpad/inc/TPadPainter.h b/graf2d/gpad/inc/TPadPainter.h
index ea9429d466abd65c94b5495d1425505cbc263caf..4a8523afb060b831a5b12f5c49d59d2f80b19b1a 100644
--- a/graf2d/gpad/inc/TPadPainter.h
+++ b/graf2d/gpad/inc/TPadPainter.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TPadPainter
#define ROOT_TPadPainter
-#ifndef ROOT_TVirtualPadPainter
#include "TVirtualPadPainter.h"
-#endif
/*
TVirtualPadPainter is an attempt to abstract
diff --git a/graf2d/gpad/inc/TPaveClass.h b/graf2d/gpad/inc/TPaveClass.h
index 74d149737ae2afe3efb823e65139f9e44c76387c..6686340817af803b5520e40028c79daaee9e162e 100644
--- a/graf2d/gpad/inc/TPaveClass.h
+++ b/graf2d/gpad/inc/TPaveClass.h
@@ -12,12 +12,8 @@
#define ROOT_TPaveClass
-#ifndef ROOT_TPaveLabel
#include "TPaveLabel.h"
-#endif
-#ifndef ROOT_TClassTree
#include "TClassTree.h"
-#endif
class TPaveClass : public TPaveLabel{
diff --git a/graf2d/gpad/inc/TRatioPlot.h b/graf2d/gpad/inc/TRatioPlot.h
index 2f694d393db2992e21a775d50cbc5d64e87f7169..d28858652b180dee76e2c4ae05c17208b2cc2d16 100644
--- a/graf2d/gpad/inc/TRatioPlot.h
+++ b/graf2d/gpad/inc/TRatioPlot.h
@@ -21,17 +21,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TGraph
#include "TGraph.h"
-#endif
class TH1;
class TPad;
diff --git a/graf2d/gpad/inc/TSlider.h b/graf2d/gpad/inc/TSlider.h
index c24f921127b7f5b62b0e83ab542ba5ee81308278..05f9f87dbc306ea1ddbba782d06e7df501e299d1 100644
--- a/graf2d/gpad/inc/TSlider.h
+++ b/graf2d/gpad/inc/TSlider.h
@@ -13,9 +13,7 @@
#define ROOT_TSlider
-#ifndef ROOT_TPad
#include "TPad.h"
-#endif
class TSlider : public TPad {
diff --git a/graf2d/gpad/inc/TSliderBox.h b/graf2d/gpad/inc/TSliderBox.h
index 23bcbe9c260733ba2e2d9770228c42746d5eaa1f..7754cbbaadbe309ec2bf4396adc956c1a9ef00e6 100644
--- a/graf2d/gpad/inc/TSliderBox.h
+++ b/graf2d/gpad/inc/TSliderBox.h
@@ -13,9 +13,7 @@
#define ROOT_TSliderBox
-#ifndef ROOT_TWbox
#include "TWbox.h"
-#endif
class TSlider;
diff --git a/graf2d/gpad/inc/TView.h b/graf2d/gpad/inc/TView.h
index 48311ef1bf1a91f5804351e1e36716dbdf423689..42fa2e0111b840a1c0f7556fb66021d5a221f597 100644
--- a/graf2d/gpad/inc/TView.h
+++ b/graf2d/gpad/inc/TView.h
@@ -14,13 +14,9 @@
#define ROOT_TView
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
class TList;
class TSeqCollection;
diff --git a/graf2d/gpad/inc/TViewer3DPad.h b/graf2d/gpad/inc/TViewer3DPad.h
index 7246ea0d280e5ff6391d1c34eab6c08f76ce4bcd..935aa84ee33d50c6d4212159c5922130767d75e3 100644
--- a/graf2d/gpad/inc/TViewer3DPad.h
+++ b/graf2d/gpad/inc/TViewer3DPad.h
@@ -13,9 +13,7 @@
#define ROOT_TViewer3DPad
-#ifndef ROOT_TVirtualViewer3D
#include "TVirtualViewer3D.h"
-#endif
class TVirtualPad;
diff --git a/graf2d/gpad/src/TRatioPlot.cxx b/graf2d/gpad/src/TRatioPlot.cxx
index 2eae1782e6e5452db92405fee6230e6a0a460c64..3ae0985cf70d407cd363975833dd0385ab44d263 100644
--- a/graf2d/gpad/src/TRatioPlot.cxx
+++ b/graf2d/gpad/src/TRatioPlot.cxx
@@ -11,69 +11,37 @@
#include "TRatioPlot.h"
-#ifndef ROOT_TROOT
#include "TROOT.h"
-#endif
-#ifndef ROOT_TClassRef
#include "TClassRef.h"
-#endif
-#ifndef ROOT_TVirtualPad
#include "TVirtualPad.h"
-#endif
-#ifndef ROOT_TBrowser
#include "TBrowser.h"
-#endif
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
-#ifndef ROOT_TF1
#include "TF1.h"
-#endif
-#ifndef ROOT_TPad
#include "TPad.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
-#ifndef ROOT_TGraphAsymmErrors
#include "TGraphAsymmErrors.h"
-#endif
-#ifndef ROOT_TGraphErrors
#include "TGraphErrors.h"
-#endif
-#ifndef ROOT_TGaxis
#include "TGaxis.h"
-#endif
-#ifndef ROOT_TLine
#include "TLine.h"
-#endif
-#ifndef ROOT_TVirtualFitter
#include "TVirtualFitter.h"
-#endif
-#ifndef ROOT_TFitResult
#include "TFitResult.h"
-#endif
-#ifndef ROOT_THStack
#include "THStack.h"
-#endif
#include <iostream>
diff --git a/graf2d/graf/inc/TArc.h b/graf2d/graf/inc/TArc.h
index 811e88f369317aedb3ad64efe3ccab4ab1f3e493..d699439bf04042cb43fdac6df99223841e5b35b1 100644
--- a/graf2d/graf/inc/TArc.h
+++ b/graf2d/graf/inc/TArc.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
#include "Rtypes.h"
-#ifndef ROOT_TEllipse
#include "TEllipse.h"
-#endif
class TArc : public TEllipse {
diff --git a/graf2d/graf/inc/TArrow.h b/graf2d/graf/inc/TArrow.h
index ffe41f53b44cbd24a3ab1880e9247fd468da4546..82a187e440e24616e232855fd21c6098d93a637d 100644
--- a/graf2d/graf/inc/TArrow.h
+++ b/graf2d/graf/inc/TArrow.h
@@ -21,15 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TLine
#include "TLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
class TArrow : public TLine, public TAttFill {
diff --git a/graf2d/graf/inc/TAttImage.h b/graf2d/graf/inc/TAttImage.h
index aec667658b1b003a044eb92a9d275c8470edd67f..de70c6c18fb91e4bcd3646a14473054c88f4dbbc 100644
--- a/graf2d/graf/inc/TAttImage.h
+++ b/graf2d/graf/inc/TAttImage.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TAttImage
#define ROOT_TAttImage
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TAttImage;
diff --git a/graf2d/graf/inc/TBox.h b/graf2d/graf/inc/TBox.h
index 13285fa7bc754c70e3d9bae48ef741c08a48a6e3..8fa3206a61b34d5e20915639373dabb147ddfa53 100644
--- a/graf2d/graf/inc/TBox.h
+++ b/graf2d/graf/inc/TBox.h
@@ -13,24 +13,12 @@
#define ROOT_TBox
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttBBox2D
#include "TAttBBox2D.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
class TBox : public TObject, public TAttLine, public TAttFill, public TAttBBox2D {
diff --git a/graf2d/graf/inc/TCandle.h b/graf2d/graf/inc/TCandle.h
index f3496db8f0fa56e0be8421dbaee1f6b86b8a2635..56554febbc45d03940bad4b7c08e922f43e0587d 100644
--- a/graf2d/graf/inc/TCandle.h
+++ b/graf2d/graf/inc/TCandle.h
@@ -12,18 +12,10 @@
#ifndef ROOT_TCandle
#define ROOT_TCandle
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttMarket
#include "TAttMarker.h"
-#endif
#include "TH1D.h"
#include "TMath.h"
diff --git a/graf2d/graf/inc/TCrown.h b/graf2d/graf/inc/TCrown.h
index 2793ef18d65aeffa8813667bdf5604908e317069..1885e2684a5a48ece16efaf16fe2b96945f92d1d 100644
--- a/graf2d/graf/inc/TCrown.h
+++ b/graf2d/graf/inc/TCrown.h
@@ -13,9 +13,7 @@
#define ROOT_TCrown
-#ifndef ROOT_TEllipse
#include "TEllipse.h"
-#endif
class TCrown : public TEllipse {
diff --git a/graf2d/graf/inc/TCurlyArc.h b/graf2d/graf/inc/TCurlyArc.h
index b13c8df8b3a92ecdc02732af8737ef680ea6a821..3341c72c2536e9d69e3183ebad34ce906f54d25b 100644
--- a/graf2d/graf/inc/TCurlyArc.h
+++ b/graf2d/graf/inc/TCurlyArc.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TCurlyArc
#define ROOT_TCurlyArc
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
class TPoint;
diff --git a/graf2d/graf/inc/TCurlyLine.h b/graf2d/graf/inc/TCurlyLine.h
index b342c98528f5b555b9493d74ef8d94d68e853058..76500e20b5ebe5e4c32bef4eccaa64abcd80ffa4 100644
--- a/graf2d/graf/inc/TCurlyLine.h
+++ b/graf2d/graf/inc/TCurlyLine.h
@@ -12,15 +12,9 @@
#define ROOT_TCurlyLine
-#ifndef ROOT_TPolyLine
#include "TPolyLine.h"
-#endif
-#ifndef ROOT_TAttBBox2D
#include "TAttBBox2D.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
class TPoint;
diff --git a/graf2d/graf/inc/TCutG.h b/graf2d/graf/inc/TCutG.h
index 48722b81aca6a5d1bc38c4ae680950935d295ac1..42ca1150655be67de2e1f0afe1e0684c815d78ef 100644
--- a/graf2d/graf/inc/TCutG.h
+++ b/graf2d/graf/inc/TCutG.h
@@ -13,9 +13,7 @@
#define ROOT_TCutG
-#ifndef ROOT_TGraph
#include "TGraph.h"
-#endif
class TH2;
diff --git a/graf2d/graf/inc/TDiamond.h b/graf2d/graf/inc/TDiamond.h
index 75d6144d53b708306c72b311b03eb398d67fa532..c41c97c77d99f5819e36f297fdff8e8285a31bc1 100644
--- a/graf2d/graf/inc/TDiamond.h
+++ b/graf2d/graf/inc/TDiamond.h
@@ -13,15 +13,9 @@
#define ROOT_TDiamond
-#ifndef ROOT_TPaveText
#include "TPaveText.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
class TDiamond : public TPaveText {
diff --git a/graf2d/graf/inc/TEllipse.h b/graf2d/graf/inc/TEllipse.h
index 6d1cf6c70fba88f281cdbb5d4b7541f1716dc9c3..6338b194e56fdac64cfa23d971b218439301200c 100644
--- a/graf2d/graf/inc/TEllipse.h
+++ b/graf2d/graf/inc/TEllipse.h
@@ -13,24 +13,12 @@
#define ROOT_TEllipse
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttBBox2D
#include "TAttBBox2D.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
class TEllipse : public TObject, public TAttLine, public TAttFill, public TAttBBox2D {
diff --git a/graf2d/graf/inc/TFrame.h b/graf2d/graf/inc/TFrame.h
index 4b476764e8d7848b360e62b152e6e0122c89284c..adf5668b5b43ef393ddfe1b82a2d8c01d8370853 100644
--- a/graf2d/graf/inc/TFrame.h
+++ b/graf2d/graf/inc/TFrame.h
@@ -13,9 +13,7 @@
#define ROOT_TFrame
-#ifndef ROOT_TWbox
#include "TWbox.h"
-#endif
class TFrame : public TWbox {
diff --git a/graf2d/graf/inc/TGaxis.h b/graf2d/graf/inc/TGaxis.h
index 7273333afd6ed50245a686c167122e1657bec097..e84134c60590777a539dd70a6636781843470ff9 100644
--- a/graf2d/graf/inc/TGaxis.h
+++ b/graf2d/graf/inc/TGaxis.h
@@ -13,15 +13,9 @@
#define ROOT_TGaxis
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TLine
#include "TLine.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
class TF1;
class TAxis;
diff --git a/graf2d/graf/inc/TGraphPolar.h b/graf2d/graf/inc/TGraphPolar.h
index 229ef94fe181f5d650a9e5d4eed9b3042e0a79d6..4ffe73d3045ba5746c4b4c2f4a9b4b948e5d0325 100644
--- a/graf2d/graf/inc/TGraphPolar.h
+++ b/graf2d/graf/inc/TGraphPolar.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TGraphPolar
#define ROOT_TGraphPolar
-#ifndef ROOT_TGraphErrors
#include "TGraphErrors.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
#include "TGraphPolargram.h"
diff --git a/graf2d/graf/inc/TGraphPolargram.h b/graf2d/graf/inc/TGraphPolargram.h
index 1ecc24a98e3665d543b5c360034e19500653847f..87eefb32470b95ba1f050df0b0c93ab519e5b6ec 100644
--- a/graf2d/graf/inc/TGraphPolargram.h
+++ b/graf2d/graf/inc/TGraphPolargram.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TGraphPolargram
#define ROOT_TGraphPolargram
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TGraphPolargram: public TNamed, public TAttText, public TAttLine {
diff --git a/graf2d/graf/inc/TGraphQQ.h b/graf2d/graf/inc/TGraphQQ.h
index b70afb1df73fb82646deb09d008d73cb01945256..de4b70cca117899f65494c729d626c82166939c5 100644
--- a/graf2d/graf/inc/TGraphQQ.h
+++ b/graf2d/graf/inc/TGraphQQ.h
@@ -13,9 +13,7 @@
#define ROOT_TGraphQQ
-#ifndef ROOT_TGraph
#include "TGraph.h"
-#endif
class TGraphQQ : public TGraph{
protected:
diff --git a/graf2d/graf/inc/TImage.h b/graf2d/graf/inc/TImage.h
index 58de470180d6aac3042b5b36b8bd5ba87d3f45fc..9379a90fb10ee1af6e16bbd45305fcfd4ae34f63 100644
--- a/graf2d/graf/inc/TImage.h
+++ b/graf2d/graf/inc/TImage.h
@@ -13,19 +13,11 @@
#define ROOT_TImage
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttImage
#include "TAttImage.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
-#ifndef ROOT_TVectorDfwd
#include "TVectorDfwd.h"
-#endif
class TVirtualPad;
class TArrayD;
diff --git a/graf2d/graf/inc/TImagePlugin.h b/graf2d/graf/inc/TImagePlugin.h
index 10cfdf620f61b541a0686dddd051b1bf991aa2b9..b97cc14c2fcabdd04cc9c5f482a9708d85f943a1 100644
--- a/graf2d/graf/inc/TImagePlugin.h
+++ b/graf2d/graf/inc/TImagePlugin.h
@@ -13,13 +13,9 @@
#define ROOT_TImagePlugin
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TImagePlugin : public TObject {
diff --git a/graf2d/graf/inc/TLatex.h b/graf2d/graf/inc/TLatex.h
index b328cd6ce3d66e97ff8c2fa614f22c6ebb002525..d2e009630f580f0b87dc0f6d63b3db2635aa34a9 100644
--- a/graf2d/graf/inc/TLatex.h
+++ b/graf2d/graf/inc/TLatex.h
@@ -11,12 +11,8 @@
#ifndef ROOT_TLatex
#define ROOT_TLatex
-#ifndef ROOT_TText
#include "TText.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
class TLatex : public TText, public TAttLine {
diff --git a/graf2d/graf/inc/TLegend.h b/graf2d/graf/inc/TLegend.h
index a6dc63aa45dead6ee0292b1b5cb990347ef04d87..f3621b14cdcec37f5968149f609dad68317d30b5 100644
--- a/graf2d/graf/inc/TLegend.h
+++ b/graf2d/graf/inc/TLegend.h
@@ -13,12 +13,8 @@
#define ROOT_TLegend
-#ifndef ROOT_TPave
#include "TPave.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
class TObject;
class TList;
diff --git a/graf2d/graf/inc/TLegendEntry.h b/graf2d/graf/inc/TLegendEntry.h
index 84f6cce6ff9dee853e8fa32e6c4c2070b53d1e41..a06bd2048c2eadddc0a5968dbb91062f172f85c2 100644
--- a/graf2d/graf/inc/TLegendEntry.h
+++ b/graf2d/graf/inc/TLegendEntry.h
@@ -14,24 +14,12 @@
#define ROOT_TLegendEntry
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TLegendEntry : public TObject, public TAttText, public TAttLine,
public TAttFill, public TAttMarker {
diff --git a/graf2d/graf/inc/TLine.h b/graf2d/graf/inc/TLine.h
index 977c173174bec648a472d865379a9c7049d81f76..41bf83b482dc994c3172f5f2b8389e25ebad699d 100644
--- a/graf2d/graf/inc/TLine.h
+++ b/graf2d/graf/inc/TLine.h
@@ -13,21 +13,11 @@
#define ROOT_TLine
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttBBox2D
#include "TAttBBox2D.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
class TLine : public TObject, public TAttLine, public TAttBBox2D {
diff --git a/graf2d/graf/inc/TLink.h b/graf2d/graf/inc/TLink.h
index 5f9952866a91b08d3e7ff207040672b50adfd87d..e239ff01f9c714a243f3667a6d4ad86f8f0159d0 100644
--- a/graf2d/graf/inc/TLink.h
+++ b/graf2d/graf/inc/TLink.h
@@ -13,9 +13,7 @@
#define ROOT_TLink
-#ifndef ROOT_TText
#include "TText.h"
-#endif
class TLink : public TText {
diff --git a/graf2d/graf/inc/TMarker.h b/graf2d/graf/inc/TMarker.h
index f1358bb51cb9ff8b3b62786e821b57febcf3103a..f8095df592db8d2aabc4f49b12afaf4fcd8b0481 100644
--- a/graf2d/graf/inc/TMarker.h
+++ b/graf2d/graf/inc/TMarker.h
@@ -13,18 +13,10 @@
#define ROOT_TMarker
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttBBox2D
#include "TAttBBox2D.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
class TPoint;
diff --git a/graf2d/graf/inc/TMathText.h b/graf2d/graf/inc/TMathText.h
index 4dad80e3144c8b9b1410f3f52131f699d7e49298..dbbd7754be128666d75fc1f6985864d8247af56f 100644
--- a/graf2d/graf/inc/TMathText.h
+++ b/graf2d/graf/inc/TMathText.h
@@ -11,12 +11,8 @@
#ifndef ROOT_TMathText
#define ROOT_TMathText
-#ifndef ROOT_TText
#include "TText.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
class TMathTextRenderer;
diff --git a/graf2d/graf/inc/TPave.h b/graf2d/graf/inc/TPave.h
index 5c6076d2d6a2daa84549ec39cdead62166815f6b..d24f09853a3d0d82fd83bea9d2c24cd3b801877c 100644
--- a/graf2d/graf/inc/TPave.h
+++ b/graf2d/graf/inc/TPave.h
@@ -13,12 +13,8 @@
#define ROOT_TPave
-#ifndef ROOT_TBox
#include "TBox.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TPave : public TBox {
diff --git a/graf2d/graf/inc/TPaveLabel.h b/graf2d/graf/inc/TPaveLabel.h
index 0571fd4618cb47faf82bb715625016b20b531b3c..bb8dfc184d6a26664cac808c0bf00407c614501d 100644
--- a/graf2d/graf/inc/TPaveLabel.h
+++ b/graf2d/graf/inc/TPaveLabel.h
@@ -13,12 +13,8 @@
#define ROOT_TPaveLabel
-#ifndef ROOT_TPave
#include "TPave.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
class TPaveLabel : public TPave, public TAttText {
diff --git a/graf2d/graf/inc/TPaveStats.h b/graf2d/graf/inc/TPaveStats.h
index 0aaf06b96bb79ea8a3b54e5b3482b93e1a92dd1d..acbeae77728371471d3cb980ece819c664e7dc23 100644
--- a/graf2d/graf/inc/TPaveStats.h
+++ b/graf2d/graf/inc/TPaveStats.h
@@ -12,9 +12,7 @@
#define ROOT_TPaveStats
-#ifndef ROOT_TPaveText
#include "TPaveText.h"
-#endif
class TPaveStats : public TPaveText {
diff --git a/graf2d/graf/inc/TPaveText.h b/graf2d/graf/inc/TPaveText.h
index d6b9cd9e9c032124c49e1c4fa31e1b82df65a025..6b1bf1efb18ebdf8e133f8dd67cf949a8ceaedbb 100644
--- a/graf2d/graf/inc/TPaveText.h
+++ b/graf2d/graf/inc/TPaveText.h
@@ -13,15 +13,9 @@
#define ROOT_TPaveText
-#ifndef ROOT_TPave
#include "TPave.h"
-#endif
-#ifndef ROOT_TText
#include "TText.h"
-#endif
-#ifndef ROOT_TLine
#include "TLine.h"
-#endif
class TPaveText : public TPave, public TAttText {
diff --git a/graf2d/graf/inc/TPavesText.h b/graf2d/graf/inc/TPavesText.h
index 4435c9cbd25f660887c925ef026ac1074b4af982..9639164c7d822d425e7d1cb2942bc1afe637a9a6 100644
--- a/graf2d/graf/inc/TPavesText.h
+++ b/graf2d/graf/inc/TPavesText.h
@@ -13,9 +13,7 @@
#define ROOT_TPavesText
-#ifndef ROOT_TPaveText
#include "TPaveText.h"
-#endif
class TPavesText : public TPaveText {
diff --git a/graf2d/graf/inc/TPie.h b/graf2d/graf/inc/TPie.h
index 651c8b8fcf1c726917169a157e5c187aa3d12dc0..687016dd29e8f00a89fd8751ca40a6fdd5976534 100644
--- a/graf2d/graf/inc/TPie.h
+++ b/graf2d/graf/inc/TPie.h
@@ -11,18 +11,10 @@
#ifndef ROOT_TPie
#define ROOT_TPie
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TNamed
#include <TNamed.h>
-#endif
-#ifndef ROOT_TString
#include <TString.h>
-#endif
-#ifndef ROOT_TAttText
#include <TAttText.h>
-#endif
class TH1;
class TPieSlice;
diff --git a/graf2d/graf/inc/TPieSlice.h b/graf2d/graf/inc/TPieSlice.h
index 7e0471f58ab65f069562435825ee84442b5826ed..d86b209106f1a898ffe229fe3b57a581bfbd53ef 100644
--- a/graf2d/graf/inc/TPieSlice.h
+++ b/graf2d/graf/inc/TPieSlice.h
@@ -8,24 +8,12 @@
#ifndef ROOT_TPieSlice
#define ROOT_TPieSlice
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include <TString.h>
-#endif
-#ifndef ROOT_TAttText
#include <TAttText.h>
-#endif
-#ifndef ROOT_TAttFill
#include <TAttFill.h>
-#endif
-#ifndef ROOT_TAttLine
#include <TAttLine.h>
-#endif
-#ifndef ROOT_TPie
#include <TPie.h>
-#endif
class TPieSlice : public TNamed, public TAttFill, public TAttLine {
diff --git a/graf2d/graf/inc/TPoints.h b/graf2d/graf/inc/TPoints.h
index 1924dd6f4d84862b6a078ed68df35abbac2e500d..1732cea7f062571dd1fd3e53fc5ba40aa12411d5 100644
--- a/graf2d/graf/inc/TPoints.h
+++ b/graf2d/graf/inc/TPoints.h
@@ -13,9 +13,7 @@
#define ROOT_TPoints
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TPoints {
diff --git a/graf2d/graf/inc/TPolyLine.h b/graf2d/graf/inc/TPolyLine.h
index 7cebeda36c508786bfcdd5ae3b179da746627afa..03f1489ce6724b15d5a587ea10ae2a9206513f79 100644
--- a/graf2d/graf/inc/TPolyLine.h
+++ b/graf2d/graf/inc/TPolyLine.h
@@ -13,18 +13,10 @@
#define ROOT_TPolyLine
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
class TCollection;
diff --git a/graf2d/graf/inc/TTF.h b/graf2d/graf/inc/TTF.h
index ba7c38256a178ddc5bbd56e13f1ed02075dc3170..bcfe28905554ce1a807b426ca66bcc91fef34824 100644
--- a/graf2d/graf/inc/TTF.h
+++ b/graf2d/graf/inc/TTF.h
@@ -14,9 +14,7 @@
#define ROOT_TTF
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
/// @cond DOXYGEN_IGNORE
// Forward declare for the headers:
diff --git a/graf2d/graf/inc/TText.h b/graf2d/graf/inc/TText.h
index 0f4ad64102ed8f9eeb65b74aedcf6708c2d52923..d770094555707508bca6ace2d260485021f81052 100644
--- a/graf2d/graf/inc/TText.h
+++ b/graf2d/graf/inc/TText.h
@@ -13,21 +13,11 @@
#define ROOT_TText
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttBBox2D
#include "TAttBBox2D.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
class TText : public TNamed, public TAttText, public TAttBBox2D {
diff --git a/graf2d/graf/inc/TWbox.h b/graf2d/graf/inc/TWbox.h
index 53acff97b79a3901cb4eb0c590d93fa3925823c1..d923511c924baaf1f8c1a131b95dbb1c507acf1b 100644
--- a/graf2d/graf/inc/TWbox.h
+++ b/graf2d/graf/inc/TWbox.h
@@ -13,13 +13,9 @@
#define ROOT_TWbox
-#ifndef ROOT_TBox
#include "TBox.h"
-#endif
-#ifndef ROOT_TColor
#include "TColor.h"
-#endif
class TWbox : public TBox {
diff --git a/graf2d/gviz/inc/TGraphEdge.h b/graf2d/gviz/inc/TGraphEdge.h
index f8b9faf5660b08be94d7d54b2cf5fc08f57e91be..bdbd8d431edefe21f5cfef25a1e634c0722d1c1e 100644
--- a/graf2d/gviz/inc/TGraphEdge.h
+++ b/graf2d/gviz/inc/TGraphEdge.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TGraphEdge
#define ROOT_TGraphEdge
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
struct GVizAgraph_t;
struct GVizAgedge_t;
diff --git a/graf2d/gviz/inc/TGraphNode.h b/graf2d/gviz/inc/TGraphNode.h
index 4d6cf39616211a41c31181fac35b87005a0d046c..dc4cd6faf80ca21922db11c133f169923929ff01 100644
--- a/graf2d/gviz/inc/TGraphNode.h
+++ b/graf2d/gviz/inc/TGraphNode.h
@@ -12,21 +12,13 @@
#ifndef ROOT_TGraphNode
#define ROOT_TGraphNode
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
struct GVizAgraph_t;
struct GVizAgnode_t;
diff --git a/graf2d/gviz/inc/TGraphStruct.h b/graf2d/gviz/inc/TGraphStruct.h
index 937ceb709d350f444a3962c362c638f14815ad13..926985fd26fc2f0424e75c07109930ba351b5b68 100644
--- a/graf2d/gviz/inc/TGraphStruct.h
+++ b/graf2d/gviz/inc/TGraphStruct.h
@@ -12,18 +12,10 @@
#ifndef ROOT_TGraphStruct
#define ROOT_TGraphStruct
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TGraphEdge
#include "TGraphEdge.h"
-#endif
-#ifndef ROOT_TGraphNode
#include "TGraphNode.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
struct GVizAgraph_t;
struct GVC_s;
diff --git a/graf2d/ios/inc/IOSGraphicUtils.h b/graf2d/ios/inc/IOSGraphicUtils.h
index 045ffc1fbc2ce49ec27359045a89e69cdf0e49c9..ccab8ce21f242cba94aa64a4d967acb5cb53970a 100644
--- a/graf2d/ios/inc/IOSGraphicUtils.h
+++ b/graf2d/ios/inc/IOSGraphicUtils.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
namespace ROOT {
namespace iOS {
diff --git a/graf2d/ios/inc/IOSMarkers.h b/graf2d/ios/inc/IOSMarkers.h
index 9352b6ea32153b33960cb9573cc903aeef2c5300..3487d2395453f949504f9aee7ac0085272bd793f 100644
--- a/graf2d/ios/inc/IOSMarkers.h
+++ b/graf2d/ios/inc/IOSMarkers.h
@@ -24,13 +24,9 @@
#include <CoreGraphics/CGContext.h>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
namespace ROOT {
namespace iOS {
diff --git a/graf2d/ios/inc/IOSPad.h b/graf2d/ios/inc/IOSPad.h
index 0a1514ee84cf3e9ae09205ded0effd5233ac978f..e6f00854b2963bb3c85ff05741ee9d4e80d3eb1a 100644
--- a/graf2d/ios/inc/IOSPad.h
+++ b/graf2d/ios/inc/IOSPad.h
@@ -29,21 +29,13 @@
#include <CoreGraphics/CGContext.h>
-#ifndef ROOT_TLine
#include "TList.h"
-#endif
-#ifndef ROOT_IOSTextOperations
#include "IOSTextOperations.h"
-#endif
-#ifndef ROOT_IOSPainter
#include "IOSPainter.h"
-#endif
-#ifndef ROOT_IOSPadStub
#include "IOSPadStub.h"
-#endif
namespace ROOT {
namespace iOS {
diff --git a/graf2d/ios/inc/IOSPadStub.h b/graf2d/ios/inc/IOSPadStub.h
index 14c2c9b1feee285a48fba70cbe8a72fa185fe174..9c0981b2cec3f92e632e7f2cb20115e697f80c98 100644
--- a/graf2d/ios/inc/IOSPadStub.h
+++ b/graf2d/ios/inc/IOSPadStub.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualPad
#include "TVirtualPad.h"
-#endif
namespace ROOT {
namespace iOS {
diff --git a/graf2d/ios/inc/IOSPainter.h b/graf2d/ios/inc/IOSPainter.h
index d8220a247f1826ce30bd2206935af36aeafebf99..7b15a3e724bf04f493c9bb94203d3ddf3c603093 100644
--- a/graf2d/ios/inc/IOSPainter.h
+++ b/graf2d/ios/inc/IOSPainter.h
@@ -26,18 +26,10 @@
#include <CoreGraphics/CoreGraphics.h>
-#ifndef ROOT_TVirtualPadPainter
#include "TVirtualPadPainter.h"
-#endif
-#ifndef ROOT_TextOperations
#include "IOSTextOperations.h"
-#endif
-#ifndef ROOT_GraphicUtils
#include "IOSGraphicUtils.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
namespace ROOT {
namespace iOS {
diff --git a/graf2d/ios/inc/IOSResourceManagement.h b/graf2d/ios/inc/IOSResourceManagement.h
index 3f82a792e2478e9d12eba51c6459b8def1ef5ffd..216f0f14ac3c39700009137cbbbc1e609bccf632 100644
--- a/graf2d/ios/inc/IOSResourceManagement.h
+++ b/graf2d/ios/inc/IOSResourceManagement.h
@@ -28,9 +28,7 @@
#include <CoreGraphics/CGContext.h>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
namespace ROOT {
namespace iOS {
diff --git a/graf2d/ios/inc/IOSTextOperations.h b/graf2d/ios/inc/IOSTextOperations.h
index 7d8b62e7d12b24721ad7383405127851fb0b7e5a..9a6d081de4db6c5b96c6ee5c99e6277c7847d9d8 100644
--- a/graf2d/ios/inc/IOSTextOperations.h
+++ b/graf2d/ios/inc/IOSTextOperations.h
@@ -27,13 +27,9 @@
#include <CoreText/CTFont.h>
#include <CoreText/CTLine.h>
-#ifndef ROOT_IOSResourceManagement
#include "IOSResourceManagement.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
namespace ROOT {
namespace iOS {
diff --git a/graf2d/ios/inc/TGIOS.h b/graf2d/ios/inc/TGIOS.h
index e4321995e1833071d680f6825b70b2a340bcc876..d5870e6f7a35d4993eb991b0fd1637fe047ef7e1 100644
--- a/graf2d/ios/inc/TGIOS.h
+++ b/graf2d/ios/inc/TGIOS.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGIOS
#define ROOT_TGIOS
-#ifndef ROOT_TVirtualX
#include "TVirtualX.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/graf2d/postscript/inc/TImageDump.h b/graf2d/postscript/inc/TImageDump.h
index 3766e389db842a90fc10030d26d39de540a48f24..261ba38944b61a7f33ec970f9592ef39b389c3c0 100644
--- a/graf2d/postscript/inc/TImageDump.h
+++ b/graf2d/postscript/inc/TImageDump.h
@@ -13,9 +13,7 @@
#define ROOT_TImageDump
-#ifndef ROOT_TVirtualPS
#include "TVirtualPS.h"
-#endif
class TImage;
class TColor;
diff --git a/graf2d/postscript/inc/TPDF.h b/graf2d/postscript/inc/TPDF.h
index 3255af4d62ec2f45808d91af69c03902cb531fdd..33530bca31a9b7e054445fbef3104b001388a4f5 100644
--- a/graf2d/postscript/inc/TPDF.h
+++ b/graf2d/postscript/inc/TPDF.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualPS
#include "TVirtualPS.h"
-#endif
#include <vector>
diff --git a/graf2d/postscript/inc/TPostScript.h b/graf2d/postscript/inc/TPostScript.h
index 3d734b52d45f517450d2de5517c7787d2c969429..4272e31600668b8d5faaa09045c50895fc98059b 100644
--- a/graf2d/postscript/inc/TPostScript.h
+++ b/graf2d/postscript/inc/TPostScript.h
@@ -13,9 +13,7 @@
#define ROOT_TPostScript
-#ifndef ROOT_TVirtualPS
#include "TVirtualPS.h"
-#endif
class TPoints;
diff --git a/graf2d/postscript/inc/TSVG.h b/graf2d/postscript/inc/TSVG.h
index 7e69cbdbacdcb2744a584f9d82011057a09d1a94..cd013ddefbfded0316e414767427ce8f549b1590 100644
--- a/graf2d/postscript/inc/TSVG.h
+++ b/graf2d/postscript/inc/TSVG.h
@@ -13,9 +13,7 @@
#define ROOT_TSVG
-#ifndef ROOT_TVirtualPS
#include "TVirtualPS.h"
-#endif
class TPoints;
diff --git a/graf2d/postscript/inc/TTeXDump.h b/graf2d/postscript/inc/TTeXDump.h
index eda68134c7f7fb4221c86f1de0bb215ae71d68c5..9c5ab2fb629be3feec0b66bd04217085c37dbd85 100644
--- a/graf2d/postscript/inc/TTeXDump.h
+++ b/graf2d/postscript/inc/TTeXDump.h
@@ -13,9 +13,7 @@
#define ROOT_TTeXDump
-#ifndef ROOT_TVirtualPS
#include "TVirtualPS.h"
-#endif
class TPoints;
diff --git a/graf2d/qt/inc/TQtMarker.h b/graf2d/qt/inc/TQtMarker.h
index 4852ab60336a016f45827a53bd8714f32f45c965..a215007131b296c354f1d0783b54dde0a7b57ac4 100644
--- a/graf2d/qt/inc/TQtMarker.h
+++ b/graf2d/qt/inc/TQtMarker.h
@@ -13,9 +13,7 @@
#ifndef ROOT_TQtMarker
#define ROOT_TQtMarker
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
#ifndef __CINT__
#include <QPolygon>
diff --git a/graf2d/qt/inc/TQtRootApplication.h b/graf2d/qt/inc/TQtRootApplication.h
index 312d2924230e66c51d7cbf96f40b9ce7dbffc91b..279d3217a939089fb4976ace70ff7f79c44e5cf1 100644
--- a/graf2d/qt/inc/TQtRootApplication.h
+++ b/graf2d/qt/inc/TQtRootApplication.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TApplicationImp
#include "TApplicationImp.h"
-#endif
diff --git a/graf2d/quartz/inc/QuartzFillArea.h b/graf2d/quartz/inc/QuartzFillArea.h
index 694303be8cf12c90b9ea9e8c0a8039b8cff17eb7..9625734eabdd1500970fd8addbc4bf2ff841a9a7 100644
--- a/graf2d/quartz/inc/QuartzFillArea.h
+++ b/graf2d/quartz/inc/QuartzFillArea.h
@@ -24,16 +24,10 @@
#include <Cocoa/Cocoa.h>
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
class TColorGradient;
diff --git a/graf2d/quartz/inc/QuartzLine.h b/graf2d/quartz/inc/QuartzLine.h
index 10bb73619dbb14ccc01f34380fcdb32876fd7c52..f0ed3d2e33d5559363594e6cb29ebc2d41acfe59 100644
--- a/graf2d/quartz/inc/QuartzLine.h
+++ b/graf2d/quartz/inc/QuartzLine.h
@@ -24,13 +24,9 @@
#include <Cocoa/Cocoa.h>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
namespace ROOT {
namespace Quartz {
diff --git a/graf2d/quartz/inc/QuartzMarker.h b/graf2d/quartz/inc/QuartzMarker.h
index 1d901ba96b9401b73fbc600da9a7d645ec43a00e..9191799fcc4d68b4d60b764b22d153efe2e3288d 100644
--- a/graf2d/quartz/inc/QuartzMarker.h
+++ b/graf2d/quartz/inc/QuartzMarker.h
@@ -24,13 +24,9 @@
#include <Cocoa/Cocoa.h>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
namespace ROOT {
namespace Quartz {
diff --git a/graf2d/quartz/inc/QuartzUtils.h b/graf2d/quartz/inc/QuartzUtils.h
index 5299d04f2398c096bd1fafe2a5ef70594eb9684f..7a5a4df0dcc3b494675ef1c6b8800cdd638342c7 100644
--- a/graf2d/quartz/inc/QuartzUtils.h
+++ b/graf2d/quartz/inc/QuartzUtils.h
@@ -14,9 +14,7 @@
#include <ApplicationServices/ApplicationServices.h>
-#ifndef ROOT_CocoaUtils
#include "CocoaUtils.h"
-#endif
namespace ROOT {
namespace Quartz {
diff --git a/graf2d/win32gdk/inc/TGWin32.h b/graf2d/win32gdk/inc/TGWin32.h
index e7b2dd8c6e6bd7bbb3a6ea035a23c5cf1281e4f9..ea1fdda3a8663bfa89daffe574d2e697af95dec7 100644
--- a/graf2d/win32gdk/inc/TGWin32.h
+++ b/graf2d/win32gdk/inc/TGWin32.h
@@ -13,13 +13,9 @@
#define ROOT_TGWin32
-#ifndef ROOT_TVirtualX
#include "TVirtualX.h"
-#endif
-#ifndef ROOT_TTF
#include "TTF.h"
-#endif
#if !defined(__CINT__)
diff --git a/graf2d/win32gdk/inc/TGWin32GL.h b/graf2d/win32gdk/inc/TGWin32GL.h
index 3a9bd4d459f2cb194ec7a0e5a07fee2dd538da78..cbb2b402311c5ed7bd61877e3c927b5658cc24ad 100644
--- a/graf2d/win32gdk/inc/TGWin32GL.h
+++ b/graf2d/win32gdk/inc/TGWin32GL.h
@@ -13,12 +13,8 @@
#define ROOT_TGWin32GL
-#ifndef ROOT_TVirtualGL
#include "TVirtualGL.h"
-#endif
-#ifndef ROOT_TVirtualViewer3D
#include "TVirtualViewer3D.h"
-#endif
class TGWin32GLManager : public TGLManager {
diff --git a/graf2d/win32gdk/inc/TGWin32InterpreterProxy.h b/graf2d/win32gdk/inc/TGWin32InterpreterProxy.h
index 0b303b55ac83a79f1b76ef4e16828f2b8beed267..e44a23ee26c3c86b585ca0ae989ace8a6651ccf4 100644
--- a/graf2d/win32gdk/inc/TGWin32InterpreterProxy.h
+++ b/graf2d/win32gdk/inc/TGWin32InterpreterProxy.h
@@ -19,15 +19,11 @@
This class defines thread-safe interface to a command line interpreter.
*/
-#ifndef ROOT_TInterpreter
#include "TInterpreter.h"
-#endif
#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
-#ifndef ROOT_TGWin32ProxyBase
#include "TGWin32ProxyBase.h"
-#endif
class TGWin32InterpreterProxy : public TInterpreter , public TGWin32ProxyBase {
diff --git a/graf2d/win32gdk/inc/TGWin32ProxyBase.h b/graf2d/win32gdk/inc/TGWin32ProxyBase.h
index eb4c45a601c7ae45aa4a62f880550182997413a3..0a376afc23a8def9d0dbf5bfabe1f45fb6e351e7 100644
--- a/graf2d/win32gdk/inc/TGWin32ProxyBase.h
+++ b/graf2d/win32gdk/inc/TGWin32ProxyBase.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGWin32ProxyBase
#define ROOT_TGWin32ProxyBase
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
typedef void (*TGWin32CallBack)(void*);
class TList;
diff --git a/graf2d/win32gdk/inc/TGWin32VirtualGLProxy.h b/graf2d/win32gdk/inc/TGWin32VirtualGLProxy.h
index fd4f434844c044d3ef371aded951371f018d32c1..ba5afa9c809a0a6752434d2f18633c0d2597ffbb 100644
--- a/graf2d/win32gdk/inc/TGWin32VirtualGLProxy.h
+++ b/graf2d/win32gdk/inc/TGWin32VirtualGLProxy.h
@@ -21,13 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualGL
#include "TVirtualGL.h"
-#endif
-#ifndef ROOT_TGWin32ProxyBase
#include "TGWin32ProxyBase.h"
-#endif
class TGWin32GLManagerProxy : public TGLManager, public TGWin32ProxyBase
diff --git a/graf2d/win32gdk/inc/TGWin32VirtualXProxy.h b/graf2d/win32gdk/inc/TGWin32VirtualXProxy.h
index 6909be6cf48452b13a45415f6af82d9ab02e794f..3e17faae02e9477de19680bee28ef62c02a95d24 100644
--- a/graf2d/win32gdk/inc/TGWin32VirtualXProxy.h
+++ b/graf2d/win32gdk/inc/TGWin32VirtualXProxy.h
@@ -20,13 +20,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualX
#include "TVirtualX.h"
-#endif
-#ifndef ROOT_TGWin32ProxyBase
#include "TGWin32ProxyBase.h"
-#endif
class TGWin32;
diff --git a/graf2d/x11/inc/TGX11.h b/graf2d/x11/inc/TGX11.h
index fae35ee6421eee38c7c54f5343cd637fd8e8b687..cbc4f6c7d2190c8e1d9529e3bd5114e6454d227a 100644
--- a/graf2d/x11/inc/TGX11.h
+++ b/graf2d/x11/inc/TGX11.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGX11
#define ROOT_TGX11
-#ifndef ROOT_TVirtualX
#include "TVirtualX.h"
-#endif
#if !defined(__CINT__)
diff --git a/graf2d/x11ttf/inc/TGX11TTF.h b/graf2d/x11ttf/inc/TGX11TTF.h
index 1d20f51305c2a4f4132ea4a3fd3cfc0fdeb495f5..37912ea0a2c26617279ff36d33085b24b0d262dd 100644
--- a/graf2d/x11ttf/inc/TGX11TTF.h
+++ b/graf2d/x11ttf/inc/TGX11TTF.h
@@ -14,17 +14,11 @@
#define ROOT_TGX11TTF
-#ifndef ROOT_TGX11
#include "TGX11.h"
-#endif
-#ifndef ROOT_TTF
#include "TTF.h"
-#endif
-#ifndef ROOT_RConfigure
#include "RConfigure.h"
-#endif
#ifdef R__HAS_XFT
class TXftFontHash;
diff --git a/graf3d/g3d/inc/TAxis3D.h b/graf3d/g3d/inc/TAxis3D.h
index f0042cc29c9769a374a1290a3a38bcc17e3f5783..42b2e5d5623eefe9d33cb396ab1ab5b06c82be74 100644
--- a/graf3d/g3d/inc/TAxis3D.h
+++ b/graf3d/g3d/inc/TAxis3D.h
@@ -21,9 +21,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TAxis
#include "TAxis.h"
-#endif
class TF1;
class TBrowser;
diff --git a/graf3d/g3d/inc/TBRIK.h b/graf3d/g3d/inc/TBRIK.h
index da1107f4af6c1c3b23528f910eaeca572a8e7d7d..719470662419d97ca6c014f966683378effa085c 100644
--- a/graf3d/g3d/inc/TBRIK.h
+++ b/graf3d/g3d/inc/TBRIK.h
@@ -21,9 +21,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TShape
#include "TShape.h"
-#endif
class TBRIK : public TShape {
diff --git a/graf3d/g3d/inc/TCONE.h b/graf3d/g3d/inc/TCONE.h
index 473510c0e592837e9a7c8d85d039add260af54bb..e0cfb2c6bfc7a9046115dc3702943a5cc1c016f9 100644
--- a/graf3d/g3d/inc/TCONE.h
+++ b/graf3d/g3d/inc/TCONE.h
@@ -23,9 +23,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTUBE
#include "TTUBE.h"
-#endif
class TCONE : public TTUBE {
diff --git a/graf3d/g3d/inc/TCONS.h b/graf3d/g3d/inc/TCONS.h
index 65e761f8d1f1d06e7a1cd988cd1fa4df994875f8..daae2d87dff96d018b58abc5dc931af5ba6dd9c5 100644
--- a/graf3d/g3d/inc/TCONS.h
+++ b/graf3d/g3d/inc/TCONS.h
@@ -22,9 +22,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTUBS
#include "TTUBS.h"
-#endif
class TCONS : public TTUBS {
diff --git a/graf3d/g3d/inc/TCTUB.h b/graf3d/g3d/inc/TCTUB.h
index 5c3be94917fdb01f4b58ac403c020c83e5eea38d..28855c7699d94cb359ca62767ace139fce842f6e 100644
--- a/graf3d/g3d/inc/TCTUB.h
+++ b/graf3d/g3d/inc/TCTUB.h
@@ -24,9 +24,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTUBS
#include "TTUBS.h"
-#endif
class TCTUB : public TTUBS {
diff --git a/graf3d/g3d/inc/TELTU.h b/graf3d/g3d/inc/TELTU.h
index dddc990f28eb45e9bfdcdc9eca136c3744230ffa..2607161d3cbbce621ad5d1f21d5058a905e53017 100644
--- a/graf3d/g3d/inc/TELTU.h
+++ b/graf3d/g3d/inc/TELTU.h
@@ -26,9 +26,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTUBE
#include "TTUBE.h"
-#endif
class TELTU : public TTUBE {
diff --git a/graf3d/g3d/inc/TGTRA.h b/graf3d/g3d/inc/TGTRA.h
index 01b0cabff79e189a657155767f3877f7dc761adf..f9b3187282fcf1fa22a7bf78652b0c0568434bcd 100644
--- a/graf3d/g3d/inc/TGTRA.h
+++ b/graf3d/g3d/inc/TGTRA.h
@@ -22,9 +22,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBRIK
#include "TBRIK.h"
-#endif
class TGTRA : public TBRIK {
diff --git a/graf3d/g3d/inc/TGeometry.h b/graf3d/g3d/inc/TGeometry.h
index a05abb4fc4d90a230076cc5bbcded75dc18eb494..d5a5c02da7234a267627879189e2564b4f0453e4 100644
--- a/graf3d/g3d/inc/TGeometry.h
+++ b/graf3d/g3d/inc/TGeometry.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_THashList
#include "THashList.h"
-#endif
const Int_t kMAXLEVELS = 20;
const Int_t kVectorSize = 3;
diff --git a/graf3d/g3d/inc/THYPE.h b/graf3d/g3d/inc/THYPE.h
index fec53a8c22d0009a8b532aafdd46b77821759203..e8b815db74150c2d732476edad02e2d676495500 100644
--- a/graf3d/g3d/inc/THYPE.h
+++ b/graf3d/g3d/inc/THYPE.h
@@ -23,9 +23,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTUBE
#include "TTUBE.h"
-#endif
class THYPE : public TTUBE {
diff --git a/graf3d/g3d/inc/THelix.h b/graf3d/g3d/inc/THelix.h
index 028f139649de39bb59fd5b0c5fef8a3d405ae071..b9ec543b7a44facf4552ceda05461deb6db8c6a6 100644
--- a/graf3d/g3d/inc/THelix.h
+++ b/graf3d/g3d/inc/THelix.h
@@ -25,12 +25,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TPolyLine3D
#include "TPolyLine3D.h"
-#endif
-#ifndef ROOT_TRotMatrix
#include "TRotMatrix.h"
-#endif
enum EHelixRangeType {
kHelixT, kHelixX, kHelixY, kHelixZ, kLabX, kLabY, kLabZ, kUnchanged
diff --git a/graf3d/g3d/inc/TMarker3DBox.h b/graf3d/g3d/inc/TMarker3DBox.h
index 9c41eab908c1426ef9830bf20ca7af8be6a0cbac..407911b1b83fed00ec98114b781e4955aca5b2b7 100644
--- a/graf3d/g3d/inc/TMarker3DBox.h
+++ b/graf3d/g3d/inc/TMarker3DBox.h
@@ -27,18 +27,10 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAtt3D
#include "TAtt3D.h"
-#endif
class TH1;
diff --git a/graf3d/g3d/inc/TMaterial.h b/graf3d/g3d/inc/TMaterial.h
index 4f2f681ee959332e1532c073b9a947076516b439..700d496c7965db7d288083a85c86bbba2bf4a608 100644
--- a/graf3d/g3d/inc/TMaterial.h
+++ b/graf3d/g3d/inc/TMaterial.h
@@ -22,12 +22,8 @@
#ifndef ROOT_TMaterial
#define ROOT_TMaterial
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
class TMaterial : public TNamed, public TAttFill {
protected:
diff --git a/graf3d/g3d/inc/TMixture.h b/graf3d/g3d/inc/TMixture.h
index 24fd4b2a01a8f0d4673f326c60bb85462992d472..ce0f9aefeede506e4a7f8a2b9600e781b5c1157f 100644
--- a/graf3d/g3d/inc/TMixture.h
+++ b/graf3d/g3d/inc/TMixture.h
@@ -22,9 +22,7 @@
#ifndef ROOT_TMixture
#define ROOT_TMixture
-#ifndef ROOT_TMaterial
#include "TMaterial.h"
-#endif
class TMixture : public TMaterial {
protected:
diff --git a/graf3d/g3d/inc/TNode.h b/graf3d/g3d/inc/TNode.h
index cf4262f1a81306f71140485f5458e54576476e01..806296ee21c8ed0b480f319565373cfa43977ce9 100644
--- a/graf3d/g3d/inc/TNode.h
+++ b/graf3d/g3d/inc/TNode.h
@@ -21,22 +21,12 @@
#ifndef ROOT_TNode
#define ROOT_TNode
-#ifndef ROOT_TShape
#include "TShape.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAtt3D
#include "TAtt3D.h"
-#endif
-#ifndef ROOT_TRotMatrix
#include "TRotMatrix.h"
-#endif
class TBrowser;
diff --git a/graf3d/g3d/inc/TNodeDiv.h b/graf3d/g3d/inc/TNodeDiv.h
index d5b7ec9d88dbac4226a416553a43f13ab26bb1f4..f97b9572012f8d704dc2622db4e034bd278fa684 100644
--- a/graf3d/g3d/inc/TNodeDiv.h
+++ b/graf3d/g3d/inc/TNodeDiv.h
@@ -22,9 +22,7 @@
#ifndef ROOT_TNodeDiv
#define ROOT_TNodeDiv
-#ifndef ROOT_TNode
#include "TNode.h"
-#endif
class TNodeDiv : public TNode {
diff --git a/graf3d/g3d/inc/TPARA.h b/graf3d/g3d/inc/TPARA.h
index dc9f408013e02f039e5f155a8d83c80a45ae84fd..51d2e5f0234debf8e9976e4c079e60ae3f079207 100644
--- a/graf3d/g3d/inc/TPARA.h
+++ b/graf3d/g3d/inc/TPARA.h
@@ -25,9 +25,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBRIK
#include "TBRIK.h"
-#endif
class TPARA : public TBRIK {
protected:
diff --git a/graf3d/g3d/inc/TPCON.h b/graf3d/g3d/inc/TPCON.h
index f9f86cc76f22059541b2a32476cda13ab87abd38..67b3590656e4241285dc5a9810e039b8b33d362c 100644
--- a/graf3d/g3d/inc/TPCON.h
+++ b/graf3d/g3d/inc/TPCON.h
@@ -24,9 +24,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TShape
#include "TShape.h"
-#endif
const Int_t kDiv = 20; //default number of divisions
diff --git a/graf3d/g3d/inc/TPGON.h b/graf3d/g3d/inc/TPGON.h
index be165661440964cfef4485f271ce13720e615b2c..15f6d9119f32977ba103b2099de34cddd6ccfa51 100644
--- a/graf3d/g3d/inc/TPGON.h
+++ b/graf3d/g3d/inc/TPGON.h
@@ -25,9 +25,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TPCON
#include "TPCON.h"
-#endif
class TPGON : public TPCON {
protected:
diff --git a/graf3d/g3d/inc/TPointSet3D.h b/graf3d/g3d/inc/TPointSet3D.h
index 3912c28111394b93c9005f1657d157e19743b572..2d645d54cbe93efeb6616f280c44a33c9ff7c7d0 100644
--- a/graf3d/g3d/inc/TPointSet3D.h
+++ b/graf3d/g3d/inc/TPointSet3D.h
@@ -13,12 +13,8 @@
#ifndef ROOT_TPointSet3D
#define ROOT_TPointSet3D
-#ifndef ROOT_TPolyMarker3D
#include "TPolyMarker3D.h"
-#endif
-#ifndef ROOT_TAttBBox
#include "TAttBBox.h"
-#endif
#include "TRefArray.h"
diff --git a/graf3d/g3d/inc/TPoints3DABC.h b/graf3d/g3d/inc/TPoints3DABC.h
index f84a3fe2a8b95adf7cafdc99b96c08b4450d4105..171407d3b577222481357decfdea3386d651cbb6 100644
--- a/graf3d/g3d/inc/TPoints3DABC.h
+++ b/graf3d/g3d/inc/TPoints3DABC.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TPoints3DABC : public TObject {
diff --git a/graf3d/g3d/inc/TPolyLine3D.h b/graf3d/g3d/inc/TPolyLine3D.h
index 36914a3eb5c88211c767e6ab5a0d7c56c913b2ef..075ff72a5a8dcaf112bbfd3777dafe8a8be0582f 100644
--- a/graf3d/g3d/inc/TPolyLine3D.h
+++ b/graf3d/g3d/inc/TPolyLine3D.h
@@ -21,21 +21,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TTString
#include "TString.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAtt3D
#include "TAtt3D.h"
-#endif
class TPolyLine3D : public TObject, public TAttLine, public TAtt3D
diff --git a/graf3d/g3d/inc/TPolyMarker3D.h b/graf3d/g3d/inc/TPolyMarker3D.h
index 16745910df444aae7cd933d5c483437e76c6083a..847c7ac9cafa70501f45342275d6238b6181e8b3 100644
--- a/graf3d/g3d/inc/TPolyMarker3D.h
+++ b/graf3d/g3d/inc/TPolyMarker3D.h
@@ -21,18 +21,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
-#ifndef ROOT_TAtt3D
#include "TAtt3D.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TH1;
class TCollection;
diff --git a/graf3d/g3d/inc/TRotMatrix.h b/graf3d/g3d/inc/TRotMatrix.h
index 24cbe7686507e121b72360fc49ad82c3e65b6676..67554b2edad4c05470dcf1b4100a1f6e83d6a8ff 100644
--- a/graf3d/g3d/inc/TRotMatrix.h
+++ b/graf3d/g3d/inc/TRotMatrix.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TRotMatrix : public TNamed {
diff --git a/graf3d/g3d/inc/TSPHE.h b/graf3d/g3d/inc/TSPHE.h
index b204985373eab4801b9e7f5edc40255127ed4532..6eeef63f0eaf1442a57624f5bd99aedc511c2589 100644
--- a/graf3d/g3d/inc/TSPHE.h
+++ b/graf3d/g3d/inc/TSPHE.h
@@ -21,9 +21,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBRIK
#include "TShape.h"
-#endif
// const Int_t kDiv = 30; //default number of z segments for semi-sphere
diff --git a/graf3d/g3d/inc/TShape.h b/graf3d/g3d/inc/TShape.h
index be8211f4032a94974144757116fd640dcaf12741..2bc2a6d8085b56eb0865575e2646e0dbffd642eb 100644
--- a/graf3d/g3d/inc/TShape.h
+++ b/graf3d/g3d/inc/TShape.h
@@ -22,24 +22,12 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TMaterial
#include "TMaterial.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAtt3D
#include "TAtt3D.h"
-#endif
-#ifndef ROOT_X3DBuffer
#include "X3DBuffer.h"
-#endif
class TBuffer3D;
class TNode;
diff --git a/graf3d/g3d/inc/TTRAP.h b/graf3d/g3d/inc/TTRAP.h
index ba5eeefea1085580c4f702e145ec91031ff4d769..a00b7252c0ce5a3d3e014f2e00a70d00d3972460 100644
--- a/graf3d/g3d/inc/TTRAP.h
+++ b/graf3d/g3d/inc/TTRAP.h
@@ -28,9 +28,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBRIK
#include "TBRIK.h"
-#endif
class TTRAP : public TBRIK {
protected:
diff --git a/graf3d/g3d/inc/TTRD1.h b/graf3d/g3d/inc/TTRD1.h
index 8ebb332ac0ec14e724033220b1b9ff533017498b..d8edf32ad80b5a16be8825bf988edfa9590013ee 100644
--- a/graf3d/g3d/inc/TTRD1.h
+++ b/graf3d/g3d/inc/TTRD1.h
@@ -23,9 +23,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBRIK
#include "TBRIK.h"
-#endif
class TTRD1 : public TBRIK {
protected:
diff --git a/graf3d/g3d/inc/TTRD2.h b/graf3d/g3d/inc/TTRD2.h
index dfd192cb4cb2b4261e3483a882a1ca1da4ad2280..c70aa2b2a8c0fea24d1cbdce01cc1553194c018c 100644
--- a/graf3d/g3d/inc/TTRD2.h
+++ b/graf3d/g3d/inc/TTRD2.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBRIK
#include "TBRIK.h"
-#endif
class TTRD2 : public TBRIK {
protected:
diff --git a/graf3d/g3d/inc/TTUBE.h b/graf3d/g3d/inc/TTUBE.h
index 16964e024f1d7166df7e27d413ac83832be0080e..ff090ffa05f6f31b6b04ea44b596f2078244e583 100644
--- a/graf3d/g3d/inc/TTUBE.h
+++ b/graf3d/g3d/inc/TTUBE.h
@@ -23,9 +23,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TShape
#include "TShape.h"
-#endif
const Int_t kDivNum = 20; //default number of divisions
diff --git a/graf3d/g3d/inc/TTUBS.h b/graf3d/g3d/inc/TTUBS.h
index 2e461d4c6f24cc1f21585a6669c1ecd0de3b5617..3cb3f9affc690e4ccda57fdf5c9ed25a39e8c424 100644
--- a/graf3d/g3d/inc/TTUBS.h
+++ b/graf3d/g3d/inc/TTUBS.h
@@ -24,9 +24,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTUBE
#include "TTUBE.h"
-#endif
class TTUBS : public TTUBE {
protected:
diff --git a/graf3d/g3d/inc/TView3D.h b/graf3d/g3d/inc/TView3D.h
index 1371b2875d388c5a015b96ae2f1618bdbd9f6269..61a4ee7a07dc22d4b5fd2a11b03c03b1486c35a1 100644
--- a/graf3d/g3d/inc/TView3D.h
+++ b/graf3d/g3d/inc/TView3D.h
@@ -21,9 +21,7 @@
/////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TView
#include "TView.h"
-#endif
class TSeqCollection;
class TVirtualPad;
diff --git a/graf3d/g3d/inc/TXTRU.h b/graf3d/g3d/inc/TXTRU.h
index 98be42aae343dd4146d04431f11a96ed425fbc15..a0cfcdddf461ed06546073968433814ec579ec54 100644
--- a/graf3d/g3d/inc/TXTRU.h
+++ b/graf3d/g3d/inc/TXTRU.h
@@ -17,9 +17,7 @@
#ifndef ROOT_TXTRU
#define ROOT_TXTRU
-#ifndef ROOT_TShape
#include "TShape.h"
-#endif
class TXTRU : public TShape {
public:
diff --git a/graf3d/gl/inc/CsgOps.h b/graf3d/gl/inc/CsgOps.h
index 25ca75fab8d3f82a908fef1c234a7330d78faa05..fae48f287c5ff3911ca4a54972d5d1cb2f2a981e 100644
--- a/graf3d/gl/inc/CsgOps.h
+++ b/graf3d/gl/inc/CsgOps.h
@@ -4,9 +4,7 @@
#ifndef ROOT_CsgOps
#define ROOT_CsgOps
-#ifndef ROOT_Rtype
#include "Rtypes.h"
-#endif
class TBuffer3D;
diff --git a/graf3d/gl/inc/TArcBall.h b/graf3d/gl/inc/TArcBall.h
index 6dd1d90ac14a18bf46de7ee418d02bd0615370f1..55aea784424597a19b48640b117148d563519171 100644
--- a/graf3d/gl/inc/TArcBall.h
+++ b/graf3d/gl/inc/TArcBall.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TArcBall
#define ROOT_TArcBall
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TPoint;
diff --git a/graf3d/gl/inc/TGL5DDataSetEditor.h b/graf3d/gl/inc/TGL5DDataSetEditor.h
index 225efe3074a089ca6cb4bfd450f70ce08a7dfd8d..05f165b61b31cdcb7160507f04a45007af28f45d 100644
--- a/graf3d/gl/inc/TGL5DDataSetEditor.h
+++ b/graf3d/gl/inc/TGL5DDataSetEditor.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TGL5DDataSetEditor
#define ROOT_TGL5DDataSetEditor
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
class TGNumberEntryField;
class TGDoubleHSlider;
diff --git a/graf3d/gl/inc/TGL5DPainter.h b/graf3d/gl/inc/TGL5DPainter.h
index fe3d57c758b3af81e9f8240fb0734ad972da5a65..2816a3ad8a622491fb4424dd6307293dd460b4b5 100644
--- a/graf3d/gl/inc/TGL5DPainter.h
+++ b/graf3d/gl/inc/TGL5DPainter.h
@@ -15,21 +15,11 @@
#include <vector>
#include <list>
-#ifndef ROOT_TGLMarchingCubes
#include "TGLMarchingCubes.h"
-#endif
-#ifndef ROOT_TGLPlotPainter
#include "TGLPlotPainter.h"
-#endif
-#ifndef ROOT_TGLIsoMesh
#include "TGLIsoMesh.h"
-#endif
-#ifndef ROOT_TKDEFGT
#include "TKDEFGT.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
class TGLPlotCamera;
diff --git a/graf3d/gl/inc/TGLAdapter.h b/graf3d/gl/inc/TGLAdapter.h
index 40776c3636c8fd3b48bf32b59524178b19b853f6..c02c5e4f5c01a1e6c88895d299c8ae98f8b29ff1 100644
--- a/graf3d/gl/inc/TGLAdapter.h
+++ b/graf3d/gl/inc/TGLAdapter.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGLAdapter
#define ROOT_TGLAdapter
-#ifndef ROOT_TVirtualGL
#include "TVirtualGL.h"
-#endif
class TGLAdapter : public TGLPaintDevice {
private:
diff --git a/graf3d/gl/inc/TGLAxis.h b/graf3d/gl/inc/TGLAxis.h
index 9d60f1255c7f8b46f4e3734ef142e2dbe7a5a217..06f43be9d995ea523028b753c125a21ea8898b94 100644
--- a/graf3d/gl/inc/TGLAxis.h
+++ b/graf3d/gl/inc/TGLAxis.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TGLAxis
#define ROOT_TGLAxis
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
class TString;
class TGLText;
diff --git a/graf3d/gl/inc/TGLBoundingBox.h b/graf3d/gl/inc/TGLBoundingBox.h
index 105fb65cf1fd02cc1b161e18217cb3885fa34dda..b5a2780f43fb5eda0f3f8f853f15234f4e29ee03 100644
--- a/graf3d/gl/inc/TGLBoundingBox.h
+++ b/graf3d/gl/inc/TGLBoundingBox.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGLBoundingBox
#define ROOT_TGLBoundingBox
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/graf3d/gl/inc/TGLBoxPainter.h b/graf3d/gl/inc/TGLBoxPainter.h
index 12b2ac9faa27c129eaea1f99f42516586f90e5c2..9f74a5910c7bcd577b9795ed17d6762ff01850d9 100644
--- a/graf3d/gl/inc/TGLBoxPainter.h
+++ b/graf3d/gl/inc/TGLBoxPainter.h
@@ -13,18 +13,10 @@
#include <vector>
-#ifndef ROOT_TGLPlotPainter
#include "TGLPlotPainter.h"
-#endif
-#ifndef ROOT_TGLQuadric
#include "TGLQuadric.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
//TGLScenePad creates box painter
//for the case TPad has poly marker and
diff --git a/graf3d/gl/inc/TGLClipSetEditor.h b/graf3d/gl/inc/TGLClipSetEditor.h
index 041d46871d3a73b168573e8c6ca3507eaad69951..2a33551e07239c0587e8bd4dcf46dd2f8d4684a1 100644
--- a/graf3d/gl/inc/TGLClipSetEditor.h
+++ b/graf3d/gl/inc/TGLClipSetEditor.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TGLClipSetEditor
#define ROOT_TGLClipSetEditor
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
#include "TGLClip.h"
diff --git a/graf3d/gl/inc/TGLContext.h b/graf3d/gl/inc/TGLContext.h
index fe5088d7d4d3e4d4cb07c6842989298601ce6e20..4d29281e0bcbd175bdc253df734ea2c2e1facba0 100644
--- a/graf3d/gl/inc/TGLContext.h
+++ b/graf3d/gl/inc/TGLContext.h
@@ -18,12 +18,8 @@
class TGLContextIdentity;
-#ifndef ROOT_TGLFormat
#include "TGLFormat.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TGLContextPrivate;
class TGLPaintDevice;
diff --git a/graf3d/gl/inc/TGLCylinder.h b/graf3d/gl/inc/TGLCylinder.h
index 3005df8fb5da91bb4a23a134cbce1ac47254d773..e53e511014260c6a5c8697d5ac0345e4595f5285 100644
--- a/graf3d/gl/inc/TGLCylinder.h
+++ b/graf3d/gl/inc/TGLCylinder.h
@@ -14,9 +14,7 @@
#ifndef ROOT_TGLCylinder
#define ROOT_TGLCylinder
-#ifndef ROOT_TGLLogicalShape
#include "TGLLogicalShape.h"
-#endif
class TBuffer3DTube;
diff --git a/graf3d/gl/inc/TGLEmbeddedViewer.h b/graf3d/gl/inc/TGLEmbeddedViewer.h
index 576d1eb0322c3124072735fefece5a0d60fc4a72..fdff700ed5425376e222728447dc5fb630bd3c09 100644
--- a/graf3d/gl/inc/TGLEmbeddedViewer.h
+++ b/graf3d/gl/inc/TGLEmbeddedViewer.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TGLEmbeddedViewer
#define ROOT_TGLEmbeddedViewer
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGLViewer
#include "TGLViewer.h"
-#endif
class TGLRenderArea;
class TGLEventHandler;
diff --git a/graf3d/gl/inc/TGLEventHandler.h b/graf3d/gl/inc/TGLEventHandler.h
index ecae52ed6f8e2a9c9679b4d92b2bf7231beb2dab..70f927ae8b6e5d6ff479e55285a7c8dae3b978a3 100644
--- a/graf3d/gl/inc/TGLEventHandler.h
+++ b/graf3d/gl/inc/TGLEventHandler.h
@@ -18,12 +18,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGEventHandler
#include "TGEventHandler.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
class TGToolTip;
diff --git a/graf3d/gl/inc/TGLFaceSet.h b/graf3d/gl/inc/TGLFaceSet.h
index 6b1152b51151a84ce365e1a23599263247f9e49b..a3de87d5dbcd3d344abc77a7079172b0d74a56cc 100644
--- a/graf3d/gl/inc/TGLFaceSet.h
+++ b/graf3d/gl/inc/TGLFaceSet.h
@@ -14,12 +14,8 @@
#ifndef ROOT_TGLFaceSet
#define ROOT_TGLFaceSet
-#ifndef ROOT_TGLLogicalShape
#include "TGLLogicalShape.h"
-#endif
-#ifndef ROOT_CsgOps
#include "CsgOps.h"
-#endif
///////////////////////////////////////////////////////////////////////
class TGLFaceSet : public TGLLogicalShape
diff --git a/graf3d/gl/inc/TGLH2PolyPainter.h b/graf3d/gl/inc/TGLH2PolyPainter.h
index 3ef2ea3a1d8745df97c7f052564d1f23312c7282..1470206ca7d88e37d2ad1cc94527b06fe40d2f51 100644
--- a/graf3d/gl/inc/TGLH2PolyPainter.h
+++ b/graf3d/gl/inc/TGLH2PolyPainter.h
@@ -4,15 +4,9 @@
#include <vector>
#include <list>
-#ifndef ROOT_TGLPlotPainter
#include "TGLPlotPainter.h"
-#endif
-#ifndef ROOT_TGLPadUtils
#include "TGLPadUtils.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TMultiGraph;
class TGraph;
diff --git a/graf3d/gl/inc/TGLIsoMesh.h b/graf3d/gl/inc/TGLIsoMesh.h
index c6b4eb184d6fc42573251ec8bf2039ff8262f5ce..8704706b1ee406d4d8a1de9a67a4fa909a22e344 100644
--- a/graf3d/gl/inc/TGLIsoMesh.h
+++ b/graf3d/gl/inc/TGLIsoMesh.h
@@ -14,12 +14,8 @@
#include <vector>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TAxis
#include "TAxis.h"
-#endif
class TGLBoxCut;
diff --git a/graf3d/gl/inc/TGLLegoPainter.h b/graf3d/gl/inc/TGLLegoPainter.h
index 57e64470cc5140433eff1d2f289ddf0006c8308c..3b8c7c2e9c991c96991728cdf43def8346d136bc 100644
--- a/graf3d/gl/inc/TGLLegoPainter.h
+++ b/graf3d/gl/inc/TGLLegoPainter.h
@@ -12,18 +12,10 @@
#ifndef ROOT_TGLLegoPainter
#define ROOT_TGLLegoPainter
-#ifndef ROOT_TGLPlotPainter
#include "TGLPlotPainter.h"
-#endif
-#ifndef ROOT_TGLQuadric
#include "TGLQuadric.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TGLPlotCamera;
class TAxis;
diff --git a/graf3d/gl/inc/TGLLogicalShape.h b/graf3d/gl/inc/TGLLogicalShape.h
index d9383dd21d75f961ea0a1eee79d42c3b404b48f2..d23b435ae574b03879d1b1f83aee7e0cc26ef81a 100644
--- a/graf3d/gl/inc/TGLLogicalShape.h
+++ b/graf3d/gl/inc/TGLLogicalShape.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGLLogicalShape
#define ROOT_TGLLogicalShape
-#ifndef ROOT_TGLBoundingBox
#include "TGLBoundingBox.h"
-#endif
class TBuffer3D;
class TObject;
diff --git a/graf3d/gl/inc/TGLManip.h b/graf3d/gl/inc/TGLManip.h
index ae92ca2db018b6125532cfff61ec510c91ff2eea..00db5add6ea854c0c971432a9887ef8a51fdb95a 100644
--- a/graf3d/gl/inc/TGLManip.h
+++ b/graf3d/gl/inc/TGLManip.h
@@ -12,18 +12,10 @@
#ifndef ROOT_TGLManip
#define ROOT_TGLManip
-#ifndef ROOT_TVirtualGL
#include "TVirtualGL.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
class TGLPhysicalShape;
class TGLVertex3;
diff --git a/graf3d/gl/inc/TGLMarchingCubes.h b/graf3d/gl/inc/TGLMarchingCubes.h
index f5900d276928c60a37ce610d399e799b7243dd4a..8ae396bfd052ef731450ff886f7efb07c08c147d 100644
--- a/graf3d/gl/inc/TGLMarchingCubes.h
+++ b/graf3d/gl/inc/TGLMarchingCubes.h
@@ -14,16 +14,10 @@
#include <vector>
-#ifndef ROOT_TH3
#include "TH3.h"
-#endif
-#ifndef ROOT_TGLIsoMesh
#include "TGLIsoMesh.h"
-#endif
-#ifndef ROOT_TKDEAdapter
#include "TKDEAdapter.h"
-#endif
/*
Implementation of "marching cubes" algortihm for GL module. Used by
diff --git a/graf3d/gl/inc/TGLOutput.h b/graf3d/gl/inc/TGLOutput.h
index d8a53b57f165af3676305bc001abe56a272226cf..71f375f8f4afd413aa66156c38116cb37904258c 100644
--- a/graf3d/gl/inc/TGLOutput.h
+++ b/graf3d/gl/inc/TGLOutput.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGLOutput
#define ROOT_TGLOutput
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TGLViewer;
diff --git a/graf3d/gl/inc/TGLOverlayButton.h b/graf3d/gl/inc/TGLOverlayButton.h
index 9b63397166dc2e7b7f52595d01b072007a74d01f..81e5932c9b6af9ec536a6066fc8e6084eaf9cb8e 100644
--- a/graf3d/gl/inc/TGLOverlayButton.h
+++ b/graf3d/gl/inc/TGLOverlayButton.h
@@ -12,18 +12,10 @@
#ifndef ROOT_TGLOverlayButton
#define ROOT_TGLOverlayButton
-#ifndef ROOT_TGLOverlay
#include "TGLOverlay.h"
-#endif
-#ifndef ROOT_TGLFontManager
#include "TGLFontManager.h"
-#endif
-#ifndef ROOT_TGLViewerBase
#include "TGLViewerBase.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
class TString;
diff --git a/graf3d/gl/inc/TGLPShapeObjEditor.h b/graf3d/gl/inc/TGLPShapeObjEditor.h
index 6895236cf57d9cc9a27afc053368fa54bde0ffd4..26093b6524e8f1702f179edeab3d02822d659d2f 100644
--- a/graf3d/gl/inc/TGLPShapeObjEditor.h
+++ b/graf3d/gl/inc/TGLPShapeObjEditor.h
@@ -6,13 +6,9 @@
#include <memory>
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
#include "TGLPShapeRef.h"
diff --git a/graf3d/gl/inc/TGLPadPainter.h b/graf3d/gl/inc/TGLPadPainter.h
index 4a174175fbee12d9c6ad1e679b26b807747a6c5a..f71721ee58b8456ed41e110ab343a94934d54f0b 100644
--- a/graf3d/gl/inc/TGLPadPainter.h
+++ b/graf3d/gl/inc/TGLPadPainter.h
@@ -14,18 +14,10 @@
#include <deque>
-#ifndef ROOT_TVirtualPadPainter
#include "TVirtualPadPainter.h"
-#endif
-#ifndef ROOT_TGLFontmanager
#include "TGLFontManager.h"
-#endif
-#ifndef ROOT_TGLPadUtils
#include "TGLPadUtils.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
class TLinearGradient;
class TRadialGradient;
diff --git a/graf3d/gl/inc/TGLPadUtils.h b/graf3d/gl/inc/TGLPadUtils.h
index f2336f85349464f3650a04cc8105f770d0a0be32..fc3ee5c8bc16ddc9646716318707c0c805705042 100644
--- a/graf3d/gl/inc/TGLPadUtils.h
+++ b/graf3d/gl/inc/TGLPadUtils.h
@@ -15,15 +15,9 @@
#include <vector>
#include <list>
-#ifndef ROOT_RStipples
#include "RStipples.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TGLPadPainter;//For friend declarations.
diff --git a/graf3d/gl/inc/TGLPhysicalShape.h b/graf3d/gl/inc/TGLPhysicalShape.h
index 799b0a42bd7abbed379bbc7915a40c56d3283418..8f97e4ad2baf1ef1d17ac50d46e812319b7fb509 100644
--- a/graf3d/gl/inc/TGLPhysicalShape.h
+++ b/graf3d/gl/inc/TGLPhysicalShape.h
@@ -16,9 +16,7 @@
//#ifndef ROOT_TGLLogicalShape
//#include "TGLLogicalShape.h"
//#endif
-#ifndef ROOT_TGLBoundingBox
#include "TGLBoundingBox.h"
-#endif
#ifndef ROOT_TGLUtil
#include "TGLUtil.h" // For TGLMatrix
#endif
diff --git a/graf3d/gl/inc/TGLPlotBox.h b/graf3d/gl/inc/TGLPlotBox.h
index 406657e7b8cf7da7dd0ae4ae3c2ee86f323c233c..a97c02cd538750ac5fe300051e8cf52e4d00493f 100644
--- a/graf3d/gl/inc/TGLPlotBox.h
+++ b/graf3d/gl/inc/TGLPlotBox.h
@@ -14,12 +14,8 @@
#include <vector>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
class TColor;
diff --git a/graf3d/gl/inc/TGLPlotPainter.h b/graf3d/gl/inc/TGLPlotPainter.h
index ec7b5a74ed504e187657c60853ae2af42e3ece9c..d5954612d86feda584ed3da47e9b0c8491670f69 100644
--- a/graf3d/gl/inc/TGLPlotPainter.h
+++ b/graf3d/gl/inc/TGLPlotPainter.h
@@ -14,21 +14,11 @@
#include <vector>
-#ifndef ROOT_TVirtualGL
#include "TVirtualGL.h"
-#endif
-#ifndef ROOT_TGLPlotBox
#include "TGLPlotBox.h"
-#endif
-#ifndef ROOT_TPoint
#include "TPoint.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TGLPlotCoordinates;
class TGLPlotCamera;
diff --git a/graf3d/gl/inc/TGLPolyLine.h b/graf3d/gl/inc/TGLPolyLine.h
index fe83843ae9d49a4a7891d3eca72ff3496d6ad4bc..8a5692e93af6d246adff5b145ea37a62540f688e 100644
--- a/graf3d/gl/inc/TGLPolyLine.h
+++ b/graf3d/gl/inc/TGLPolyLine.h
@@ -14,9 +14,7 @@
#ifndef ROOT_TGLPolyLine
#define ROOT_TGLPolyLine
-#ifndef ROOT_TGLLogicalShape
#include "TGLLogicalShape.h"
-#endif
#include <vector>
diff --git a/graf3d/gl/inc/TGLPolyMarker.h b/graf3d/gl/inc/TGLPolyMarker.h
index 1bb8aa83e04bc0dd740b063b8d6fbdacfd84df98..1d3a5373c34b4bb9b38a5943668fd202ec59d1ef 100644
--- a/graf3d/gl/inc/TGLPolyMarker.h
+++ b/graf3d/gl/inc/TGLPolyMarker.h
@@ -14,9 +14,7 @@
#ifndef ROOT_TGLPolyMarker
#define ROOT_TGLPolyMarker
-#ifndef ROOT_TGLLogicalShape
#include "TGLLogicalShape.h"
-#endif
#include <vector>
diff --git a/graf3d/gl/inc/TGLQuadric.h b/graf3d/gl/inc/TGLQuadric.h
index 2df7c4d489e8496db66c31968cabb5dfcc5c44bf..75b0413420743e44296151cf3894398169788b3e 100644
--- a/graf3d/gl/inc/TGLQuadric.h
+++ b/graf3d/gl/inc/TGLQuadric.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGLQuadric
#define ROOT_TGLQuadric
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/graf3d/gl/inc/TGLRotateManip.h b/graf3d/gl/inc/TGLRotateManip.h
index 8fa1fcb5150bff973b48b1d93ba1b9bccc1c29d2..a6c41074f88f5332d9f177cd12feb2045ee7af67 100644
--- a/graf3d/gl/inc/TGLRotateManip.h
+++ b/graf3d/gl/inc/TGLRotateManip.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGLRotateManip
#define ROOT_TGLRotateManip
-#ifndef ROOT_TGLManip
#include "TGLManip.h"
-#endif
class TGLRotateManip : public TGLManip
diff --git a/graf3d/gl/inc/TGLSAFrame.h b/graf3d/gl/inc/TGLSAFrame.h
index b3279c6ab414c7c58cf5a2c8146cabbd8093ee5d..b634f87796c57ee436b5d5a051c6d3c21049e1bb 100644
--- a/graf3d/gl/inc/TGLSAFrame.h
+++ b/graf3d/gl/inc/TGLSAFrame.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TGLSAFrame
#define ROOT_TGLSAFrame
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGLSAViewer;
diff --git a/graf3d/gl/inc/TGLScaleManip.h b/graf3d/gl/inc/TGLScaleManip.h
index e5254526772d718c95a407903599506082c9cac5..7d3c84f7e097c56bf88babd849a917500a0f6e7a 100644
--- a/graf3d/gl/inc/TGLScaleManip.h
+++ b/graf3d/gl/inc/TGLScaleManip.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGLScaleManip
#define ROOT_TGLScaleManip
-#ifndef ROOT_TGLManip
#include "TGLManip.h"
-#endif
//////////////////////////////////////////////////////////////////////////
diff --git a/graf3d/gl/inc/TGLScenePad.h b/graf3d/gl/inc/TGLScenePad.h
index 768f2b7e6434fa4e8f77cd03716e0e1b385ab713..a568894b5510a939b54df90765cea05c6c4e0c06 100644
--- a/graf3d/gl/inc/TGLScenePad.h
+++ b/graf3d/gl/inc/TGLScenePad.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TGLScenePad
#define ROOT_TGLScenePad
-#ifndef ROOT_TGLScene
#include "TGLScene.h"
-#endif
-#ifndef ROOT_TVirtualViewer3D
#include "TVirtualViewer3D.h"
-#endif
-#ifndef ROOT_CsgOps
#include "CsgOps.h"
-#endif
class TGLViewer;
diff --git a/graf3d/gl/inc/TGLSphere.h b/graf3d/gl/inc/TGLSphere.h
index 653f4a4909aa606205aeb41c098a9a48a6aee3e7..0401f10bef2267b8ee09e74d3ee1e1f1d065b2e4 100644
--- a/graf3d/gl/inc/TGLSphere.h
+++ b/graf3d/gl/inc/TGLSphere.h
@@ -14,9 +14,7 @@
#ifndef ROOT_TGLSphere
#define ROOT_TGLSphere
-#ifndef ROOT_TGLLogicalShape
#include "TGLLogicalShape.h"
-#endif
class TBuffer3DSphere;
diff --git a/graf3d/gl/inc/TGLStopwatch.h b/graf3d/gl/inc/TGLStopwatch.h
index f5f7642ae7670449d88192960e88c05e4d7a2fef..41d72b1843e56e9be21980d1fa906863f650bc6b 100644
--- a/graf3d/gl/inc/TGLStopwatch.h
+++ b/graf3d/gl/inc/TGLStopwatch.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGLStopwatch
#define ROOT_TGLStopwatch
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/graf3d/gl/inc/TGLSurfacePainter.h b/graf3d/gl/inc/TGLSurfacePainter.h
index 246520fe1f4025a87439466e5c6b8690e44d064e..9eb8bcef35403efaf121bfde3bd3222af009455a 100644
--- a/graf3d/gl/inc/TGLSurfacePainter.h
+++ b/graf3d/gl/inc/TGLSurfacePainter.h
@@ -15,15 +15,9 @@
#include <vector>
#include <list>
-#ifndef ROOT_TGLPlotPainter
#include "TGLPlotPainter.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
class TRandom;
diff --git a/graf3d/gl/inc/TGLTF3Painter.h b/graf3d/gl/inc/TGLTF3Painter.h
index b316c6d89e725872b40798f5eed70716065d7fb8..4944f87ca4eee6266975c43567aa21d33a5425f1 100644
--- a/graf3d/gl/inc/TGLTF3Painter.h
+++ b/graf3d/gl/inc/TGLTF3Painter.h
@@ -15,15 +15,9 @@
#include <vector>
#include <list>
-#ifndef ROOT_TGLPlotPainter
#include "TGLPlotPainter.h"
-#endif
-#ifndef ROOT_TGLIsoMesh
#include "TGLIsoMesh.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
class TGLPlotCamera;
class TF3;
diff --git a/graf3d/gl/inc/TGLTH3Composition.h b/graf3d/gl/inc/TGLTH3Composition.h
index fbd640677db987bc7e326d73efeafe874bb1bead..a135cd7ba44904e74458ce65cf98d2d4f6468740 100644
--- a/graf3d/gl/inc/TGLTH3Composition.h
+++ b/graf3d/gl/inc/TGLTH3Composition.h
@@ -8,18 +8,10 @@
#include <memory>
#include <vector>
-#ifndef ROOT_TGLHistPainter
#include "TGLHistPainter.h"
-#endif
-#ifndef ROOT_TGLPlotPainter
#include "TGLPlotPainter.h"
-#endif
-#ifndef ROOT_TGLQuadric
#include "TGLQuadric.h"
-#endif
-#ifndef ROOT_TH3
#include "TH3.h"
-#endif
//
//Composition of TH3 objects. All TH3 must have the same axis range
diff --git a/graf3d/gl/inc/TGLText.h b/graf3d/gl/inc/TGLText.h
index d8d9907edb73b64b22f4a64abb83f2186a7ee883..3057ac8077e53cb9c723f4c63439f2985b8d6c34 100644
--- a/graf3d/gl/inc/TGLText.h
+++ b/graf3d/gl/inc/TGLText.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGLText
#define ROOT_TGLText
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
class FTFont;
diff --git a/graf3d/gl/inc/TGLTransManip.h b/graf3d/gl/inc/TGLTransManip.h
index 55e127ec9fca6504d28cb5e3dc4f9d94a7a46ee3..21182d9290e87be979d83f93a7a35dfac14d7e80 100644
--- a/graf3d/gl/inc/TGLTransManip.h
+++ b/graf3d/gl/inc/TGLTransManip.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGLTransManip
#define ROOT_TGLTransManip
-#ifndef ROOT_TGLManip
#include "TGLManip.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/graf3d/gl/inc/TGLUtil.h b/graf3d/gl/inc/TGLUtil.h
index 524fe66335dad4938b1c7bee1f2e6b5f3407e0c0..7a2b990c723ee653ba7accc7efcc04ff80eafb01 100644
--- a/graf3d/gl/inc/TGLUtil.h
+++ b/graf3d/gl/inc/TGLUtil.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TGLUtil
#define ROOT_TGLUtil
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TError
#include "TError.h"
-#endif
#include <vector>
#include <cmath>
diff --git a/graf3d/gl/inc/TGLViewerEditor.h b/graf3d/gl/inc/TGLViewerEditor.h
index 8e885c62ba5e08f3f589bf2e83c477939db07f27..ec86932c614787090f25dd2356a3bdc2ed26e241 100644
--- a/graf3d/gl/inc/TGLViewerEditor.h
+++ b/graf3d/gl/inc/TGLViewerEditor.h
@@ -14,13 +14,9 @@
#include <memory>
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
class TGCheckButton;
class TGNumberEntry;
diff --git a/graf3d/gl/inc/TGLVoxelPainter.h b/graf3d/gl/inc/TGLVoxelPainter.h
index d09c47322f874fec647a62ea21521d90951280a1..094289f76f16e71259fc06e9a0305ef314d7eb14 100644
--- a/graf3d/gl/inc/TGLVoxelPainter.h
+++ b/graf3d/gl/inc/TGLVoxelPainter.h
@@ -4,18 +4,10 @@
#include <utility>
#include <vector>
-#ifndef ROOT_TGLPlotPainter
#include "TGLPlotPainter.h"
-#endif
-#ifndef ROOT_TGLQuadric
#include "TGLQuadric.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TGLUtil
#include "TGLUtil.h"
-#endif
class TGLOrthoCamera;
class TH1;
diff --git a/graf3d/gl/inc/TGLWidget.h b/graf3d/gl/inc/TGLWidget.h
index 7768eff53519f53e64ca8442d0f2865764d66b68..463cdb054349f3e730dd985b22ac06949892c1c4 100644
--- a/graf3d/gl/inc/TGLWidget.h
+++ b/graf3d/gl/inc/TGLWidget.h
@@ -16,18 +16,10 @@
#include <memory>
#include <set>
-#ifndef ROOT_TGLContext
#include "TGLContext.h"
-#endif
-#ifndef ROOT_TVirtualGL
#include "TVirtualGL.h"
-#endif
-#ifndef ROOT_TGLFormat
#include "TGLFormat.h"
-#endif
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGLWidget;
class TGEventHandler;
diff --git a/graf3d/gl/inc/TKDEAdapter.h b/graf3d/gl/inc/TKDEAdapter.h
index 3746349d70a744e4ff273955d12c01cf5e9e50e9..e2ebec1449a8ebf49f43406afce687d654fd21af 100644
--- a/graf3d/gl/inc/TKDEAdapter.h
+++ b/graf3d/gl/inc/TKDEAdapter.h
@@ -14,12 +14,8 @@
#include <vector>
-#ifndef ROOT_TGLIsoMesh
#include "TGLIsoMesh.h"
-#endif
-#ifndef ROOT_TKDEFGT
#include "TKDEFGT.h"
-#endif
//KDE adapter is a "data source" adapter for
//Marching cubes alhorithm. It produces scalar
diff --git a/graf3d/gl/inc/TKDEFGT.h b/graf3d/gl/inc/TKDEFGT.h
index ca006b51f62254258c83d15ec134f7a1d1fb7fbd..78e44c96676de689718e1b63bda2d72d868d2757 100644
--- a/graf3d/gl/inc/TKDEFGT.h
+++ b/graf3d/gl/inc/TKDEFGT.h
@@ -13,9 +13,7 @@
#include <vector>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
//KDE - kenrel density estimator,
//based on fast Gauss transform.
diff --git a/graf3d/gl/inc/TPointSet3DGL.h b/graf3d/gl/inc/TPointSet3DGL.h
index a0b7af92f405f3092814b48ed33e7ac8f8186831..e388b62766cd7ae54e4448205ca8bf52b86afcc1 100644
--- a/graf3d/gl/inc/TPointSet3DGL.h
+++ b/graf3d/gl/inc/TPointSet3DGL.h
@@ -13,9 +13,7 @@
#ifndef ROOT_TPointSet3DGL
#define ROOT_TPointSet3DGL
-#ifndef ROOT_TGLObject
#include "TGLObject.h"
-#endif
class TGLRnrCtx;
diff --git a/graf3d/gl/inc/TX11GL.h b/graf3d/gl/inc/TX11GL.h
index 5c6ea0cb8ee839fb092b5a15ff369f953078cb8e..94d9044b7b1619fb0b0c432880b08659b2ffccae 100644
--- a/graf3d/gl/inc/TX11GL.h
+++ b/graf3d/gl/inc/TX11GL.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualGL
#include "TVirtualGL.h"
-#endif
#if !defined(__CLING__)
#include <GL/glx.h>
diff --git a/graf3d/x3d/inc/TViewerX3D.h b/graf3d/x3d/inc/TViewerX3D.h
index 5cc4e852e139ed370ade53a9db9469380b4ad182..23fc937bae5db28a601c15fb09d31e759d3fd21b 100644
--- a/graf3d/x3d/inc/TViewerX3D.h
+++ b/graf3d/x3d/inc/TViewerX3D.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TX3DFrame
#include "TX3DFrame.h"
-#endif
-#ifndef ROOT_TVirtualViewer3D
#include "TVirtualViewer3D.h"
-#endif
class TVirtualPad;
class TGCanvas;
diff --git a/graf3d/x3d/inc/TX3DFrame.h b/graf3d/x3d/inc/TX3DFrame.h
index 414394ef34b18eb7804440c021ac98667b968f25..272ea122bd077c70e7be91eec371be1b0006eec4 100644
--- a/graf3d/x3d/inc/TX3DFrame.h
+++ b/graf3d/x3d/inc/TX3DFrame.h
@@ -19,9 +19,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TViewerX3D;
diff --git a/gui/fitpanel/inc/TFitEditor.h b/gui/fitpanel/inc/TFitEditor.h
index d20c3477c97e8ce337af3786c780afa510f4ba17..8207abd5ff43ad53d5eb334b4e9ae8e7577844aa 100644
--- a/gui/fitpanel/inc/TFitEditor.h
+++ b/gui/fitpanel/inc/TFitEditor.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
#include "Foption.h"
#include "Math/MinimizerOptions.h"
diff --git a/gui/fitpanel/inc/TFitParametersDialog.h b/gui/fitpanel/inc/TFitParametersDialog.h
index cfeb1676467ed086732ab50fb7e1667cbff56225..31063ebf83898929663ccd7b4b9ffeb3b6db308e 100644
--- a/gui/fitpanel/inc/TFitParametersDialog.h
+++ b/gui/fitpanel/inc/TFitParametersDialog.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
enum EFPDialogBound {
kFPDBounded,
diff --git a/gui/fitpanel/inc/TTreeInput.h b/gui/fitpanel/inc/TTreeInput.h
index 5c884ff79d62efcc9bd5caa37655ea0df0d9ded3..1bfcc63a4073e154d0601184db15da62cb502a5e 100644
--- a/gui/fitpanel/inc/TTreeInput.h
+++ b/gui/fitpanel/inc/TTreeInput.h
@@ -21,9 +21,7 @@
// //
///////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGLabel;
class TGTextEntry;
diff --git a/gui/ged/inc/HelpSMText.h b/gui/ged/inc/HelpSMText.h
index c7f19de543acb59328d5c04922b0234c8a0bb204..91d98992f27e45c62609526fb0b945d0c3de4e89 100644
--- a/gui/ged/inc/HelpSMText.h
+++ b/gui/ged/inc/HelpSMText.h
@@ -9,9 +9,7 @@
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
R__EXTERN const char gHelpSMTopLevel[];
R__EXTERN const char gHelpSMGeneral[];
diff --git a/gui/ged/inc/TAttFillEditor.h b/gui/ged/inc/TAttFillEditor.h
index 4a3e845de7c0442cd669aec0c87b867e4c440def..206d0dd6701f22298567b7d8169a8792a6e23dca 100644
--- a/gui/ged/inc/TAttFillEditor.h
+++ b/gui/ged/inc/TAttFillEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
#include "TGSlider.h"
diff --git a/gui/ged/inc/TAttLineEditor.h b/gui/ged/inc/TAttLineEditor.h
index f9fdc8ff2f03bbf93cbd29bd479a12ac5744baaf..105cb60d0af8514e8e9f86699c6056c05bf90a0e 100644
--- a/gui/ged/inc/TAttLineEditor.h
+++ b/gui/ged/inc/TAttLineEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
#include "TGSlider.h"
diff --git a/gui/ged/inc/TAttMarkerEditor.h b/gui/ged/inc/TAttMarkerEditor.h
index 7b73254f000f6ee5ad4d817f1bda86c4122cc6d8..2c85456b5a518f1114a78a994e36e71cad4db94a 100644
--- a/gui/ged/inc/TAttMarkerEditor.h
+++ b/gui/ged/inc/TAttMarkerEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
#include "TGSlider.h"
diff --git a/gui/ged/inc/TAttTextEditor.h b/gui/ged/inc/TAttTextEditor.h
index f3d317e5c99a8033340e2c6f5e6cd9312170a788..584ffc32e475f515485ba18fa4240e60919c2d47 100644
--- a/gui/ged/inc/TAttTextEditor.h
+++ b/gui/ged/inc/TAttTextEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
#include "TGSlider.h"
diff --git a/gui/ged/inc/TAxisEditor.h b/gui/ged/inc/TAxisEditor.h
index 487402d29135aaf2301bdc99777ab826b9bb3970..af4e14f0e05a58429f58d1370f65378fd78ac4d1 100644
--- a/gui/ged/inc/TAxisEditor.h
+++ b/gui/ged/inc/TAxisEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TAxis;
class TGLabel;
diff --git a/gui/ged/inc/TCurlyArcEditor.h b/gui/ged/inc/TCurlyArcEditor.h
index 9d07b1134e57872ecff64ae8c5af99b3eb28dca9..5908250bd4110f03054607388cf0b22b101e765a 100644
--- a/gui/ged/inc/TCurlyArcEditor.h
+++ b/gui/ged/inc/TCurlyArcEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TGNumberEntry;
class TCurlyArc;
diff --git a/gui/ged/inc/TCurlyLineEditor.h b/gui/ged/inc/TCurlyLineEditor.h
index b0e7808814e0cf3d60db931edb99ad848194f24a..87957c619682a1557d11faa55d2327fb85df05cd 100644
--- a/gui/ged/inc/TCurlyLineEditor.h
+++ b/gui/ged/inc/TCurlyLineEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TGNumberEntry;
class TGCheckButton;
diff --git a/gui/ged/inc/TF1Editor.h b/gui/ged/inc/TF1Editor.h
index 72204c8e4f1d85e3af6136f39617002f1123f0d1..069ff5d8be83a8c4a546f46755d5b281fe46267a 100644
--- a/gui/ged/inc/TF1Editor.h
+++ b/gui/ged/inc/TF1Editor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TGNumberEntry;
class TGTextEntry;
diff --git a/gui/ged/inc/TFrameEditor.h b/gui/ged/inc/TFrameEditor.h
index ebba34ba99327513f938807706c29faac4042173..249c1d930e5269cacacb49815a182ae66401d95d 100644
--- a/gui/ged/inc/TFrameEditor.h
+++ b/gui/ged/inc/TFrameEditor.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TGRadioButton;
class TGLineWidthComboBox;
diff --git a/gui/ged/inc/TFunctionParametersDialog.h b/gui/ged/inc/TFunctionParametersDialog.h
index db40aa08bb270f387cb96c0c1a0451710196aecd..025f99acc06bc8914cf1aee9d3bbb7579adbeada 100644
--- a/gui/ged/inc/TFunctionParametersDialog.h
+++ b/gui/ged/inc/TFunctionParametersDialog.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TF1;
diff --git a/gui/ged/inc/TGedEditor.h b/gui/ged/inc/TGedEditor.h
index 49532de16866351c6eab66bb01ce0c0ea27dd3b0..91ba7103d03942c3d2923a88bd1b5c7e8073378b 100644
--- a/gui/ged/inc/TGedEditor.h
+++ b/gui/ged/inc/TGedEditor.h
@@ -23,18 +23,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TVirtualPadEditor
#include "TVirtualPadEditor.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class TCanvas;
class TGCanvas;
diff --git a/gui/ged/inc/TGedFrame.h b/gui/ged/inc/TGedFrame.h
index 013058c07a05fbad69e2ea83280415632909feb7..379e9417aa20d09f96fd6476f127d136f01a2c40 100644
--- a/gui/ged/inc/TGedFrame.h
+++ b/gui/ged/inc/TGedFrame.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TVirtualPad;
class TCanvas;
diff --git a/gui/ged/inc/TGedMarkerSelect.h b/gui/ged/inc/TGedMarkerSelect.h
index e0191f876486938a6898178748393148ccdb7d79..e700fb1e75aa931eecabf3795715cd4b4231c5d1 100644
--- a/gui/ged/inc/TGedMarkerSelect.h
+++ b/gui/ged/inc/TGedMarkerSelect.h
@@ -30,9 +30,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedPatternSelect
#include "TGedPatternSelect.h"
-#endif
class TGToolTip;
class TGPicture;
diff --git a/gui/ged/inc/TGedPatternSelect.h b/gui/ged/inc/TGedPatternSelect.h
index 950495c56c74203b1426dd23a7bb0d989b6ea866..fee1cb1b55323c8f5acce7254f9faa0ad69b4e8b 100644
--- a/gui/ged/inc/TGedPatternSelect.h
+++ b/gui/ged/inc/TGedPatternSelect.h
@@ -40,12 +40,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
-#ifndef ROOT_TGToolTip
#include "TGToolTip.h"
-#endif
class TGedPopup : public TGCompositeFrame {
diff --git a/gui/ged/inc/TGraphEditor.h b/gui/ged/inc/TGraphEditor.h
index dbf88496e6d14a5c358f6d6a736d898a9e23aa43..d280281f09fbc463c17d3e41902be2f0969cbafc 100644
--- a/gui/ged/inc/TGraphEditor.h
+++ b/gui/ged/inc/TGraphEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TGraph;
class TGButtonGroup;
diff --git a/gui/ged/inc/TH1Editor.h b/gui/ged/inc/TH1Editor.h
index 0545dab6b43963cece02b2bc105b122e1f97f1e2..e3c681bf059042a4139480da0fce3c36137ad0cd 100644
--- a/gui/ged/inc/TH1Editor.h
+++ b/gui/ged/inc/TH1Editor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TH1;
diff --git a/gui/ged/inc/TH2Editor.h b/gui/ged/inc/TH2Editor.h
index 64c542a1c0fb5d70282c4d87874f8b12ce46bef1..7d85659dd3357ba8e5ba3271472f53a2f90444e2 100644
--- a/gui/ged/inc/TH2Editor.h
+++ b/gui/ged/inc/TH2Editor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TH2;
class TGComboBox;
diff --git a/gui/ged/inc/TLineEditor.h b/gui/ged/inc/TLineEditor.h
index 3aafdcc2ee31551296f997d0bdac797077607616..e1c8748ebe947e6b17c48fd86dee1e16e2281f01 100644
--- a/gui/ged/inc/TLineEditor.h
+++ b/gui/ged/inc/TLineEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TGNumberEntry;
class TGCheckButton;
diff --git a/gui/ged/inc/TPadEditor.h b/gui/ged/inc/TPadEditor.h
index f056d447dcd0ce55d675d28ed3eb5ac61b2f7e14..b303b85dcc88aac416e2cbb6de4d5c3b30993898 100644
--- a/gui/ged/inc/TPadEditor.h
+++ b/gui/ged/inc/TPadEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TGCheckButton;
class TGRadioButton;
diff --git a/gui/ged/inc/TPaveStatsEditor.h b/gui/ged/inc/TPaveStatsEditor.h
index e973c04eef4e3cb490db52807dd86f0654e5370f..263b1ce8255d7547097346847fb938611de8d6a6 100644
--- a/gui/ged/inc/TPaveStatsEditor.h
+++ b/gui/ged/inc/TPaveStatsEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TGCheckButton;
class TPaveStats;
diff --git a/gui/ged/inc/TPieEditor.h b/gui/ged/inc/TPieEditor.h
index 4f90976c21bc78d6a8f1e5d43376cb48a4e279e6..b97eb72ee72cb6540c6405215fdc1c551032d17b 100644
--- a/gui/ged/inc/TPieEditor.h
+++ b/gui/ged/inc/TPieEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TPie;
class TGButtonGroup;
diff --git a/gui/ged/inc/TPieSliceEditor.h b/gui/ged/inc/TPieSliceEditor.h
index b550453d8fd62ab7fe83cb595a048ba9f4a3959a..31b26e8f7aa3423af13255b68fa8beff4b629fb4 100644
--- a/gui/ged/inc/TPieSliceEditor.h
+++ b/gui/ged/inc/TPieSliceEditor.h
@@ -19,9 +19,7 @@
#ifndef ROOT_TPieSliceEditor
#define ROOT_TPieSliceEditor
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TPieSlice;
class TGTextEntry;
diff --git a/gui/ged/inc/TStyleDialog.h b/gui/ged/inc/TStyleDialog.h
index 3b8e7d420ba51c8a6037972226d3cb311f5aa701..35a04c09fe807c9f01ab58a9b0aa0280052e120d 100644
--- a/gui/ged/inc/TStyleDialog.h
+++ b/gui/ged/inc/TStyleDialog.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGLabel;
class TGTextButton;
diff --git a/gui/ged/inc/TStyleManager.h b/gui/ged/inc/TStyleManager.h
index 29615ae0675167b9811a34241f15374b83e17b83..f559e4020dc174942f59d423b72055b6bf7d0c5d 100644
--- a/gui/ged/inc/TStyleManager.h
+++ b/gui/ged/inc/TStyleManager.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGNumberEntry
#include "TGNumberEntry.h"
-#endif
class TGButtonGroup;
class TGCheckButton;
diff --git a/gui/ged/inc/TStylePreview.h b/gui/ged/inc/TStylePreview.h
index 0198ef26d742f30ed7d80120bbf8264e4caaf014..3c27673bcba2f3e476d6f8bd630a93b89be473c5 100644
--- a/gui/ged/inc/TStylePreview.h
+++ b/gui/ged/inc/TStylePreview.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TCanvas;
class TList;
diff --git a/gui/ged/inc/TTextEditor.h b/gui/ged/inc/TTextEditor.h
index 54c4d805a6d0f6db703bccd33246dd3cf9f7fc40..2eec483af40b6f3fbef942d073e6152f9fa67290 100644
--- a/gui/ged/inc/TTextEditor.h
+++ b/gui/ged/inc/TTextEditor.h
@@ -19,9 +19,7 @@
#ifndef ROOT_TTextEditor
#define ROOT_TTextEditor
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TText;
class TGTextEntry;
diff --git a/gui/gui/inc/HelpText.h b/gui/gui/inc/HelpText.h
index ca3e3aa4c06bb47d91974c3421ef0043ce337aea..fd49e2db591399ee44bbcfe89b7de5810605789d 100644
--- a/gui/gui/inc/HelpText.h
+++ b/gui/gui/inc/HelpText.h
@@ -9,9 +9,7 @@
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
R__EXTERN const char gHelpAbout[];
R__EXTERN const char gHelpBrowser[];
diff --git a/gui/gui/inc/TG3DLine.h b/gui/gui/inc/TG3DLine.h
index dace031cd55bd00fb51fba35f8d675a57a58a591..f1dec7867cd98e24a406c69dcd01c3d4d2e1ed9e 100644
--- a/gui/gui/inc/TG3DLine.h
+++ b/gui/gui/inc/TG3DLine.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGHorizontal3DLine : public TGFrame {
diff --git a/gui/gui/inc/TGApplication.h b/gui/gui/inc/TGApplication.h
index a41c5155fc0f7456991af351bacb9068a9c3f4a8..2903111d318bd7f0efb0b94bb317170c01000830 100644
--- a/gui/gui/inc/TGApplication.h
+++ b/gui/gui/inc/TGApplication.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TApplication
#include "TApplication.h"
-#endif
class TGClient;
diff --git a/gui/gui/inc/TGButton.h b/gui/gui/inc/TGButton.h
index 5e4ee749dcc4dfc74dab54268341cd0bacc6bb66..b6c9c28de1321e00f091471b277ccc63cc8fc20d 100644
--- a/gui/gui/inc/TGButton.h
+++ b/gui/gui/inc/TGButton.h
@@ -44,12 +44,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
//--- Button states
diff --git a/gui/gui/inc/TGButtonGroup.h b/gui/gui/inc/TGButtonGroup.h
index 0e3fd86a42b1f21c24f33ecc21a8a350c5ebc8bf..56affd0b72b111db84661d07ee874b4ce327ad5f 100644
--- a/gui/gui/inc/TGButtonGroup.h
+++ b/gui/gui/inc/TGButtonGroup.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class TGButton;
diff --git a/gui/gui/inc/TGCanvas.h b/gui/gui/inc/TGCanvas.h
index f7df165ddb26d4f6d0bdcd8f0307c95205eebfc5..5fb7c6f78b3119b341715a265d247ee69f9ced2a 100644
--- a/gui/gui/inc/TGCanvas.h
+++ b/gui/gui/inc/TGCanvas.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGHScrollBar;
class TGVScrollBar;
diff --git a/gui/gui/inc/TGClient.h b/gui/gui/inc/TGClient.h
index 93eba2a69e3c980b8a7a7c78ed6b4146d07258f5..129ade012fe2014a64e5dfc5150c79962c7919fd 100644
--- a/gui/gui/inc/TGClient.h
+++ b/gui/gui/inc/TGClient.h
@@ -22,18 +22,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
class TList;
diff --git a/gui/gui/inc/TGColorDialog.h b/gui/gui/inc/TGColorDialog.h
index 3c2c63c007cde39fec37f5b3d11686dfbfa7bf5a..af120b7ccd9bbc294206dbc388f965d3772f4ea5 100644
--- a/gui/gui/inc/TGColorDialog.h
+++ b/gui/gui/inc/TGColorDialog.h
@@ -35,12 +35,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
#include "TColor.h"
diff --git a/gui/gui/inc/TGColorSelect.h b/gui/gui/inc/TGColorSelect.h
index 5a605da5ad07aa87d38fa09dfb67c98f05f6d94b..194245d97b7eb08dae714c362ec51132980dc6b6 100644
--- a/gui/gui/inc/TGColorSelect.h
+++ b/gui/gui/inc/TGColorSelect.h
@@ -36,12 +36,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
//----------------------------------------------------------------------
diff --git a/gui/gui/inc/TGComboBox.h b/gui/gui/inc/TGComboBox.h
index 15533edb0831ad22ee8047c3c44445abebaccb19..9be0b1ca49052474e48af66935672bd70dca8a46 100644
--- a/gui/gui/inc/TGComboBox.h
+++ b/gui/gui/inc/TGComboBox.h
@@ -33,9 +33,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGListBox
#include "TGListBox.h"
-#endif
class TGScrollBarElement;
class TGTextEntry;
diff --git a/gui/gui/inc/TGCommandPlugin.h b/gui/gui/inc/TGCommandPlugin.h
index 1caec7a491cbfec18dbf0f01fd9af30cc565b7e7..ac1b47bccbf29d37fda861c5183ced5f3ba1022a 100644
--- a/gui/gui/inc/TGCommandPlugin.h
+++ b/gui/gui/inc/TGCommandPlugin.h
@@ -4,9 +4,7 @@
#ifndef ROOT_TGCommandPlugin
#define ROOT_TGCommandPlugin
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGLabel;
class TGComboBox;
diff --git a/gui/gui/inc/TGDNDManager.h b/gui/gui/inc/TGDNDManager.h
index 964050a3a22714624fd87a55435eea5857172b87..9ac3e713ade2c64267267f08a391f85cae8e3770 100644
--- a/gui/gui/inc/TGDNDManager.h
+++ b/gui/gui/inc/TGDNDManager.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TDNDManager
#define ROOT_TDNDManager
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGMainFrame;
class TGDragWindow;
diff --git a/gui/gui/inc/TGDimension.h b/gui/gui/inc/TGDimension.h
index 79d71cea4555f4be2180e6a809bc91a573905157..4a58c9a41af69ae3c50e9e93c6f02be310e37ef4 100644
--- a/gui/gui/inc/TGDimension.h
+++ b/gui/gui/inc/TGDimension.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TGDimension {
public:
diff --git a/gui/gui/inc/TGDockableFrame.h b/gui/gui/inc/TGDockableFrame.h
index 772dfc2495a9c064c4e25607947a4c14695f1349..6f2ef4f0ff1743e1c669e363af735714a8e39322 100644
--- a/gui/gui/inc/TGDockableFrame.h
+++ b/gui/gui/inc/TGDockableFrame.h
@@ -24,21 +24,13 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
-#ifndef ROOT_TGWindow
#include "TGWindow.h"
-#endif
class TGDockableFrame;
diff --git a/gui/gui/inc/TGDoubleSlider.h b/gui/gui/inc/TGDoubleSlider.h
index 0c859006e40aa37e09dbcc815becec07847504f3..a7550fc4ed02362b07d31affc7ed8c6c50afb69f 100644
--- a/gui/gui/inc/TGDoubleSlider.h
+++ b/gui/gui/inc/TGDoubleSlider.h
@@ -49,12 +49,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
class TGPicture;
diff --git a/gui/gui/inc/TGEventHandler.h b/gui/gui/inc/TGEventHandler.h
index 86d9bea9ada184e30c2db13ade78d5f298ec7fa1..66d5ed111e2cea241cb41f996d9c25f64ee8add2 100644
--- a/gui/gui/inc/TGEventHandler.h
+++ b/gui/gui/inc/TGEventHandler.h
@@ -18,15 +18,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
class TGWindow;
diff --git a/gui/gui/inc/TGFSComboBox.h b/gui/gui/inc/TGFSComboBox.h
index e2f6b93179705ef17d409672bf2b4717ffe96d5e..0c1e275f820d605f4c71e8dd2baaaf16e828f7de 100644
--- a/gui/gui/inc/TGFSComboBox.h
+++ b/gui/gui/inc/TGFSComboBox.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGComboBox
#include "TGComboBox.h"
-#endif
diff --git a/gui/gui/inc/TGFSContainer.h b/gui/gui/inc/TGFSContainer.h
index 8d9acfcb7f50064f04b30788c3e4515850ce7e5f..8c3c66ca5d911849a3a18664b4de8e2a333c197a 100644
--- a/gui/gui/inc/TGFSContainer.h
+++ b/gui/gui/inc/TGFSContainer.h
@@ -21,15 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGListView
#include "TGListView.h"
-#endif
-#ifndef ROOT_TDNDManager
#include "TGDNDManager.h"
-#endif
-#ifndef ROOT_TBufferFile
#include "TBufferFile.h"
-#endif
#include <stdlib.h>
//----- file sort mode
diff --git a/gui/gui/inc/TGFileBrowser.h b/gui/gui/inc/TGFileBrowser.h
index dee0e9dd155a485cbd49738b95061e8852786a9b..88c1605d1f85195730dec3ef232e6f2d008309bf 100644
--- a/gui/gui/inc/TGFileBrowser.h
+++ b/gui/gui/inc/TGFileBrowser.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TGFileBrowser
#define ROOT_TGFileBrowser
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TBrowserImp
#include "TBrowserImp.h"
-#endif
#include <list>
#include <map>
diff --git a/gui/gui/inc/TGFileDialog.h b/gui/gui/inc/TGFileDialog.h
index 22172c2ff3edf2a6e2ebe1a45cb3c895097fc95f..d5a7511cac2dc06669d705c32b90cda5bb41d7d0 100644
--- a/gui/gui/inc/TGFileDialog.h
+++ b/gui/gui/inc/TGFileDialog.h
@@ -31,9 +31,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
enum EFileDialogMode {
diff --git a/gui/gui/inc/TGFont.h b/gui/gui/inc/TGFont.h
index 31a3d30340cb32588d3e308c27ecfb00f35ec668..fd6f793addf92eefbce6ed46c862d3024a023fef 100644
--- a/gui/gui/inc/TGFont.h
+++ b/gui/gui/inc/TGFont.h
@@ -22,15 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TGObject
#include "TGObject.h"
-#endif
-#ifndef ROOT_TRefCnt
#include "TRefCnt.h"
-#endif
class THashTable;
class TObjString;
diff --git a/gui/gui/inc/TGFontDialog.h b/gui/gui/inc/TGFontDialog.h
index 029932bd8557214751add88c7521dbea458ab5b1..3b011224f53ae07345c34d9cb6cefbd71e58b7b3 100644
--- a/gui/gui/inc/TGFontDialog.h
+++ b/gui/gui/inc/TGFontDialog.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
diff --git a/gui/gui/inc/TGFrame.h b/gui/gui/inc/TGFrame.h
index 83d719f0e3def14f9a01220026184c1d8d3fa80b..3566238cecbaed6cd50759e177c8a778ed076768 100644
--- a/gui/gui/inc/TGFrame.h
+++ b/gui/gui/inc/TGFrame.h
@@ -22,30 +22,14 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGWindow
#include "TGWindow.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
-#ifndef ROOT_TGDimension
#include "TGDimension.h"
-#endif
-#ifndef ROOT_TGGC
#include "TGGC.h"
-#endif
-#ifndef ROOT_TGFont
#include "TGFont.h"
-#endif
-#ifndef ROOT_TGLayout
#include "TGLayout.h"
-#endif
-#ifndef ROOT_TGString
#include "TGString.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TGResourcePool;
class TGTextButton;
diff --git a/gui/gui/inc/TGGC.h b/gui/gui/inc/TGGC.h
index c21267f7087ba25f542110ea934821e0f3fbefd1..fd5a6932e62684835c6a7c36ff97bc7cb33f5493 100644
--- a/gui/gui/inc/TGGC.h
+++ b/gui/gui/inc/TGGC.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGObject
#include "TGObject.h"
-#endif
-#ifndef ROOT_TRefCnt
#include "TRefCnt.h"
-#endif
class THashTable;
diff --git a/gui/gui/inc/TGIcon.h b/gui/gui/inc/TGIcon.h
index 83af9882d1a309be481ff18b2a2ca923cf086a0a..0b8d1242df442eb8cb49431807203db8606c9813 100644
--- a/gui/gui/inc/TGIcon.h
+++ b/gui/gui/inc/TGIcon.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGDimension
#include "TGDimension.h"
-#endif
class TGPicture;
class TImage;
diff --git a/gui/gui/inc/TGIdleHandler.h b/gui/gui/inc/TGIdleHandler.h
index 40fca60972f51a3d266bb17284184ee5568566b5..28df1dccfe4dd3e916cfc3e4566d8a17f445666b 100644
--- a/gui/gui/inc/TGIdleHandler.h
+++ b/gui/gui/inc/TGIdleHandler.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TGWindow;
diff --git a/gui/gui/inc/TGInputDialog.h b/gui/gui/inc/TGInputDialog.h
index 5ec9f09e3250d635c45187d95bb813204f33a8ae..fe8567fc08e6316bd79f0f216aed2e05aeed81c7 100644
--- a/gui/gui/inc/TGInputDialog.h
+++ b/gui/gui/inc/TGInputDialog.h
@@ -20,9 +20,7 @@
// //
///////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGLabel;
class TGTextEntry;
diff --git a/gui/gui/inc/TGLabel.h b/gui/gui/inc/TGLabel.h
index 99a76e2174168d46cd82ab62d1ef04bbcc2ec165..41029e6dde467f1b5cac6270a2ea7414725efb8e 100644
--- a/gui/gui/inc/TGLabel.h
+++ b/gui/gui/inc/TGLabel.h
@@ -21,15 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGDimension
#include "TGDimension.h"
-#endif
-#ifndef ROOT_TGString
#include "TGString.h"
-#endif
class TColor;
class TGTextLayout;
diff --git a/gui/gui/inc/TGLayout.h b/gui/gui/inc/TGLayout.h
index 93b15480e5b02fb720f9a498716e63cbe32463fb..ce3507be5af5813765474fbc62d115f1b0b8566d 100644
--- a/gui/gui/inc/TGLayout.h
+++ b/gui/gui/inc/TGLayout.h
@@ -20,15 +20,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TGDimension
#include "TGDimension.h"
-#endif
-#ifndef ROOT_TRefCnt
#include "TRefCnt.h"
-#endif
//---- layout hints
diff --git a/gui/gui/inc/TGListBox.h b/gui/gui/inc/TGListBox.h
index b24c892d64dc7767392cfc89e0a7d72cb3c7e1fd..6684d4f21a9e556c45023d4b6e2e4e19fa9720c7 100644
--- a/gui/gui/inc/TGListBox.h
+++ b/gui/gui/inc/TGListBox.h
@@ -32,18 +32,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGCanvas
#include "TGCanvas.h"
-#endif
-#ifndef ROOT_TGScrollBar
#include "TGScrollBar.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TGListBox;
diff --git a/gui/gui/inc/TGListTree.h b/gui/gui/inc/TGListTree.h
index 761f77dc6b3c1f1c42ff654836aefc333a6cd277..58412fcfa74bc55dc78875e702209dec05cb4d33 100644
--- a/gui/gui/inc/TGListTree.h
+++ b/gui/gui/inc/TGListTree.h
@@ -30,15 +30,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGCanvas
#include "TGCanvas.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TDNDManager
#include "TGDNDManager.h"
-#endif
class TGPicture;
class TGToolTip;
diff --git a/gui/gui/inc/TGListView.h b/gui/gui/inc/TGListView.h
index f2ac83ea4b89c38e8aefd2ed3ae8e224da12a050..d8362b5216775a4ed51a29bde426d92b9bcee308 100644
--- a/gui/gui/inc/TGListView.h
+++ b/gui/gui/inc/TGListView.h
@@ -31,15 +31,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGCanvas
#include "TGCanvas.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGSplitter
#include "TGSplitter.h"
-#endif
enum EListViewMode {
diff --git a/gui/gui/inc/TGMdi.h b/gui/gui/inc/TGMdi.h
index 6d62eefe376aaf4e86d400a618ac3ebc4a13c076..84938c07e3dabf8736db8bd519559dc60e91ad32 100644
--- a/gui/gui/inc/TGMdi.h
+++ b/gui/gui/inc/TGMdi.h
@@ -33,17 +33,9 @@
#ifndef ROOT_TGMdi
#define ROOT_TGMdi
-#ifndef ROOT_TGMdiMainFrame
#include "TGMdiMainFrame.h"
-#endif
-#ifndef ROOT_TGMdiMenu
#include "TGMdiMenu.h"
-#endif
-#ifndef ROOT_TGMdiDecorFrame
#include "TGMdiDecorFrame.h"
-#endif
-#ifndef ROOT_TGMdiFrame
#include "TGMdiFrame.h"
-#endif
#endif
diff --git a/gui/gui/inc/TGMdiDecorFrame.h b/gui/gui/inc/TGMdiDecorFrame.h
index c41fa2c814127ed5b1c4cb8d5a0f32327a3e3ec4..b56df80bc027170ea94ac7cb719ab8fe67808be3 100644
--- a/gui/gui/inc/TGMdiDecorFrame.h
+++ b/gui/gui/inc/TGMdiDecorFrame.h
@@ -22,30 +22,14 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGMenu
#include "TGMenu.h"
-#endif
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
-#ifndef ROOT_TGIcon
#include "TGIcon.h"
-#endif
-#ifndef ROOT_TGLabel
#include "TGLabel.h"
-#endif
-#ifndef ROOT_TGFont
#include "TGFont.h"
-#endif
-#ifndef ROOT_TGMdiMainFrame
#include "TGMdiMainFrame.h"
-#endif
-#ifndef ROOT_TGMdiFrame
#include "TGMdiFrame.h"
-#endif
// placement of window resizers
diff --git a/gui/gui/inc/TGMdiFrame.h b/gui/gui/inc/TGMdiFrame.h
index 9abba5436d705b7ff67ec25415b58a62b261055b..1deaaebf06e231b5befb0c37b57695a98dc297af 100644
--- a/gui/gui/inc/TGMdiFrame.h
+++ b/gui/gui/inc/TGMdiFrame.h
@@ -41,9 +41,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGPicture;
class TGMdiMainFrame;
diff --git a/gui/gui/inc/TGMdiMainFrame.h b/gui/gui/inc/TGMdiMainFrame.h
index f4f187c2499107ceca40f094334492c3cbab3ffa..22584eb8a12c1d89a586f155092f076e91fa23ef 100644
--- a/gui/gui/inc/TGMdiMainFrame.h
+++ b/gui/gui/inc/TGMdiMainFrame.h
@@ -41,15 +41,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGCanvas
#include "TGCanvas.h"
-#endif
-#ifndef ROOT_TGMenu
#include "TGMenu.h"
-#endif
-#ifndef ROOT_TGFont
#include "TGFont.h"
-#endif
// MDI resizing modes
diff --git a/gui/gui/inc/TGMdiMenu.h b/gui/gui/inc/TGMdiMenu.h
index 495364179672f3c8074a737220fc7a8b00634a98..51ab996cc1310b746895aecc55a3b85b3b8d11ec 100644
--- a/gui/gui/inc/TGMdiMenu.h
+++ b/gui/gui/inc/TGMdiMenu.h
@@ -41,12 +41,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGMenu
#include "TGMenu.h"
-#endif
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGMdiMainFrame;
diff --git a/gui/gui/inc/TGMenu.h b/gui/gui/inc/TGMenu.h
index cfbe7a099b9d3f1a3d4829e39644f67f170fb497..e61de720ba47ec2e00985bc8c92d4002746494b8 100644
--- a/gui/gui/inc/TGMenu.h
+++ b/gui/gui/inc/TGMenu.h
@@ -24,18 +24,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGString
#include "TGString.h"
-#endif
-#ifndef ROOT_TGPicture
#include "TGPicture.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
//--- Menu entry status mask
diff --git a/gui/gui/inc/TGMimeTypes.h b/gui/gui/inc/TGMimeTypes.h
index 531ee8bdbbcc78125a7c1a67f1d6bac1a9d43e68..0afa42e7e899e2ba168e361cfc67653c6916835b 100644
--- a/gui/gui/inc/TGMimeTypes.h
+++ b/gui/gui/inc/TGMimeTypes.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGClient
#include "TGClient.h"
-#endif
-#ifndef ROOT_TGPicture
#include "TGPicture.h"
-#endif
class TOrdCollection;
class TRegexp;
diff --git a/gui/gui/inc/TGMsgBox.h b/gui/gui/inc/TGMsgBox.h
index 54892de84ab020a3ddfaadee8585f6de80c03540..24272aa81ca06ab2b28af79b0c84e5b0603668c4 100644
--- a/gui/gui/inc/TGMsgBox.h
+++ b/gui/gui/inc/TGMsgBox.h
@@ -21,18 +21,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGString
#include "TGString.h"
-#endif
-#ifndef ROOT_TGPicture
#include "TGPicture.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
//--- Icon types
diff --git a/gui/gui/inc/TGNumberEntry.h b/gui/gui/inc/TGNumberEntry.h
index 31434232b50320da0682157193e02b35290e535d..8c39a427a5515df9c3f9e3d573fa2571ca2fc841 100644
--- a/gui/gui/inc/TGNumberEntry.h
+++ b/gui/gui/inc/TGNumberEntry.h
@@ -23,15 +23,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGTextEntry
#include "TGTextEntry.h"
-#endif
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
class TGNumberFormat {
diff --git a/gui/gui/inc/TGObject.h b/gui/gui/inc/TGObject.h
index 5f16ba791eaaccea00f7e9385259890e5b3e863b..bed40700df9736bb8a2c9994215a741a3b34f28b 100644
--- a/gui/gui/inc/TGObject.h
+++ b/gui/gui/inc/TGObject.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
class TGClient;
diff --git a/gui/gui/inc/TGPasswdDialog.h b/gui/gui/inc/TGPasswdDialog.h
index 7b98a567030f3d2627a68754f0af516319bf5884..560052adcce2e3672210baac69535eb7b257c51d 100644
--- a/gui/gui/inc/TGPasswdDialog.h
+++ b/gui/gui/inc/TGPasswdDialog.h
@@ -40,12 +40,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTime
#include "TTime.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TGTransientFrame;
class TGTextButton;
diff --git a/gui/gui/inc/TGPicture.h b/gui/gui/inc/TGPicture.h
index f4f94e5b97eb3a14d98452df195421293df1b808..346f532390d025dbe11d40f866d28d0d2afa1689 100644
--- a/gui/gui/inc/TGPicture.h
+++ b/gui/gui/inc/TGPicture.h
@@ -24,21 +24,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TRefCnt
#include "TRefCnt.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TGClient
#include "TGClient.h"
-#endif
-#ifndef ROOT_TGGC
#include "TGGC.h"
-#endif
class THashTable;
diff --git a/gui/gui/inc/TGProgressBar.h b/gui/gui/inc/TGProgressBar.h
index 8b1237c3297b48e61a1848dc40cdb2943e161756..a8cd02069b1eaedb1d0f975570893889cd9959e5 100644
--- a/gui/gui/inc/TGProgressBar.h
+++ b/gui/gui/inc/TGProgressBar.h
@@ -25,9 +25,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGProgressBar : public TGFrame {
diff --git a/gui/gui/inc/TGRedirectOutputGuard.h b/gui/gui/inc/TGRedirectOutputGuard.h
index 7b3d21946e758c22a7ce94431a4e052c0ca74227..cc8ec90d2f175e4da50dd90dac25119cb3bac46e 100644
--- a/gui/gui/inc/TGRedirectOutputGuard.h
+++ b/gui/gui/inc/TGRedirectOutputGuard.h
@@ -37,9 +37,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TGTextView;
diff --git a/gui/gui/inc/TGResourcePool.h b/gui/gui/inc/TGResourcePool.h
index 858bd17e9293b4455ec7fcc9e5c82cd994aa3d7c..52b20dee9b76c61c9dc622fb9a4acb8bc0090a0a 100644
--- a/gui/gui/inc/TGResourcePool.h
+++ b/gui/gui/inc/TGResourcePool.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGObject
#include "TGObject.h"
-#endif
class TGClient;
class TGFontPool;
diff --git a/gui/gui/inc/TGScrollBar.h b/gui/gui/inc/TGScrollBar.h
index bb2da68a582442030ca2d6d3f1287edbd816f683..e6e63d2294cb92efa61b7d40724105e1e60b7d8b 100644
--- a/gui/gui/inc/TGScrollBar.h
+++ b/gui/gui/inc/TGScrollBar.h
@@ -32,9 +32,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
//--- scrollbar types
diff --git a/gui/gui/inc/TGShapedFrame.h b/gui/gui/inc/TGShapedFrame.h
index ed16a8e773ca1212cb041f2080cb17be5d03481e..867e8a85a862206334db16524fb4e90d6786d9bc 100644
--- a/gui/gui/inc/TGShapedFrame.h
+++ b/gui/gui/inc/TGShapedFrame.h
@@ -12,21 +12,13 @@
#ifndef ROOT_TGShapedFrame
#define ROOT_TGShapedFrame
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TImage
#include "TImage.h"
-#endif
-#ifndef ROOT_TGPicture
#include "TGPicture.h"
-#endif
class TGShapedFrame : public TGCompositeFrame {
diff --git a/gui/gui/inc/TGShutter.h b/gui/gui/inc/TGShutter.h
index 4f64b82b9485b394be67a22a84b3b682bf1cf616..d4d8f008dd51180569452e046bed134d05cc0864 100644
--- a/gui/gui/inc/TGShutter.h
+++ b/gui/gui/inc/TGShutter.h
@@ -24,15 +24,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGCanvas
#include "TGCanvas.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
class TGButton;
diff --git a/gui/gui/inc/TGSimpleTable.h b/gui/gui/inc/TGSimpleTable.h
index dced5a128b0207840f5b4a6d336ee3c5e380548e..daf11fdc76aeb6e4278659d142dcf5cf15407adb 100644
--- a/gui/gui/inc/TGSimpleTable.h
+++ b/gui/gui/inc/TGSimpleTable.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TGSimpleTable
#define ROOT_TGSimpleTable
-#ifndef ROOT_TGTable
#include "TGTable.h"
-#endif
class TObjArray;
diff --git a/gui/gui/inc/TGSimpleTableInterface.h b/gui/gui/inc/TGSimpleTableInterface.h
index 58ca253a9c282879c1952fcfe18826396fa2e735..2bfc2c1f48b1d2a39654cfc4db2c85305a3cf06c 100644
--- a/gui/gui/inc/TGSimpleTableInterface.h
+++ b/gui/gui/inc/TGSimpleTableInterface.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TGSimpleTableInterface
#define ROOT_TGSimpleTableInterface
-#ifndef ROOT_TVirtualTableInterface
#include "TVirtualTableInterface.h"
-#endif
class TGSimpleTableInterface : public TVirtualTableInterface {
diff --git a/gui/gui/inc/TGSlider.h b/gui/gui/inc/TGSlider.h
index abfab90377b3c0e2ada7d2fce847aad3fe4e5533..217394735c71935a91cd185b60a70fb30b224f35 100644
--- a/gui/gui/inc/TGSlider.h
+++ b/gui/gui/inc/TGSlider.h
@@ -39,12 +39,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
//--- sizes for vert. and horz. sliders
diff --git a/gui/gui/inc/TGSpeedo.h b/gui/gui/inc/TGSpeedo.h
index 33a97e125769370af2b4e2674dbf8722e9c77871..d0c8837cd1b98a853a646d0ba2cfbee8a6b0b0de 100644
--- a/gui/gui/inc/TGSpeedo.h
+++ b/gui/gui/inc/TGSpeedo.h
@@ -29,18 +29,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGPicture
#include "TGPicture.h"
-#endif
-#ifndef ROOT_TImage
#include "TImage.h"
-#endif
class TGSpeedo : public TGFrame, public TGWidget {
diff --git a/gui/gui/inc/TGSplitFrame.h b/gui/gui/inc/TGSplitFrame.h
index 86c7d48f836d989a66193a7e0578266eedf5d9ad..e2cfac5c4850e1942f3f2dd1a3a8d1817db9b3e5 100644
--- a/gui/gui/inc/TGSplitFrame.h
+++ b/gui/gui/inc/TGSplitFrame.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TGSplitFrame
#define ROOT_TGSplitFrame
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class TGSplitter;
class TContextMenu;
diff --git a/gui/gui/inc/TGSplitter.h b/gui/gui/inc/TGSplitter.h
index 0f409e2d8bf00770a3f94b1c46c31992ba017c85..8a0f00e1f71f228f713908001487d66a756c078e 100644
--- a/gui/gui/inc/TGSplitter.h
+++ b/gui/gui/inc/TGSplitter.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGSplitter : public TGFrame {
diff --git a/gui/gui/inc/TGStatusBar.h b/gui/gui/inc/TGStatusBar.h
index 518ddf66f5d157cba24efddbd784642ba1504eca..83cddce7af668ec5f899d9a38c71e1dafd243f28 100644
--- a/gui/gui/inc/TGStatusBar.h
+++ b/gui/gui/inc/TGStatusBar.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGStatusBarPart;
diff --git a/gui/gui/inc/TGString.h b/gui/gui/inc/TGString.h
index 9f1396d598d6288f7482ed84174a4c10869f6e0a..3c6bf923fc994617464743e5b5a127bb9320ff6b 100644
--- a/gui/gui/inc/TGString.h
+++ b/gui/gui/inc/TGString.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
class TGString : public TString {
diff --git a/gui/gui/inc/TGTab.h b/gui/gui/inc/TGTab.h
index f898a79f0ad05bf3994956aade513c5ef42d5400..2c0b86956c456654980e23617ef2e2b30441e92c 100644
--- a/gui/gui/inc/TGTab.h
+++ b/gui/gui/inc/TGTab.h
@@ -29,12 +29,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
class TList;
class TGTabElement;
diff --git a/gui/gui/inc/TGTable.h b/gui/gui/inc/TGTable.h
index 8ac5735dc00586886e3e161214ec15e78e8a1580..0c0cced80c1322104fd4fd0cc98c513862c7b52e 100644
--- a/gui/gui/inc/TGTable.h
+++ b/gui/gui/inc/TGTable.h
@@ -11,15 +11,9 @@
#ifndef ROOT_TGTable
#define ROOT_TGTable
-#ifndef ROOT_TGCanvas
#include "TGCanvas.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGTableHeader
#include "TGTableHeader.h"
-#endif
class TGWindow;
class TGString;
diff --git a/gui/gui/inc/TGTableCell.h b/gui/gui/inc/TGTableCell.h
index cd9d9e2cd71f9ba3e6b58ef1f31027ef69f406d1..8fcdcc11cffafcb365042b5f1d3f95fc568c8c5a 100644
--- a/gui/gui/inc/TGTableCell.h
+++ b/gui/gui/inc/TGTableCell.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TGTableCell
#define ROOT_TGTableCell
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGTable;
class TGString;
diff --git a/gui/gui/inc/TGTableContainer.h b/gui/gui/inc/TGTableContainer.h
index de89e71a13d3ff4be7da8faaf766df3e4b268c5d..144140ab38cc7e01957964a5931487b5429e839d 100644
--- a/gui/gui/inc/TGTableContainer.h
+++ b/gui/gui/inc/TGTableContainer.h
@@ -11,12 +11,8 @@
#ifndef ROOT_TGTableFrame
#define ROOT_TGTableFrame
-#ifndef ROOT_TGCanvas
#include "TGCanvas.h"
-#endif
-#ifndef ROOT_TGTableHeader
#include "TGTableHeader.h"
-#endif
class TGTableFrame : public TQObject {
diff --git a/gui/gui/inc/TGTableHeader.h b/gui/gui/inc/TGTableHeader.h
index d18da2a4a3d4ed807f66693522036339ef83ad78..618e395b07d3a3dac8a9598cee2bce402b7a41a6 100644
--- a/gui/gui/inc/TGTableHeader.h
+++ b/gui/gui/inc/TGTableHeader.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TGTableHeader
#define ROOT_TGTableHeader
-#ifndef ROOT_TGTableCell
#include "TGTableCell.h"
-#endif
enum EHeaderType {
kColumnHeader,
diff --git a/gui/gui/inc/TGTableLayout.h b/gui/gui/inc/TGTableLayout.h
index 739bd6df8c769c72bb75799f7a8874711e7d72ee..023b00f4e4e5afa1728487a53236d69d3d2e0101 100644
--- a/gui/gui/inc/TGTableLayout.h
+++ b/gui/gui/inc/TGTableLayout.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TGTableLayout
#define ROOT_TGTableLayout
-#ifndef ROOT_TGLayout
#include "TGLayout.h"
-#endif
// extension of ELayoutHints
diff --git a/gui/gui/inc/TGText.h b/gui/gui/inc/TGText.h
index 40405cc0b9c0f272720ab0bead6302adaac45a4f..11fb2af76e939db7e767a61443c8fbaf559f478d 100644
--- a/gui/gui/inc/TGText.h
+++ b/gui/gui/inc/TGText.h
@@ -23,13 +23,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TGDimension
#include "TGDimension.h"
-#endif
class TGTextLine {
diff --git a/gui/gui/inc/TGTextBuffer.h b/gui/gui/inc/TGTextBuffer.h
index 1a688728e89adae924e387955f35615dc28e28c3..f89b32c162df258cec8d8f26ae577c1288cecaf3 100644
--- a/gui/gui/inc/TGTextBuffer.h
+++ b/gui/gui/inc/TGTextBuffer.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TGTextBuffer {
diff --git a/gui/gui/inc/TGTextEdit.h b/gui/gui/inc/TGTextEdit.h
index bff63605966831d3b3f7f20789f2148be053a23f..4d85eb7635161015acbf36a40e91220dfb9c37c5 100644
--- a/gui/gui/inc/TGTextEdit.h
+++ b/gui/gui/inc/TGTextEdit.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGTextView
#include "TGTextView.h"
-#endif
class TGPopupMenu;
class TGSearchType;
diff --git a/gui/gui/inc/TGTextEditDialogs.h b/gui/gui/inc/TGTextEditDialogs.h
index 84c4689527d8bc584164c03725636179be2dbd1f..d34a50d2f7ef0cc38de0eab3da18ebaa3c4cbc8e 100644
--- a/gui/gui/inc/TGTextEditDialogs.h
+++ b/gui/gui/inc/TGTextEditDialogs.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGSearchType {
diff --git a/gui/gui/inc/TGTextEditor.h b/gui/gui/inc/TGTextEditor.h
index 6e16b86f90e8e422e878c2f24bb5599de71fdef5..8238a1fdc54110a104d282072b062ee0b1b8cd9e 100644
--- a/gui/gui/inc/TGTextEditor.h
+++ b/gui/gui/inc/TGTextEditor.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGTextEdit
#include "TGTextEdit.h"
-#endif
class TGComboBox;
class TGLabel;
diff --git a/gui/gui/inc/TGTextEntry.h b/gui/gui/inc/TGTextEntry.h
index c0e3de50c646ff5b80ab197f59fd52fe9b7d3e84..0bb759d287de6270c14e02654889e8137355535e 100644
--- a/gui/gui/inc/TGTextEntry.h
+++ b/gui/gui/inc/TGTextEntry.h
@@ -28,15 +28,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGTextBuffer
#include "TGTextBuffer.h"
-#endif
class TBlinkTimer;
class TGToolTip;
diff --git a/gui/gui/inc/TGTextView.h b/gui/gui/inc/TGTextView.h
index 3fca42b636b8d2e6292730946a1fdb34312e2637..cabe6f1119e61c283182a94939c7ba47568a5840 100644
--- a/gui/gui/inc/TGTextView.h
+++ b/gui/gui/inc/TGTextView.h
@@ -25,12 +25,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGView
#include "TGView.h"
-#endif
-#ifndef ROOT_TGText
#include "TGText.h"
-#endif
class TViewTimer;
diff --git a/gui/gui/inc/TGTextViewStream.h b/gui/gui/inc/TGTextViewStream.h
index d82551d89f331ef87497ba27a167b49372fdafc1..7b6f0c22c78586525de6de62775064ddb381873f 100644
--- a/gui/gui/inc/TGTextViewStream.h
+++ b/gui/gui/inc/TGTextViewStream.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGTextView
#include "TGTextView.h"
-#endif
#include <vector>
#include <streambuf>
#include <iostream>
diff --git a/gui/gui/inc/TGToolBar.h b/gui/gui/inc/TGToolBar.h
index e555036c36f8dc209f7ec4ddda23d69eb0c965f9..43c73e8597292485ec73eec16171b59cc6f9390e 100644
--- a/gui/gui/inc/TGToolBar.h
+++ b/gui/gui/inc/TGToolBar.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGButton;
class TGPictureButton;
diff --git a/gui/gui/inc/TGToolTip.h b/gui/gui/inc/TGToolTip.h
index 180956a3312134b5e6cbfa14a356570075599b4a..9d764c1d4347bd403bc91154550c32b46dae1877 100644
--- a/gui/gui/inc/TGToolTip.h
+++ b/gui/gui/inc/TGToolTip.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGLabel;
class TTimer;
diff --git a/gui/gui/inc/TGTripleSlider.h b/gui/gui/inc/TGTripleSlider.h
index b32fe0b4630e19c836b0c3a9303d8669d9104a27..6e700c8c199103a90da5d31d0b1489b816215b31 100644
--- a/gui/gui/inc/TGTripleSlider.h
+++ b/gui/gui/inc/TGTripleSlider.h
@@ -53,15 +53,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TGDoubleSlider
#include "TGDoubleSlider.h"
-#endif
class TGTripleVSlider : public TGDoubleVSlider {
diff --git a/gui/gui/inc/TGView.h b/gui/gui/inc/TGView.h
index 76e933ab860889ae0cd2f27d121ac25dc102665c..b5e85e56e2cbf2895b3db60e938e9d183744f79f 100644
--- a/gui/gui/inc/TGView.h
+++ b/gui/gui/inc/TGView.h
@@ -32,15 +32,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGWidget
#include "TGWidget.h"
-#endif
-#ifndef ROOT_TTimer
#include "TTimer.h"
-#endif
class TGViewFrame;
class TGHScrollBar;
diff --git a/gui/gui/inc/TGWidget.h b/gui/gui/inc/TGWidget.h
index 57abb2a2d2b8c07c3779d27bff0654ce2095c746..cb1aac223520976bedd897bde38a1aebcbe0fb71 100644
--- a/gui/gui/inc/TGWidget.h
+++ b/gui/gui/inc/TGWidget.h
@@ -23,15 +23,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_GuiTypes
#include "GuiTypes.h"
-#endif
-#ifndef ROOT_TGString
#include "TGString.h"
-#endif
-#ifndef ROOT_WidgetMessageTypes
#include "WidgetMessageTypes.h"
-#endif
//--- Text justification modes
diff --git a/gui/gui/inc/TGWindow.h b/gui/gui/inc/TGWindow.h
index fcc8c89473b7297da7162463fd57acf246c90218..d68d768cf59ca68971484e3112275ae982fc90f9 100644
--- a/gui/gui/inc/TGWindow.h
+++ b/gui/gui/inc/TGWindow.h
@@ -21,15 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGObject
#include "TGObject.h"
-#endif
-#ifndef ROOT_TGClient
#include "TGClient.h"
-#endif
-#ifndef ROOT_TVirtualX
#include "TVirtualX.h"
-#endif
class TGClient;
class TGIdleHandler;
diff --git a/gui/gui/inc/TGXYLayout.h b/gui/gui/inc/TGXYLayout.h
index ff7c7bd1dec26c3da545aa40ff4878c5d91420a0..aa23529511d9561aaa936bd43e0e3ad565649a7d 100644
--- a/gui/gui/inc/TGXYLayout.h
+++ b/gui/gui/inc/TGXYLayout.h
@@ -89,9 +89,7 @@
#ifndef ROOT_TGXYLayout
#define ROOT_TGXYLayout
-#ifndef ROOT_TGLayout
#include "TGLayout.h"
-#endif
class TGXYLayoutHints : public TGLayoutHints {
diff --git a/gui/gui/inc/TGuiBuilder.h b/gui/gui/inc/TGuiBuilder.h
index fb2a2773035d1ea7ac8156c00b82619a1c230ede..6a1a8a7b8e1ac5a76cbf75e042997cf03acb736b 100644
--- a/gui/gui/inc/TGuiBuilder.h
+++ b/gui/gui/inc/TGuiBuilder.h
@@ -20,9 +20,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
enum EGuiBldAction { kGuiBldNone, kGuiBldCtor, kGuiBldProj,
kGuiBldMacro, kGuiBldFunc };
diff --git a/gui/gui/inc/TRootApplication.h b/gui/gui/inc/TRootApplication.h
index 52ecf0e1104e51f0cd50602f94e545381c6f6798..042fed72678aadae6f5bab94597aae5cfbb2c9ea 100644
--- a/gui/gui/inc/TRootApplication.h
+++ b/gui/gui/inc/TRootApplication.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TApplicationImp
#include "TApplicationImp.h"
-#endif
class TGClient;
diff --git a/gui/gui/inc/TRootBrowser.h b/gui/gui/inc/TRootBrowser.h
index 6a5ebe7c3985332a630c9da3f71fc9b1cd8054e1..4eec0ee04f0f9fe87c22c1370061ad9d0c150861 100644
--- a/gui/gui/inc/TRootBrowser.h
+++ b/gui/gui/inc/TRootBrowser.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TRootBrowser
#define ROOT_TRootBrowser
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TBrowserImp
#include "TBrowserImp.h"
-#endif
class TGLayoutHints;
class TGTab;
diff --git a/gui/gui/inc/TRootBrowserLite.h b/gui/gui/inc/TRootBrowserLite.h
index 0ab9c423a6d1a0abb70a98e272501480ce55cee0..021c04d8536407faa93ddfe18594478588e3e414 100644
--- a/gui/gui/inc/TRootBrowserLite.h
+++ b/gui/gui/inc/TRootBrowserLite.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBrowserImp
#include "TBrowserImp.h"
-#endif
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGMenuBar;
class TGPopupMenu;
diff --git a/gui/gui/inc/TRootCanvas.h b/gui/gui/inc/TRootCanvas.h
index ce6d9c2529f65d2088c43617e468594078774700..2420db1e4238417673fbc2e53a51f53ef3c82c94 100644
--- a/gui/gui/inc/TRootCanvas.h
+++ b/gui/gui/inc/TRootCanvas.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TCanvasImp
#include "TCanvasImp.h"
-#endif
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGCanvas;
class TGMenuBar;
diff --git a/gui/gui/inc/TRootContextMenu.h b/gui/gui/inc/TRootContextMenu.h
index 42da8c4bf2326934c4cd16c105c55afc8f1c9cfb..ee4bb71bdbd1b268f9832d5f65f598146b5287e3 100644
--- a/gui/gui/inc/TRootContextMenu.h
+++ b/gui/gui/inc/TRootContextMenu.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TContextMenuImp
#include "TContextMenuImp.h"
-#endif
-#ifndef ROOT_TGMenu
#include "TGMenu.h"
-#endif
class TRootDialog;
diff --git a/gui/gui/inc/TRootControlBar.h b/gui/gui/inc/TRootControlBar.h
index 7af3b7ab48e5d08c9a8d16535ae86ae2bc18d8c6..83bd1eaed3affcb81c55852bc373f93f8b3f036f 100644
--- a/gui/gui/inc/TRootControlBar.h
+++ b/gui/gui/inc/TRootControlBar.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TControlBarImp
#include "TControlBarImp.h"
-#endif
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TControlBar;
class TList;
diff --git a/gui/gui/inc/TRootDialog.h b/gui/gui/inc/TRootDialog.h
index e73aa1ceb75318e295e6f0305a2e6396762b7ba8..10f47b2c2c8a75eb92bb37937521095e4efb70e9 100644
--- a/gui/gui/inc/TRootDialog.h
+++ b/gui/gui/inc/TRootDialog.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TRootContextMenu;
diff --git a/gui/gui/inc/TRootEmbeddedCanvas.h b/gui/gui/inc/TRootEmbeddedCanvas.h
index d8a366199b072af94cf535d93a826309014b57fd..b35d011165caba41dd5e265b33393de47b5f8e5a 100644
--- a/gui/gui/inc/TRootEmbeddedCanvas.h
+++ b/gui/gui/inc/TRootEmbeddedCanvas.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGCanvas
#include "TGCanvas.h"
-#endif
class TCanvas;
diff --git a/gui/gui/inc/TRootGuiFactory.h b/gui/gui/inc/TRootGuiFactory.h
index 6459e50bb087ffc87cd85a84a1e2eacf84c6698f..161c643c003fcf16818239be4fc74ec58ebf9bec 100644
--- a/gui/gui/inc/TRootGuiFactory.h
+++ b/gui/gui/inc/TRootGuiFactory.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGuiFactory
#include "TGuiFactory.h"
-#endif
class TApplicationImp;
class TCanvasImp;
diff --git a/gui/gui/inc/TRootHelpDialog.h b/gui/gui/inc/TRootHelpDialog.h
index 6ef07195a16c4236ac30f1c9f1920c8750a5d49c..d91931330d0257aa60fae964a7476f96ca9522b8 100644
--- a/gui/gui/inc/TRootHelpDialog.h
+++ b/gui/gui/inc/TRootHelpDialog.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGTextView;
class TGTextButton;
diff --git a/gui/gui/inc/TVirtualDragManager.h b/gui/gui/inc/TVirtualDragManager.h
index 0653bf54e19b8e7b4db0afe9780f529b4275db11..874943fcbb5edc8cb737d2a121d1df7d51599f59 100644
--- a/gui/gui/inc/TVirtualDragManager.h
+++ b/gui/gui/inc/TVirtualDragManager.h
@@ -19,9 +19,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
enum EDragType { kDragNone, kDragMove, kDragCopy,
kDragLink, kDragLasso, kDragResize };
diff --git a/gui/gui/inc/WidgetMessageTypes.h b/gui/gui/inc/WidgetMessageTypes.h
index 7c8201cc0ad334d3831323bbc4182e030b0604c1..43ff0ebb5a1d10d672cb7ce09323fa5d9df8620b 100644
--- a/gui/gui/inc/WidgetMessageTypes.h
+++ b/gui/gui/inc/WidgetMessageTypes.h
@@ -26,9 +26,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
enum EWidgetMessageTypes {
diff --git a/gui/guibuilder/inc/TGuiBldDragManager.h b/gui/guibuilder/inc/TGuiBldDragManager.h
index a93e810cb695b2aab271f860c8f51a8f6fa6149e..d87e548987253e560d502c5976bbfc7c8a3d323d 100644
--- a/gui/guibuilder/inc/TGuiBldDragManager.h
+++ b/gui/guibuilder/inc/TGuiBldDragManager.h
@@ -19,13 +19,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TVirtualDragManager
#include "TVirtualDragManager.h"
-#endif
class TTimer;
class TGuiBldDragManagerPimpl;
diff --git a/gui/guibuilder/inc/TGuiBldEditor.h b/gui/guibuilder/inc/TGuiBldEditor.h
index 197fd36b0092f30be3ee07d7363212794bf6e81d..07fe9d4cc19070c2180f93c97ce8b47ed4dce549 100644
--- a/gui/guibuilder/inc/TGuiBldEditor.h
+++ b/gui/guibuilder/inc/TGuiBldEditor.h
@@ -20,13 +20,9 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGNumberEntry
#include "TGNumberEntry.h"
-#endif
class TGuiBldHintsEditor;
class TGuiBldNameFrame;
diff --git a/gui/guibuilder/inc/TGuiBldGeometryFrame.h b/gui/guibuilder/inc/TGuiBldGeometryFrame.h
index 0fc388cd6ae437074335d326baae55eef4854df8..d32f0025355c5719e88a49f538c902ec665d2d9a 100644
--- a/gui/guibuilder/inc/TGuiBldGeometryFrame.h
+++ b/gui/guibuilder/inc/TGuiBldGeometryFrame.h
@@ -20,9 +20,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGuiBldEditor;
diff --git a/gui/guibuilder/inc/TGuiBldHintsButton.h b/gui/guibuilder/inc/TGuiBldHintsButton.h
index 351cad746f1c46c100d65c63fd3359a40c83ff54..bd8d6f79919a55f0f67c4797cfb201cccc59724c 100644
--- a/gui/guibuilder/inc/TGuiBldHintsButton.h
+++ b/gui/guibuilder/inc/TGuiBldHintsButton.h
@@ -20,9 +20,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
//////////////////////////////////////////////////////////////////////////
diff --git a/gui/guibuilder/inc/TGuiBldHintsEditor.h b/gui/guibuilder/inc/TGuiBldHintsEditor.h
index c373993a3d2389da5df2c58ec5341690fcf7b106..6fa7fc97a284b379c7bad94db9a3c4ee03400d41 100644
--- a/gui/guibuilder/inc/TGuiBldHintsEditor.h
+++ b/gui/guibuilder/inc/TGuiBldHintsEditor.h
@@ -20,9 +20,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
class TGuiBldHintsButton;
diff --git a/gui/guibuilder/inc/TGuiBldNameFrame.h b/gui/guibuilder/inc/TGuiBldNameFrame.h
index b514311cfe56642c3aabd2dd957e3890c6681007..a60b781928e355dd73a430fb1a61ac778d96556c 100644
--- a/gui/guibuilder/inc/TGuiBldNameFrame.h
+++ b/gui/guibuilder/inc/TGuiBldNameFrame.h
@@ -21,9 +21,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGLabel;
class TGTextEntry;
diff --git a/gui/guibuilder/inc/TRootGuiBuilder.h b/gui/guibuilder/inc/TRootGuiBuilder.h
index 016d9ac758f35e2770a15af5a9985e4de84372cc..50c55ca57b2c933978e1c38a267ebb7731eaa54c 100644
--- a/gui/guibuilder/inc/TRootGuiBuilder.h
+++ b/gui/guibuilder/inc/TRootGuiBuilder.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGuiBuilder
#include "TGuiBuilder.h"
-#endif
enum EGuiBuilderMenuIds {
kGUIBLD_FILE_NEW,
diff --git a/gui/guihtml/inc/TGHtml.h b/gui/guihtml/inc/TGHtml.h
index 5f783502e0b8682761e4a1a90a55544dd84f9f54..98a66914a5e8aa9593dcb4b844ba2c701d4c02f8 100644
--- a/gui/guihtml/inc/TGHtml.h
+++ b/gui/guihtml/inc/TGHtml.h
@@ -34,13 +34,9 @@
#ifndef ROOT_TGHtml
#define ROOT_TGHtml
-#ifndef ROOT_TGView
#include "TGView.h"
-#endif
-#ifndef ROOT_TGHtmlTokens
#include "TGHtmlTokens.h"
-#endif
class TGClient;
class TImage;
diff --git a/gui/guihtml/inc/TGHtmlUri.h b/gui/guihtml/inc/TGHtmlUri.h
index f04329c65b6684ac20da89fb41091abcf506a1a2..97776e30243298bfc445c4b1bb70c5dba867abb0 100644
--- a/gui/guihtml/inc/TGHtmlUri.h
+++ b/gui/guihtml/inc/TGHtmlUri.h
@@ -34,9 +34,7 @@
#ifndef ROOT_TGHtmlUri
#define ROOT_TGHtmlUri
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
#define URI_SCHEME_MASK (1<<0)
#define URI_AUTH_MASK (1<<1)
diff --git a/gui/qtgsi/inc/TQApplication.h b/gui/qtgsi/inc/TQApplication.h
index ab0039bca33f209d72821fc864665d7b07d48dc3..dc85af9dfde6640c931c2efb2a435e7bf2083357 100644
--- a/gui/qtgsi/inc/TQApplication.h
+++ b/gui/qtgsi/inc/TQApplication.h
@@ -23,9 +23,7 @@
//
//////////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TApplication
#include "TApplication.h"
-#endif
class TQApplication : public TApplication {
diff --git a/gui/qtgsi/inc/TQCanvasImp.h b/gui/qtgsi/inc/TQCanvasImp.h
index 41ee2f37ed2673b2ba1eddb2d7686830ba378d21..37ce107f1823ea3afff2488137191c8f4fd105e1 100644
--- a/gui/qtgsi/inc/TQCanvasImp.h
+++ b/gui/qtgsi/inc/TQCanvasImp.h
@@ -21,9 +21,7 @@
//
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TCanvasImp
#include "TCanvasImp.h"
-#endif
class TQRootCanvas;
diff --git a/gui/qtgsi/inc/TQCanvasMenu.h b/gui/qtgsi/inc/TQCanvasMenu.h
index 48b4913eb60282164f471872485386f9da189dcc..cbaa288caa8b7eb9260d481d267f1792bc075138 100644
--- a/gui/qtgsi/inc/TQCanvasMenu.h
+++ b/gui/qtgsi/inc/TQCanvasMenu.h
@@ -24,9 +24,7 @@
#include "qobject.h"
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TCanvas;
class TObject;
diff --git a/gui/qtgsi/inc/TQRootApplication.h b/gui/qtgsi/inc/TQRootApplication.h
index 834ae2b7f3d79b0dacc2ad7efa10c225350707a2..68b58acf533cf721d7f41dbb99b4745f01ab50f4 100644
--- a/gui/qtgsi/inc/TQRootApplication.h
+++ b/gui/qtgsi/inc/TQRootApplication.h
@@ -28,9 +28,7 @@
#include "qtimer.h"
#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TTimer;
class QApplication;
diff --git a/gui/qtgsi/inc/TQRootCanvas.h b/gui/qtgsi/inc/TQRootCanvas.h
index ead58bde798a5d0d04862e6cd24cd12f14fc799c..de4586a8f31aa64747836c38c9a6b77496d9bd16 100644
--- a/gui/qtgsi/inc/TQRootCanvas.h
+++ b/gui/qtgsi/inc/TQRootCanvas.h
@@ -33,9 +33,7 @@
#endif
#endif
-#ifndef ROOT_TVirtualPad
#include "TVirtualPad.h"
-#endif
class QAction;
diff --git a/gui/qtgsi/inc/TQRootDialog.h b/gui/qtgsi/inc/TQRootDialog.h
index 210add5db3a6109b03a7e4b3f8d12e853e7185b0..ae082ce4dce13a58f9c265060322320d4c6c9363 100644
--- a/gui/qtgsi/inc/TQRootDialog.h
+++ b/gui/qtgsi/inc/TQRootDialog.h
@@ -35,9 +35,7 @@ typedef Q3VBox QVBox;
# endif
#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TMethod;
class TCanvas;
diff --git a/gui/qtgsi/inc/TQRootGuiFactory.h b/gui/qtgsi/inc/TQRootGuiFactory.h
index 1f61ae021af5737979b53e2f645a794bcd451172..03c8d0c0605db8ccbc04817fe7757d6a43222a1e 100644
--- a/gui/qtgsi/inc/TQRootGuiFactory.h
+++ b/gui/qtgsi/inc/TQRootGuiFactory.h
@@ -32,9 +32,7 @@
//@li Creates a specific Canvas Implementation QCanvasImp
////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TRootGuiFactory
#include "TRootGuiFactory.h"
-#endif
class TCanvasImp;
diff --git a/gui/recorder/inc/TRecorder.h b/gui/recorder/inc/TRecorder.h
index 6251fa9247d16657443489b756dee288bd42875c..29adb43290afbb613dde40634f37c6726bed807d 100644
--- a/gui/recorder/inc/TRecorder.h
+++ b/gui/recorder/inc/TRecorder.h
@@ -118,30 +118,14 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Riostream
#include "Riostream.h"
-#endif
-#ifndef ROOT_TApplication
#include "TApplication.h"
-#endif
-#ifndef ROOT_TError
#include "TError.h"
-#endif
-#ifndef ROOT_TTimer
#include "TTimer.h"
-#endif
-#ifndef ROOT_TGClient
#include "TGClient.h"
-#endif
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TCanvas
#include "TCanvas.h"
-#endif
-#ifndef ROOT_THashList
#include "THashList.h"
-#endif
#include <time.h>
diff --git a/gui/sessionviewer/inc/TProofProgressDialog.h b/gui/sessionviewer/inc/TProofProgressDialog.h
index 80a71b31d21f13130549a8de59908bc771316d7a..5fa71121068246ca289c82e1456741a8140bc485 100644
--- a/gui/sessionviewer/inc/TProofProgressDialog.h
+++ b/gui/sessionviewer/inc/TProofProgressDialog.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTime
#include "TTime.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TGTransientFrame;
class TGProgressBar;
diff --git a/gui/sessionviewer/inc/TProofProgressLog.h b/gui/sessionviewer/inc/TProofProgressLog.h
index 235104c0586d7db864b86b13b012eb1a7433532f..106344cb891f216573a427634ace69f6defd41e5 100644
--- a/gui/sessionviewer/inc/TProofProgressLog.h
+++ b/gui/sessionviewer/inc/TProofProgressLog.h
@@ -22,12 +22,8 @@
// //
///////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TGTextView;
class TGTextButton;
diff --git a/gui/sessionviewer/inc/TProofProgressMemoryPlot.h b/gui/sessionviewer/inc/TProofProgressMemoryPlot.h
index c7c2f5d472b2d988e2256a27ecdbf017899209b5..b6fcddec97ed9d937b38fb9dc755c47f46f4ed2b 100644
--- a/gui/sessionviewer/inc/TProofProgressMemoryPlot.h
+++ b/gui/sessionviewer/inc/TProofProgressMemoryPlot.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGListBox;
class TGTextButton;
diff --git a/gui/sessionviewer/inc/TSessionDialogs.h b/gui/sessionviewer/inc/TSessionDialogs.h
index dacac98898a9f178d50deb6510e242636b9f1468..7d737c126c4f0466a5893e40da300d198adffaa6 100644
--- a/gui/sessionviewer/inc/TSessionDialogs.h
+++ b/gui/sessionviewer/inc/TSessionDialogs.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSessionViewer
#include "TSessionViewer.h"
-#endif
class TList;
class TSeqCollection;
diff --git a/gui/sessionviewer/inc/TSessionLogView.h b/gui/sessionviewer/inc/TSessionLogView.h
index ff4297cbc0b058a658eb08d0b054a63f963cd7a6..2b0227c5d47cf551d74087b47d0e5a792096df95 100644
--- a/gui/sessionviewer/inc/TSessionLogView.h
+++ b/gui/sessionviewer/inc/TSessionLogView.h
@@ -12,17 +12,11 @@
#ifndef ROOT_TSessionLogView
#define ROOT_TSessionLogView
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
-#ifndef ROOT_TTextView
#include "TGTextView.h"
-#endif
class TSessionViewer;
diff --git a/gui/sessionviewer/inc/TSessionViewer.h b/gui/sessionviewer/inc/TSessionViewer.h
index ce277710527141e0dc32887d45f6c19d476db2ee..85d30d9286430da7f4a404f436992192ec6316f8 100644
--- a/gui/sessionviewer/inc/TSessionViewer.h
+++ b/gui/sessionviewer/inc/TSessionViewer.h
@@ -21,33 +21,19 @@
#ifndef ROOT_TSessionViewer
#define ROOT_TSessionViewer
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TGTextEntry
#include "TGTextEntry.h"
-#endif
-#ifndef ROOT_TGNumberEntry
#include "TGNumberEntry.h"
-#endif
-#ifndef ROOT_TGTab
#include "TGTab.h"
-#endif
-#ifndef ROOT_TGListView
#include "TGListView.h"
-#endif
-#ifndef ROOT_TTime
#include "TTime.h"
-#endif
#include <stdio.h>
#include <time.h>
diff --git a/hist/hbook/inc/THbookBranch.h b/hist/hbook/inc/THbookBranch.h
index 076d40f92158062fd02f4c2fafcb793d558a721a..1052d1ecb2f7caf44d1e09386eabae4d6b95a9bc 100644
--- a/hist/hbook/inc/THbookBranch.h
+++ b/hist/hbook/inc/THbookBranch.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBranch
#include "TBranch.h"
-#endif
class THbookBranch : public TBranch {
diff --git a/hist/hbook/inc/THbookFile.h b/hist/hbook/inc/THbookFile.h
index a815af7e6943e41b69bdd73a7b6a3d939ff72dad..5c43290d742040f03b3f2546591afd4571b91099 100644
--- a/hist/hbook/inc/THbookFile.h
+++ b/hist/hbook/inc/THbookFile.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
class TTreeFormula;
diff --git a/hist/hbook/inc/THbookKey.h b/hist/hbook/inc/THbookKey.h
index 92aa39fbacd535c8885588b607c25f161da27109..48fd6533f3b9f5430f58094e6f7c5d51d9521856 100644
--- a/hist/hbook/inc/THbookKey.h
+++ b/hist/hbook/inc/THbookKey.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_THbookFile
#include "THbookFile.h"
-#endif
class THbookKey : public TNamed {
diff --git a/hist/hbook/inc/THbookTree.h b/hist/hbook/inc/THbookTree.h
index bd2f01c1ddd805ffc16d6c250d8d25553a572e85..46a5980866d2b15fa5756e1cdc096fa0c7cf2f4e 100644
--- a/hist/hbook/inc/THbookTree.h
+++ b/hist/hbook/inc/THbookTree.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_THbookFile
#include "THbookFile.h"
-#endif
class THbookTree : public TTree {
diff --git a/hist/hist/inc/Math/WrappedMultiTF1.h b/hist/hist/inc/Math/WrappedMultiTF1.h
index b4ab95af408c1fa3d1d4a9cfa315ce58d4f37edf..d99b1c4d39d6ad4805fdfe2c1406b27d4e002871 100644
--- a/hist/hist/inc/Math/WrappedMultiTF1.h
+++ b/hist/hist/inc/Math/WrappedMultiTF1.h
@@ -14,13 +14,9 @@
#define ROOT_Math_WrappedMultiTF1
-#ifndef ROOT_Math_IParamFunction
#include "Math/IParamFunction.h"
-#endif
-#ifndef ROOT_TF1
#include "TF1.h"
-#endif
namespace ROOT {
diff --git a/hist/hist/inc/Math/WrappedTF1.h b/hist/hist/inc/Math/WrappedTF1.h
index 2dc131385a78fa1e880a17c70ad08d3bba87c320..1a7c73221ba863fa7a257562b2abd666700da40b 100644
--- a/hist/hist/inc/Math/WrappedTF1.h
+++ b/hist/hist/inc/Math/WrappedTF1.h
@@ -14,13 +14,9 @@
#define ROOT_Math_WrappedTF1
-#ifndef ROOT_Math_IParamFunction
#include "Math/IParamFunction.h"
-#endif
-#ifndef ROOT_TF1
#include "TF1.h"
-#endif
namespace ROOT {
diff --git a/hist/hist/inc/TAxis.h b/hist/hist/inc/TAxis.h
index 513f60c77d2eafe23e0fcd9a252d789c1e690377..eb0a1f9b9ca20cd3162d51f4cd2a9e7470085d5d 100644
--- a/hist/hist/inc/TAxis.h
+++ b/hist/hist/inc/TAxis.h
@@ -21,15 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttAxis
#include "TAttAxis.h"
-#endif
-#ifndef ROOT_TArrayD
#include "TArrayD.h"
-#endif
class THashList;
diff --git a/hist/hist/inc/TAxisModLab.h b/hist/hist/inc/TAxisModLab.h
index 26faf0dafe25387e0e264f68bd0368f6e3bd7b58..0394b7d4169e58d1b94a15ff820b09ca996a45d9 100644
--- a/hist/hist/inc/TAxisModLab.h
+++ b/hist/hist/inc/TAxisModLab.h
@@ -12,17 +12,11 @@
#ifndef ROOT_TAxisModLab
#define ROOT_TAxisModLab
-#ifndef ROOT_TAttText
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TAxisModLab : public TObject, public TAttText {
diff --git a/hist/hist/inc/TBackCompFitter.h b/hist/hist/inc/TBackCompFitter.h
index 5ab02f838cd07f07de94a8a74bd5de42d7dba6ed..aa65d245890184285ae63e28a9ce6d30a059cb39 100644
--- a/hist/hist/inc/TBackCompFitter.h
+++ b/hist/hist/inc/TBackCompFitter.h
@@ -10,24 +10,16 @@
#ifndef ROOT_TBackCompFitter_H_
#define ROOT_TBackCompFitter_H_
-#ifndef ROOT_TVirtualFitter
#include "TVirtualFitter.h"
-#endif
#include "Fit/BasicFCN.h"
#include "Fit/FitResult.h"
-#ifndef ROOT_Fit_Fitter
#include "Fit/Fitter.h"
-#endif
-#ifndef ROOT_Fit_DataVector
#include "Fit/DataVector.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
diff --git a/hist/hist/inc/TBinomialEfficiencyFitter.h b/hist/hist/inc/TBinomialEfficiencyFitter.h
index 8283d43468b804de053af27c86274ecb50b7093f..5d1f5448ff9459be41a131856900ea82bf848f7a 100644
--- a/hist/hist/inc/TBinomialEfficiencyFitter.h
+++ b/hist/hist/inc/TBinomialEfficiencyFitter.h
@@ -24,13 +24,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TFitResultPtr
#include "TFitResultPtr.h"
-#endif
diff --git a/hist/hist/inc/TConfidenceLevel.h b/hist/hist/inc/TConfidenceLevel.h
index 1f1b48a1cdcd3099dbbe34ebbab634153bb2ff0e..60b250cbfc5f83bfbbdc291e4c99cf4e37fed753 100644
--- a/hist/hist/inc/TConfidenceLevel.h
+++ b/hist/hist/inc/TConfidenceLevel.h
@@ -4,9 +4,7 @@
#ifndef ROOT_TConfidenceLevel
#define ROOT_TConfidenceLevel
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
//____________________________________________________________________
//
diff --git a/hist/hist/inc/TEfficiency.h b/hist/hist/inc/TEfficiency.h
index faf13635ada504f44773ebba16572c5f6673de4b..5130cb6e5f1acad23f1639f8dcdcac1221df9b0a 100644
--- a/hist/hist/inc/TEfficiency.h
+++ b/hist/hist/inc/TEfficiency.h
@@ -6,21 +6,13 @@
#include <utility>
//ROOT header
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
class TCollection;
class TF1;
diff --git a/hist/hist/inc/TF1.h b/hist/hist/inc/TF1.h
index 66ff2f9590970948ff56a33bd7aabfc48397dfb9..d2d96f5965320d66d7fdea3e976430d556be5636 100644
--- a/hist/hist/inc/TF1.h
+++ b/hist/hist/inc/TF1.h
@@ -25,22 +25,12 @@
#include "RConfigure.h"
-#ifndef ROOT_TFormula
#include "TFormula.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
-#ifndef ROOT_Math_ParamFunctor
#include "Math/ParamFunctor.h"
-#endif
class TF1;
class TH1;
diff --git a/hist/hist/inc/TF12.h b/hist/hist/inc/TF12.h
index 08e057eb8e3ce6ffaf40aa530dab1dacfed90b74..c26aa81307d9166649698cdb79634a3388a05317 100644
--- a/hist/hist/inc/TF12.h
+++ b/hist/hist/inc/TF12.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TF2
#include "TF2.h"
-#endif
class TF12 : public TF1 {
diff --git a/hist/hist/inc/TF2.h b/hist/hist/inc/TF2.h
index 17cc762a4b78e18733ff7a82515bbe8f2d26e01c..039f2d78657b7dfd8ee4275e620fff8d2e3f5b82 100644
--- a/hist/hist/inc/TF2.h
+++ b/hist/hist/inc/TF2.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TF1
#include "TF1.h"
-#endif
-#ifndef ROOT_TArrayD
#include "TArrayD.h"
-#endif
class TF2 : public TF1 {
diff --git a/hist/hist/inc/TF3.h b/hist/hist/inc/TF3.h
index d5424b6e00cbe3b422a7b795ea053453f25d4386..3cf272e7d86800092bea159fe59be2547e542db5 100644
--- a/hist/hist/inc/TF3.h
+++ b/hist/hist/inc/TF3.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TF2
#include "TF2.h"
-#endif
class TF3 : public TF2 {
diff --git a/hist/hist/inc/TFitResult.h b/hist/hist/inc/TFitResult.h
index 436fc8d9c39855d842f691ab1395720e6d2b0609..d50a9eb48cf83fedb2c8efb2d69416ba608a5be4 100644
--- a/hist/hist/inc/TFitResult.h
+++ b/hist/hist/inc/TFitResult.h
@@ -21,17 +21,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_FIT_FitResult
#include "Fit/FitResult.h"
-#endif
-#ifndef ROOT_TMatrixDSym
#include "TMatrixDSym.h"
-#endif
class TFitResult:public TNamed, public ROOT::Fit::FitResult {
diff --git a/hist/hist/inc/TFitResultPtr.h b/hist/hist/inc/TFitResultPtr.h
index 50f22a27c18634cdbdba96e352c1cc7ee9e3c5c7..aea45caeda1c9e8014d74add1c02cce45f65c484 100644
--- a/hist/hist/inc/TFitResultPtr.h
+++ b/hist/hist/inc/TFitResultPtr.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TFitResult;
diff --git a/hist/hist/inc/TFormula.h b/hist/hist/inc/TFormula.h
index ccf00c2db9f28a4720102aba572acfe84a482508..2c2e7c752afb9171b022cea086a31622e69ba7bf 100644
--- a/hist/hist/inc/TFormula.h
+++ b/hist/hist/inc/TFormula.h
@@ -14,15 +14,9 @@
#define ROOT_TFormula
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
- #ifndef ROOT_TBits
-#include "TBits.h"
-#endif
-#ifndef ROOT_TObjArray
+ #include "TBits.h"
#include "TObjArray.h"
-#endif
#include "TMethodCall.h"
#include "TInterpreter.h"
#include <vector>
diff --git a/hist/hist/inc/TFractionFitter.h b/hist/hist/inc/TFractionFitter.h
index 1d00f3293fa613d7d3d4902e86024f5bfdcb37a2..40a198c1b50c45e7571076272270ce7d2c62dba2 100644
--- a/hist/hist/inc/TFractionFitter.h
+++ b/hist/hist/inc/TFractionFitter.h
@@ -12,9 +12,7 @@
# include "TObjArray.h"
#endif
-#ifndef ROOT_TFitResultPtr
#include "TFitResultPtr.h"
-#endif
#include <vector>
diff --git a/hist/hist/inc/TGraph.h b/hist/hist/inc/TGraph.h
index f1905332991513d206d3d1f1655cded3ff1931c7..e24cc5466d9f6bf1bf6302286a824e7557ca4200 100644
--- a/hist/hist/inc/TGraph.h
+++ b/hist/hist/inc/TGraph.h
@@ -21,24 +21,12 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
-#ifndef ROOT_TVectorFfwd
#include "TVectorFfwd.h"
-#endif
-#ifndef ROOT_TVectorDfwd
#include "TVectorDfwd.h"
-#endif
class TBrowser;
class TAxis;
diff --git a/hist/hist/inc/TGraph2D.h b/hist/hist/inc/TGraph2D.h
index 226c13679576d9050914ae14112f3283dc6f9c18..2b53f2c187e2a72f1ead0a37b1cc5ec3140eb2e3 100644
--- a/hist/hist/inc/TGraph2D.h
+++ b/hist/hist/inc/TGraph2D.h
@@ -21,21 +21,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TVirtualHistPainter
#include "TVirtualHistPainter.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
class TAxis;
class TList;
diff --git a/hist/hist/inc/TGraph2DErrors.h b/hist/hist/inc/TGraph2DErrors.h
index 332073dada940944018dfc027a28b4f33ce3bb41..ffd1405d7276d03a1bbe38b2af91ce2bb4f6e083 100644
--- a/hist/hist/inc/TGraph2DErrors.h
+++ b/hist/hist/inc/TGraph2DErrors.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGraph2D
#include "TGraph2D.h"
-#endif
class TGraph2DErrors : public TGraph2D {
diff --git a/hist/hist/inc/TGraphAsymmErrors.h b/hist/hist/inc/TGraphAsymmErrors.h
index b750be17e5584966d664baee9c216f473a1bd630..ed98d8b896d4d8b30fa4b8b8046b351e2c0aa967 100644
--- a/hist/hist/inc/TGraphAsymmErrors.h
+++ b/hist/hist/inc/TGraphAsymmErrors.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGraph
#include "TGraph.h"
-#endif
class TGraphAsymmErrors : public TGraph {
diff --git a/hist/hist/inc/TGraphBentErrors.h b/hist/hist/inc/TGraphBentErrors.h
index 200229153e66ad67dcac984de9f084f49fd710dc..cb917bb7113a5138ab0108747d08ccd8edc03aa8 100644
--- a/hist/hist/inc/TGraphBentErrors.h
+++ b/hist/hist/inc/TGraphBentErrors.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGraph
#include "TGraph.h"
-#endif
class TGraphBentErrors : public TGraph {
diff --git a/hist/hist/inc/TGraphDelaunay.h b/hist/hist/inc/TGraphDelaunay.h
index 84f577d4f171ded517347b5359dce7504f102937..7f16c899802474ee39cc775cc718073aca992842 100644
--- a/hist/hist/inc/TGraphDelaunay.h
+++ b/hist/hist/inc/TGraphDelaunay.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TGraph2D;
class TView;
diff --git a/hist/hist/inc/TGraphDelaunay2D.h b/hist/hist/inc/TGraphDelaunay2D.h
index c6b2f389182db65b175fae128d0917a7289b3896..8c3a6d1fcd4484c62a056b3c8e2fa16de9b10fdb 100644
--- a/hist/hist/inc/TGraphDelaunay2D.h
+++ b/hist/hist/inc/TGraphDelaunay2D.h
@@ -22,13 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_Math_Delaunay2D
#include "Math/Delaunay2D.h"
-#endif
class TGraph2D;
class TView;
diff --git a/hist/hist/inc/TGraphErrors.h b/hist/hist/inc/TGraphErrors.h
index 7867f38733b6405c378aae5d31cd7207d660703f..b2f88845578075b71b23d7f3d5e4a961906a7f9f 100644
--- a/hist/hist/inc/TGraphErrors.h
+++ b/hist/hist/inc/TGraphErrors.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGraph
#include "TGraph.h"
-#endif
class TGraphErrors : public TGraph {
diff --git a/hist/hist/inc/TGraphSmooth.h b/hist/hist/inc/TGraphSmooth.h
index 73ac5d87065dba8c719b22c8783306c4b093a077..b387c086e1abab05a9a0cff11d842aeecf86e07c 100644
--- a/hist/hist/inc/TGraphSmooth.h
+++ b/hist/hist/inc/TGraphSmooth.h
@@ -30,9 +30,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGraph
#include "TGraph.h"
-#endif
class TGraphSmooth: public TNamed {
diff --git a/hist/hist/inc/TGraphTime.h b/hist/hist/inc/TGraphTime.h
index 4215a86ea873e33d53fa969487b99e5839c5ca28..b3ec03f50dff39833be43f9b533ae54b4224d8ae 100644
--- a/hist/hist/inc/TGraphTime.h
+++ b/hist/hist/inc/TGraphTime.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TH1;
class TObjArray;
diff --git a/hist/hist/inc/TH1.h b/hist/hist/inc/TH1.h
index c470be280f2fd6d9e08e0220a4a70f31944c392d..05437fec36d9d03b535b727a6c13dd663c8a977d 100644
--- a/hist/hist/inc/TH1.h
+++ b/hist/hist/inc/TH1.h
@@ -21,49 +21,25 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TAxis
#include "TAxis.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
-#ifndef ROOT_TArrayC
#include "TArrayC.h"
-#endif
-#ifndef ROOT_TArrayS
#include "TArrayS.h"
-#endif
-#ifndef ROOT_TArrayI
#include "TArrayI.h"
-#endif
-#ifndef ROOT_TArrayF
#include "TArrayF.h"
-#endif
-#ifndef ROOT_TArrayD
#include "TArrayD.h"
-#endif
#include "Foption.h"
-#ifndef ROOT_TVectorFfwd
#include "TVectorFfwd.h"
-#endif
-#ifndef ROOT_TVectorDfwd
#include "TVectorDfwd.h"
-#endif
-#ifndef ROOT_TFitResultPtr
#include "TFitResultPtr.h"
-#endif
#include <float.h>
diff --git a/hist/hist/inc/TH1C.h b/hist/hist/inc/TH1C.h
index 1564fa81c1b25493be9e895de952a8a1ad68f239..116d97c1a069fa11163e080dad2b14591c60b3f4 100644
--- a/hist/hist/inc/TH1C.h
+++ b/hist/hist/inc/TH1C.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH1D.h b/hist/hist/inc/TH1D.h
index 20775b22c2f66794d9b9eeb742c9fd95b8d84ef7..c9cdd43ab2957794f5d245b2d06e0005518ee4c6 100644
--- a/hist/hist/inc/TH1D.h
+++ b/hist/hist/inc/TH1D.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH1F.h b/hist/hist/inc/TH1F.h
index 47325954cd44e8b82bbb208ea02136d9ab09d994..dd50542d6f44ce9c9c75312283fe5f991822d99e 100644
--- a/hist/hist/inc/TH1F.h
+++ b/hist/hist/inc/TH1F.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH1I.h b/hist/hist/inc/TH1I.h
index 1cef3ed7c751d69c18fa1b8a62f8fcd799df327f..a671b2bd80ab7da931cbfa0fa6099428a4d40b51 100644
--- a/hist/hist/inc/TH1I.h
+++ b/hist/hist/inc/TH1I.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH1S.h b/hist/hist/inc/TH1S.h
index 0a736f924889096742140e6655f9cd91d6752f09..456d5f602a81d433ee596623a79d36736abe675a 100644
--- a/hist/hist/inc/TH1S.h
+++ b/hist/hist/inc/TH1S.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH2.h b/hist/hist/inc/TH2.h
index 8f0655f0ab93e11e50ef8f9f758ff28626fc16eb..644bc005b469cbd306e1ef3af4a0c9dc4257b6e1 100644
--- a/hist/hist/inc/TH2.h
+++ b/hist/hist/inc/TH2.h
@@ -21,15 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
-#ifndef ROOT_TMatrixFBasefwd
#include "TMatrixFBasefwd.h"
-#endif
-#ifndef ROOT_TMatrixDBasefwd
#include "TMatrixDBasefwd.h"
-#endif
class TProfile;
diff --git a/hist/hist/inc/TH2C.h b/hist/hist/inc/TH2C.h
index 4f708fbdda53981c1bb8c7a94388cf01b862cfdf..aeb0c3c66c335766c42dd9229d5bab0fced95407 100644
--- a/hist/hist/inc/TH2C.h
+++ b/hist/hist/inc/TH2C.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH2D.h b/hist/hist/inc/TH2D.h
index c0ead60d5741d9cd2dac892fe444b92d3094ba25..7c1935d49b4433763216dd92ec0e9bcf35145c9d 100644
--- a/hist/hist/inc/TH2D.h
+++ b/hist/hist/inc/TH2D.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH2F.h b/hist/hist/inc/TH2F.h
index 742c87f1c765bc82c1760ca4b86bdd73f555a6e2..0151caceb9f6f30dadf4f0617aa00403864aa5eb 100644
--- a/hist/hist/inc/TH2F.h
+++ b/hist/hist/inc/TH2F.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH2I.h b/hist/hist/inc/TH2I.h
index 7fce5c8178785c50388fab90ccc087beafc49c69..3785b6290e99bef5043e3b79edad9a21e0894da0 100644
--- a/hist/hist/inc/TH2I.h
+++ b/hist/hist/inc/TH2I.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH2Poly.h b/hist/hist/inc/TH2Poly.h
index 6b8d8352fb281b3e16941389b4c2cb61441f7476..a7e2ea0ac3b22fa5cad9b1c1033b56703768eb57 100644
--- a/hist/hist/inc/TH2Poly.h
+++ b/hist/hist/inc/TH2Poly.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
class TH2PolyBin: public TObject{
diff --git a/hist/hist/inc/TH2S.h b/hist/hist/inc/TH2S.h
index d69cffc03d02b2eb8d8ed376f64b356a3d68e82c..02b5c688eb91f0684e341ea241c1eeeee4f924df 100644
--- a/hist/hist/inc/TH2S.h
+++ b/hist/hist/inc/TH2S.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH3.h b/hist/hist/inc/TH3.h
index 752bac06997800d2918978712bd14c73faffd25c..2f82a0bc1d2f17a3e49ed3a6682bef9539e0a786 100644
--- a/hist/hist/inc/TH3.h
+++ b/hist/hist/inc/TH3.h
@@ -21,13 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
-#ifndef ROOT_TAtt3D
#include "TAtt3D.h"
-#endif
class TH2D;
class TProfile2D;
diff --git a/hist/hist/inc/TH3C.h b/hist/hist/inc/TH3C.h
index 14bbf0076789d537e6f560f5526a023c4f5dc001..d508deb791fe75e1120ce3b8271d10c68ac4a0d6 100644
--- a/hist/hist/inc/TH3C.h
+++ b/hist/hist/inc/TH3C.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH3
#include "TH3.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH3D.h b/hist/hist/inc/TH3D.h
index 34f1eb0a268367c98f5ccbeb32c1e56232447e0e..732ab287d6357e7297748be7758c5903b4a33326 100644
--- a/hist/hist/inc/TH3D.h
+++ b/hist/hist/inc/TH3D.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH3
#include "TH3.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH3F.h b/hist/hist/inc/TH3F.h
index 259778f35596bd420642932c765954f3164a59d5..ca728ea3ef1e6301555fd90be3a2ff75117e1fd1 100644
--- a/hist/hist/inc/TH3F.h
+++ b/hist/hist/inc/TH3F.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH3
#include "TH3.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH3I.h b/hist/hist/inc/TH3I.h
index 5a727bc35d58e01b00a0fa48e7bb603b1b5d57ef..ba44c83af77691bf0c1d111da210dabe7ed75f2b 100644
--- a/hist/hist/inc/TH3I.h
+++ b/hist/hist/inc/TH3I.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH3
#include "TH3.h"
-#endif
#endif
diff --git a/hist/hist/inc/TH3S.h b/hist/hist/inc/TH3S.h
index de6869f8fe08b0d7d2b8b99213af0173589ad603..a720111275c59318aa0fbe9528f925d5a6055fce 100644
--- a/hist/hist/inc/TH3S.h
+++ b/hist/hist/inc/TH3S.h
@@ -21,8 +21,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH3
#include "TH3.h"
-#endif
#endif
diff --git a/hist/hist/inc/THLimitsFinder.h b/hist/hist/inc/THLimitsFinder.h
index 162932cb02ea9d025e6fda012a88474d7827594c..f1489e4eded70d810f911c05cf6a47f24a9699fa 100644
--- a/hist/hist/inc/THLimitsFinder.h
+++ b/hist/hist/inc/THLimitsFinder.h
@@ -21,9 +21,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TH1;
diff --git a/hist/hist/inc/THStack.h b/hist/hist/inc/THStack.h
index d7b5f9bb27539a83d84e39a072bbd6354239ef56..6216052a6cdacad52f9e63e924bcc50c356bbb6a 100644
--- a/hist/hist/inc/THStack.h
+++ b/hist/hist/inc/THStack.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
class TBrowser;
diff --git a/hist/hist/inc/THn.h b/hist/hist/inc/THn.h
index faccf830d160e468e66ae47185f8b3f6fc2246c3..ec2381fb820da42a94d16ac0af2846c43daafe40 100644
--- a/hist/hist/inc/THn.h
+++ b/hist/hist/inc/THn.h
@@ -12,29 +12,17 @@
#ifndef ROOT_THN
#define ROOT_THN
-#ifndef ROOT_THnBase
#include "THnBase.h"
-#endif
-#ifndef ROOT_TNDArray
#include "TNDArray.h"
-#endif
-#ifndef ROOT_TArrayD
#include "TArrayD.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TAxis
#include "TAxis.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
class TH1;
class TH1D;
diff --git a/hist/hist/inc/THnBase.h b/hist/hist/inc/THnBase.h
index db512ac40bf4eeee082320411761b9e9aa52259e..0b5475cdc4e739c7c5c2d0e40bf4e0350abdee11 100644
--- a/hist/hist/inc/THnBase.h
+++ b/hist/hist/inc/THnBase.h
@@ -20,21 +20,11 @@
*************************************************************************/
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
-#ifndef ROOT_TFitResultPtr
#include "TFitResultPtr.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TArrayD
#include "TArrayD.h"
-#endif
class TAxis;
class TH1;
diff --git a/hist/hist/inc/THnSparse.h b/hist/hist/inc/THnSparse.h
index fd4be16b626e63acb064291d31d2f43f4bef241c..5bef71740d5fbf800df2e450c25bc91364242270 100644
--- a/hist/hist/inc/THnSparse.h
+++ b/hist/hist/inc/THnSparse.h
@@ -20,32 +20,16 @@
*************************************************************************/
-#ifndef ROOT_THnBase
#include "THnBase.h"
-#endif
-#ifndef ROOT_TExMap
#include "TExMap.h"
-#endif
-#ifndef ROOT_THnSparse_Internal
#include "THnSparse_Internal.h"
-#endif
// needed only for template instantiations of THnSparseT:
-#ifndef ROOT_TArrayF
#include "TArrayF.h"
-#endif
-#ifndef ROOT_TArrayL
#include "TArrayL.h"
-#endif
-#ifndef ROOT_TArrayI
#include "TArrayI.h"
-#endif
-#ifndef ROOT_TArrayS
#include "TArrayS.h"
-#endif
-#ifndef ROOT_TArrayC
#include "TArrayC.h"
-#endif
class THnSparseCompactBinCoord;
diff --git a/hist/hist/inc/THnSparse_Internal.h b/hist/hist/inc/THnSparse_Internal.h
index bd851c25e98f9ca200d383aae02e786a3f4f88fa..d4898c0894e361878467a543df5360687ede10d6 100644
--- a/hist/hist/inc/THnSparse_Internal.h
+++ b/hist/hist/inc/THnSparse_Internal.h
@@ -19,9 +19,7 @@
* Implementation in THnSparse.cxx. *
*************************************************************************/
-#ifndef ROOT_TArrayD
#include "TArrayD.h"
-#endif
#include "TObject.h"
diff --git a/hist/hist/inc/TKDE.h b/hist/hist/inc/TKDE.h
index 20ab8e296ff5ca896e64b3536fadb032405a6fe1..76a240df25f77ff008d30f4a059fc97431ce87f1 100644
--- a/hist/hist/inc/TKDE.h
+++ b/hist/hist/inc/TKDE.h
@@ -11,17 +11,11 @@
#ifndef ROOT_TKDE
#define ROOT_TKDE
-#ifndef ROOT_Math_WrappedFunction
- #include "Math/WrappedFunction.h"
-#endif
+#include "Math/WrappedFunction.h"
-#ifndef ROOT_TNamed
- #include "TNamed.h"
-#endif
+#include "TNamed.h"
-#ifndef ROOT_Math_Math
#include "Math/Math.h"
-#endif
//#include "TF1.h"
class TGraphErrors;
diff --git a/hist/hist/inc/TLimit.h b/hist/hist/inc/TLimit.h
index a1cedaf07d3c4fde3bd3789f9c0d4fab7f2c47c7..40d6b1b74d8a88ab660126c1e6fe61af4574a648 100644
--- a/hist/hist/inc/TLimit.h
+++ b/hist/hist/inc/TLimit.h
@@ -4,9 +4,7 @@
#ifndef ROOT_TLimit
#define ROOT_TLimit
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
#include "TVectorDfwd.h"
diff --git a/hist/hist/inc/TLimitDataSource.h b/hist/hist/inc/TLimitDataSource.h
index 7e98130c23f95e3e5073b5ffe8813756eb92ecc1..1c03f189ef22a1121f293f0a34ebfdefb8480f29 100644
--- a/hist/hist/inc/TLimitDataSource.h
+++ b/hist/hist/inc/TLimitDataSource.h
@@ -4,9 +4,7 @@
#ifndef ROOT_TLimitDataSource
#define ROOT_TLimitDataSource
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
#include "TVectorDfwd.h"
diff --git a/hist/hist/inc/TMultiDimFit.h b/hist/hist/inc/TMultiDimFit.h
index dc7498a2404351f32b7c44497e06b5f9f1ae12f5..465ed89d0ca3c3b13ef43e01379f1d4b136bb64a 100644
--- a/hist/hist/inc/TMultiDimFit.h
+++ b/hist/hist/inc/TMultiDimFit.h
@@ -4,21 +4,11 @@
#ifndef ROOT_TMultiDimFit
#define ROOT_TMultiDimFit
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TVirtualFitter
#include "TVirtualFitter.h"
-#endif
class TBrowser;
diff --git a/hist/hist/inc/TMultiGraph.h b/hist/hist/inc/TMultiGraph.h
index 98d94c16a13ec3ecd7e953b67536bdd394ad5f6f..388bddf7037c8731a5c53af151a0ce890e0ab444 100644
--- a/hist/hist/inc/TMultiGraph.h
+++ b/hist/hist/inc/TMultiGraph.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
#include "TF1.h"
diff --git a/hist/hist/inc/TNDArray.h b/hist/hist/inc/TNDArray.h
index fb84ccc7e9915cc7c2642f978422b01ae19c6f73..728bb46f157508a4525ebc266b120546face2f78 100644
--- a/hist/hist/inc/TNDArray.h
+++ b/hist/hist/inc/TNDArray.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TNDArray
#define ROOT_TNDArray
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TError
#include "TError.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/hist/hist/inc/TPolyMarker.h b/hist/hist/inc/TPolyMarker.h
index 14b374ceb5d4748157c57e0a3b1a6bbd1c8ba83a..e6449b8fe055b4700feb1010909c884259eca0d6 100644
--- a/hist/hist/inc/TPolyMarker.h
+++ b/hist/hist/inc/TPolyMarker.h
@@ -22,15 +22,9 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TCollection;
diff --git a/hist/hist/inc/TPrincipal.h b/hist/hist/inc/TPrincipal.h
index bfaefebc732f1ada3dd5645900efa68ab57c988a..7bf18beabd53e4a5e2a13c377e2beeaf281cedce 100644
--- a/hist/hist/inc/TPrincipal.h
+++ b/hist/hist/inc/TPrincipal.h
@@ -12,18 +12,10 @@
#ifndef ROOT_TPrincipal
#define ROOT_TPrincipal
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TPrincipal : public TNamed {
diff --git a/hist/hist/inc/TProfile.h b/hist/hist/inc/TProfile.h
index 163f8c4bd6fecd5d4eb37a7c6bb5254c0608506f..0e66a32e8c47ddbe04b39e48de66cb059cdc87f3 100644
--- a/hist/hist/inc/TProfile.h
+++ b/hist/hist/inc/TProfile.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
class TProfileHelper;
diff --git a/hist/hist/inc/TProfile2D.h b/hist/hist/inc/TProfile2D.h
index a10b696b9bf038bc3fd5888912806bfe2598b49d..51cd690fd367da0f2a07a3f510988faa20745cdc 100644
--- a/hist/hist/inc/TProfile2D.h
+++ b/hist/hist/inc/TProfile2D.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
-#ifndef ROOT_TProfile
#include "TProfile.h"
-#endif
class TProfile2D : public TH2D {
diff --git a/hist/hist/inc/TProfile3D.h b/hist/hist/inc/TProfile3D.h
index 8818fae734adccf421f7194a9db95d2dfc561503..e7e1b47452eaf567991828b478b7dee57cb1eb89 100644
--- a/hist/hist/inc/TProfile3D.h
+++ b/hist/hist/inc/TProfile3D.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH3
#include "TH3.h"
-#endif
-#ifndef ROOT_TProfile
#include "TProfile.h"
-#endif
class TProfile3D : public TH3D {
diff --git a/hist/hist/inc/TSVDUnfold.h b/hist/hist/inc/TSVDUnfold.h
index 9760aaefdb48d99620b29ad4e0cdd59c12fb5a50..07d9a1d0219e2fcc0cfb1fd5ee5d2554aaf86627 100644
--- a/hist/hist/inc/TSVDUnfold.h
+++ b/hist/hist/inc/TSVDUnfold.h
@@ -35,18 +35,10 @@
#ifndef TSVDUNFOLD_H
#define TSVDUNFOLD_H
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
-#ifndef ROOT_TMatrixDSym
#include "TMatrixDSym.h"
-#endif
class TH1D;
class TH2D;
diff --git a/hist/hist/inc/TSpline.h b/hist/hist/inc/TSpline.h
index 5f2937118c241564df68b8ce5e244dcfc558bb98..e767545b07df6747239e95bb7bbb915bcc5bb0c4 100644
--- a/hist/hist/inc/TSpline.h
+++ b/hist/hist/inc/TSpline.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSpline
#define ROOT_TSpline
-#ifndef ROOT_TGraph
#include "TGraph.h"
-#endif
class TH1;
class TF1;
diff --git a/hist/hist/inc/TVirtualFitter.h b/hist/hist/inc/TVirtualFitter.h
index 962f513a6ccda9341a5c63b269b3f5ff67542bd2..72b1fb31a15a93b398b49f5af650358e70c107a2 100644
--- a/hist/hist/inc/TVirtualFitter.h
+++ b/hist/hist/inc/TVirtualFitter.h
@@ -21,12 +21,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TMethodCall
#include "TMethodCall.h"
-#endif
#include "Foption.h"
diff --git a/hist/hist/inc/TVirtualGraphPainter.h b/hist/hist/inc/TVirtualGraphPainter.h
index 30db22303920e2f19b8ce2949b7b0a5b3e595428..b40a1a3d440ebc2ff5c840eb9977b581a7b59445 100644
--- a/hist/hist/inc/TVirtualGraphPainter.h
+++ b/hist/hist/inc/TVirtualGraphPainter.h
@@ -19,9 +19,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TGraph;
class TF1;
diff --git a/hist/hist/inc/TVirtualHistPainter.h b/hist/hist/inc/TVirtualHistPainter.h
index 475221d817ae8b61b173987688e386065febff5d..62134605e396efdf7e1a8ce325941bda344a296b 100644
--- a/hist/hist/inc/TVirtualHistPainter.h
+++ b/hist/hist/inc/TVirtualHistPainter.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TClass;
class TH1;
diff --git a/hist/hist/inc/v5/TF1Data.h b/hist/hist/inc/v5/TF1Data.h
index d82bbcdcfd49e9b5301b3723cdd3ce4d3354e130..55edd48ac5628a0a2c0005ccc34aadcd580c9f54 100644
--- a/hist/hist/inc/v5/TF1Data.h
+++ b/hist/hist/inc/v5/TF1Data.h
@@ -25,18 +25,10 @@
#include "RConfigure.h"
-#ifndef ROOT_v5_TFormula
#include "v5/TFormula.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
namespace ROOT {
diff --git a/hist/hist/inc/v5/TFormula.h b/hist/hist/inc/v5/TFormula.h
index eb4ff7b0ed4b320579cd93423e0817f56eb21552..418f745e5f089e8494dbd405d1bcdda95a39ed4f 100644
--- a/hist/hist/inc/v5/TFormula.h
+++ b/hist/hist/inc/v5/TFormula.h
@@ -23,15 +23,9 @@
// mantained for backward compatibility and TTree usage //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TBits
#include "TBits.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
const Int_t kMAXFOUND = 500;
diff --git a/hist/hist/inc/v5/TFormulaPrimitive.h b/hist/hist/inc/v5/TFormulaPrimitive.h
index 7f83625e41fb09aca871656ea865e0c1c048eb8b..4156bff34cf95af5e001b22a0061e27c9d2ed954 100644
--- a/hist/hist/inc/v5/TFormulaPrimitive.h
+++ b/hist/hist/inc/v5/TFormulaPrimitive.h
@@ -23,15 +23,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TBits
#include "TBits.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
namespace ROOT {
diff --git a/hist/histpainter/inc/Hparam.h b/hist/histpainter/inc/Hparam.h
index 4f0f762c8f41bbf961e2642bf9ca0dd00aac7536..90f41264dd7f25c9a5e3481dc9e45034f8bf89b2 100644
--- a/hist/histpainter/inc/Hparam.h
+++ b/hist/histpainter/inc/Hparam.h
@@ -21,9 +21,7 @@ Used internally by `THistpainter` to manage histogram parameters.
*/
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
typedef struct Hparam_t {
Double_t xbinsize; ///< bin size in case of equidistant bins
diff --git a/hist/histpainter/inc/TGraph2DPainter.h b/hist/histpainter/inc/TGraph2DPainter.h
index d3bead83d4700247494f85a2dbd64e53f70413f8..7c9ebad5a72fe7d4b23b4b06e6e1135814d12e87 100644
--- a/hist/histpainter/inc/TGraph2DPainter.h
+++ b/hist/histpainter/inc/TGraph2DPainter.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Object
#include "TObject.h"
-#endif
class TGraph2D;
class TGraphDelaunay;
diff --git a/hist/histpainter/inc/THistPainter.h b/hist/histpainter/inc/THistPainter.h
index c35c48707a3459c1423197ea45b17e9467985954..85c435ffcb9859174ad6705ae3554bb6f4a9be19 100644
--- a/hist/histpainter/inc/THistPainter.h
+++ b/hist/histpainter/inc/THistPainter.h
@@ -21,12 +21,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualHistPainter
#include "TVirtualHistPainter.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#include <vector>
#include <utility>
diff --git a/hist/histpainter/inc/TPainter3dAlgorithms.h b/hist/histpainter/inc/TPainter3dAlgorithms.h
index 114e875a3009cd3f1b0b2694cdc2d396b9ddfe25..cd58c24d690b67cb1999e437e72a81e5adf4a741 100644
--- a/hist/histpainter/inc/TPainter3dAlgorithms.h
+++ b/hist/histpainter/inc/TPainter3dAlgorithms.h
@@ -12,17 +12,11 @@
#ifndef ROOT_TPainter3dAlgorithms
#define ROOT_TPainter3dAlgorithms
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
const Int_t kCARTESIAN = 1;
const Int_t kPOLAR = 2;
diff --git a/hist/histpainter/inc/TPaletteAxis.h b/hist/histpainter/inc/TPaletteAxis.h
index 7cb30ce0c52291d8917e1234d22e324ab969a8a2..d0b6e32676803437dd30f422568c9f08d4b8791f 100644
--- a/hist/histpainter/inc/TPaletteAxis.h
+++ b/hist/histpainter/inc/TPaletteAxis.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TPave
#include "TPave.h"
-#endif
-#ifndef ROOT_TGaxis
#include "TGaxis.h"
-#endif
class TH1;
diff --git a/hist/spectrum/inc/TSpectrum.h b/hist/spectrum/inc/TSpectrum.h
index a43b4dedaee82768c4a005ace3b006f1fb2a1469..e31d4af768784a3d315b7bda122ebac24ddce720 100644
--- a/hist/spectrum/inc/TSpectrum.h
+++ b/hist/spectrum/inc/TSpectrum.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TSpectrum
#define ROOT_TSpectrum
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TH1;
diff --git a/hist/spectrum/inc/TSpectrum2.h b/hist/spectrum/inc/TSpectrum2.h
index 5dc6647c432b0deaece0516d8c52b76cce76ba3c..5337e42b89fd872e2d19d33a42bd66698dd9d5dc 100644
--- a/hist/spectrum/inc/TSpectrum2.h
+++ b/hist/spectrum/inc/TSpectrum2.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TSpectrum2
#define ROOT_TSpectrum2
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TH1;
diff --git a/hist/spectrum/inc/TSpectrum2Fit.h b/hist/spectrum/inc/TSpectrum2Fit.h
index dfb31a3f0855d7b99462c74cdd9aa5dd23cbf376..34a32f67fb7b9c4ffb733a892d604a645937c201 100644
--- a/hist/spectrum/inc/TSpectrum2Fit.h
+++ b/hist/spectrum/inc/TSpectrum2Fit.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TSpectrum2Fit
#define ROOT_TSpectrum2Fit
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TSpectrum2Fit : public TNamed {
protected:
diff --git a/hist/spectrum/inc/TSpectrum2Transform.h b/hist/spectrum/inc/TSpectrum2Transform.h
index 872135a762d7243f9e922fadbd476cf3cd6e5456..5672590941180f54725f8cff566a4ac3b246a0f2 100644
--- a/hist/spectrum/inc/TSpectrum2Transform.h
+++ b/hist/spectrum/inc/TSpectrum2Transform.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TSpectrum2Transform
#define ROOT_TSpectrum2Transform
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TSpectrum2Transform : public TObject {
protected:
diff --git a/hist/spectrum/inc/TSpectrum3.h b/hist/spectrum/inc/TSpectrum3.h
index 75f5a64e689e47da6fea03fa6888c54e61387c16..b9b3177f2d4d3e413d20a3817d8bc6b6404bce33 100644
--- a/hist/spectrum/inc/TSpectrum3.h
+++ b/hist/spectrum/inc/TSpectrum3.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TSpectrum3
#define ROOT_TSpectrum3
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TH1;
diff --git a/hist/spectrum/inc/TSpectrumFit.h b/hist/spectrum/inc/TSpectrumFit.h
index 758bd9b7e3213b8a75205cd2e205d78948608aa1..b7fdc95b6b1239889667b982af0dfeb45bf2bddf 100644
--- a/hist/spectrum/inc/TSpectrumFit.h
+++ b/hist/spectrum/inc/TSpectrumFit.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TSpectrumFit
#define ROOT_TSpectrumFit
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TH1;
diff --git a/hist/spectrum/inc/TSpectrumTransform.h b/hist/spectrum/inc/TSpectrumTransform.h
index 75cf5609d4a01c687356fc992686411831fb42f6..1af67ceaa026f8b498192dac88ca769531a84301 100644
--- a/hist/spectrum/inc/TSpectrumTransform.h
+++ b/hist/spectrum/inc/TSpectrumTransform.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TSpectrumTransform
#define ROOT_TSpectrumTransform
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TH1;
diff --git a/hist/spectrumpainter/inc/TSpectrum2Painter.h b/hist/spectrumpainter/inc/TSpectrum2Painter.h
index 65943b4055b7319fd5d0eb9ba6f92cef7e658649..a510a7d1141fd30e016edfdd454837eccf35089f 100644
--- a/hist/spectrumpainter/inc/TSpectrum2Painter.h
+++ b/hist/spectrumpainter/inc/TSpectrum2Painter.h
@@ -13,9 +13,7 @@
#define ROOT_TSpectrum2Painter
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TH2;
class TLine;
diff --git a/html/inc/TClassDocOutput.h b/html/inc/TClassDocOutput.h
index 87585ef7b0eba6ee18d0f8665d3acd4d76cde568..a9752ae4e10ffadbd355ba78f0a7e052d9d17d6e 100644
--- a/html/inc/TClassDocOutput.h
+++ b/html/inc/TClassDocOutput.h
@@ -13,9 +13,7 @@
#define ROOT_TClassDocOutput
#include "Rtypes.h"
-#ifndef ROOT_TDocOutput
#include "TDocOutput.h"
-#endif
class TDocParser;
class TDocMethodWrapper;
diff --git a/html/inc/TDocDirective.h b/html/inc/TDocDirective.h
index cb06a0fed09f5d08206c40d1d521bd0b4d2120d8..e6f9a9de1e9c0e4b99432f3846de810aa5a2bef1 100644
--- a/html/inc/TDocDirective.h
+++ b/html/inc/TDocDirective.h
@@ -20,9 +20,7 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TClass;
diff --git a/html/inc/TDocInfo.h b/html/inc/TDocInfo.h
index a752c5356d686650277cbd7d7d9450d68b07523d..2212e24426783746a0190e76b67995ea6fcf8611 100644
--- a/html/inc/TDocInfo.h
+++ b/html/inc/TDocInfo.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TDocInfo
#define ROOT_TDocInfo
-#ifndef ROOT_TClass
#include "TClass.h"
-#endif
-#ifndef ROOT_THashList
#include "THashList.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
#include <string>
#include <set>
diff --git a/html/inc/TDocOutput.h b/html/inc/TDocOutput.h
index e152b557e2e8a424d6bd429d1cd57dd4663d77f7..b7e454654f105b564c87107003fa036bf01be3fa 100644
--- a/html/inc/TDocOutput.h
+++ b/html/inc/TDocOutput.h
@@ -21,12 +21,8 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TDocParser
#include "TDocParser.h"
-#endif
class TClass;
class TDataMember;
diff --git a/html/inc/TDocParser.h b/html/inc/TDocParser.h
index 915c2ecf335fb37ed65465765e7ec3dfbdafc757..3c8c89cb8da36438e383e9aba869cbf176c84be6 100644
--- a/html/inc/TDocParser.h
+++ b/html/inc/TDocParser.h
@@ -24,15 +24,9 @@
#include <set>
#include <map>
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_THashList
#include "THashList.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TBaseClass;
class TClass;
diff --git a/html/inc/THtml.h b/html/inc/THtml.h
index 25079acd5be84992777495742cc6737883c10d1c..60a07daeb72daf5ddd468fb136ab974727979cf8 100644
--- a/html/inc/THtml.h
+++ b/html/inc/THtml.h
@@ -22,17 +22,11 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_THashList
#include "THashList.h"
-#endif
-#ifndef ROOT_THashTable
#include "THashTable.h"
-#endif
-#ifndef ROOT_TExMap
#include "TExMap.h"
-#endif
#include <map>
diff --git a/io/castor/inc/TCastorFile.h b/io/castor/inc/TCastorFile.h
index 58c5d098cad4317b56f9f3b96df03366b1deeae4..3864ec30dcdb874d3f04fefe9e5f91d8661605e9 100644
--- a/io/castor/inc/TCastorFile.h
+++ b/io/castor/inc/TCastorFile.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TCastorFile
#define ROOT_TCastorFile
-#ifndef ROOT_TNetFile
#include "TNetFile.h"
-#endif
class TCastorFile : public TNetFile {
diff --git a/io/chirp/inc/TChirpFile.h b/io/chirp/inc/TChirpFile.h
index 75664c13f1ab07b4d4cf5bf6a246044a928316a3..74dfdfcdce76c1ba280ad699571931d055d58732 100644
--- a/io/chirp/inc/TChirpFile.h
+++ b/io/chirp/inc/TChirpFile.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TChirpFile
#define ROOT_TChirpFile
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
class TChirpFile:public TFile {
private:
diff --git a/io/dcache/inc/TDCacheFile.h b/io/dcache/inc/TDCacheFile.h
index bc331af8f2dcee734e65c2d3796f02d859e1a70b..6d2008efa81dc3c9d3706d15ffd3ef41f7154430 100644
--- a/io/dcache/inc/TDCacheFile.h
+++ b/io/dcache/inc/TDCacheFile.h
@@ -14,15 +14,9 @@
#ifndef ROOT_TDCacheFile
#define ROOT_TDCacheFile
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#include <sys/stat.h>
diff --git a/io/gfal/inc/TGFALFile.h b/io/gfal/inc/TGFALFile.h
index beefb9de5ac13872db73fe24da6d04138d9ef546..10f0dda3d18bf019f9de53ac5128b11b43aaeed9 100644
--- a/io/gfal/inc/TGFALFile.h
+++ b/io/gfal/inc/TGFALFile.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TGFALFile
#define ROOT_TGFALFile
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
class TGFALFile : public TFile {
diff --git a/io/hdfs/inc/THDFSFile.h b/io/hdfs/inc/THDFSFile.h
index bce5298c2df3a30645d40dd5c26d70eacfecbb30..46690208a5a5bef68dd7cfe0dfb86c7f7d4ea320 100644
--- a/io/hdfs/inc/THDFSFile.h
+++ b/io/hdfs/inc/THDFSFile.h
@@ -12,13 +12,9 @@
#ifndef ROOT_THDFSFile
#define ROOT_THDFSFile
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
class THDFSFile : public TFile {
diff --git a/io/io/inc/TArchiveFile.h b/io/io/inc/TArchiveFile.h
index 751a0b0811e45b4c68aba95cc24ba37fd5e1b763..44a3954d2a92d5a4f3fe3884aa0ec90d1a3ffb9b 100644
--- a/io/io/inc/TArchiveFile.h
+++ b/io/io/inc/TArchiveFile.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TArchiveFile
#define ROOT_TArchiveFile
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TDatime
#include "TDatime.h"
-#endif
class TFile;
class TArchiveMember;
diff --git a/io/io/inc/TBufferFile.h b/io/io/inc/TBufferFile.h
index 3692e9604ebbf955960b671dbb1eb34c6d577e54..5ac88d3e00c50eb6d35fa0af2185bde65845d0f0 100644
--- a/io/io/inc/TBufferFile.h
+++ b/io/io/inc/TBufferFile.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBuffer
#include "TBuffer.h"
-#endif
-#ifndef ROOT_Bytes
#include "Bytes.h"
-#endif
#include <vector>
diff --git a/io/io/inc/TBufferJSON.h b/io/io/inc/TBufferJSON.h
index f6245217a9e62b07854089ac53183d89dbc4dda3..11d8a8b61866a552716fb8986167199484ca21bf 100644
--- a/io/io/inc/TBufferJSON.h
+++ b/io/io/inc/TBufferJSON.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TBufferJSON
#define ROOT_TBufferJSON
-#ifndef ROOT_TBuffer
#include "TBuffer.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
#include <map>
diff --git a/io/io/inc/TCollectionProxyFactory.h b/io/io/inc/TCollectionProxyFactory.h
index 500eac7a5d3e64e2521f4d03fd0722ce0746babf..bcace7bde88e1087ec15bcd613a5842e50390898 100644
--- a/io/io/inc/TCollectionProxyFactory.h
+++ b/io/io/inc/TCollectionProxyFactory.h
@@ -20,21 +20,13 @@
#include <vector>
-#ifndef ROOT_TCollectionProxyInfo
#include "TCollectionProxyInfo.h"
-#endif
-#ifndef ROOT_TClassStreamer
#include "TClassStreamer.h"
-#endif
-#ifndef ROOT_TMemberStreamer
#include "TMemberStreamer.h"
-#endif
-#ifndef ROOT_TGenCollectionProxy
#include "TGenCollectionProxy.h"
-#endif
// Forward declarations
class TBuffer;
diff --git a/io/io/inc/TContainerConverters.h b/io/io/inc/TContainerConverters.h
index 67bca4cb63601c6675e00ecccf0381caa6a8bb35..c285e13ac0b1445a63371e3b48557392579e16f0 100644
--- a/io/io/inc/TContainerConverters.h
+++ b/io/io/inc/TContainerConverters.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TContainerConverters
#define ROOT_TContainerConverters
-#ifndef ROOT_TMemberStreamer
#include "TMemberStreamer.h"
-#endif
class TVirtualCollectionProxy;
class TGenCollectionStreamer;
diff --git a/io/io/inc/TDirectoryFile.h b/io/io/inc/TDirectoryFile.h
index 617d3fc56e41f004c58eb169a8ffbd6bf1e800e4..48cc42ac686cd81c7c17da0da7e8af074e6d5ade 100644
--- a/io/io/inc/TDirectoryFile.h
+++ b/io/io/inc/TDirectoryFile.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDirectory
#include "TDirectory.h"
-#endif
class TList;
class TBrowser;
diff --git a/io/io/inc/TFPBlock.h b/io/io/inc/TFPBlock.h
index 340a981fd9803aa8495f5030a18d7dd0edeb03f0..ae5a6eb07c47c54a5a227a9a60129609dc2a139f 100644
--- a/io/io/inc/TFPBlock.h
+++ b/io/io/inc/TFPBlock.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TFPBlock
#define ROOT_TFPBlock
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
/**
\class TFPBlock
diff --git a/io/io/inc/TFileCacheRead.h b/io/io/inc/TFileCacheRead.h
index d81ef3905151ba7e7d34fbc27c8158af783880c3..02e9f1774015771f37ccdcba85b9b2eb27dcab08 100644
--- a/io/io/inc/TFileCacheRead.h
+++ b/io/io/inc/TFileCacheRead.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TFileCacheRead
#define ROOT_TFileCacheRead
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
class TBranch;
class TFilePrefetch;
diff --git a/io/io/inc/TFileCacheWrite.h b/io/io/inc/TFileCacheWrite.h
index de3d10b6c4f2a64b39f9e5fcddf364ef12bf033b..c0601c0b1655cc89aa2b2d933d45c0c893011f43 100644
--- a/io/io/inc/TFileCacheWrite.h
+++ b/io/io/inc/TFileCacheWrite.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TFileCacheWrite
#define ROOT_TFileCacheWrite
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TFile;
diff --git a/io/io/inc/TFileMerger.h b/io/io/inc/TFileMerger.h
index 8a7e769a44c73768cb1afb64a08d003648faa456..57e87bf6a1ce074efcb9014c96f3882dc59872cc 100644
--- a/io/io/inc/TFileMerger.h
+++ b/io/io/inc/TFileMerger.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TFileMerger
#define ROOT_TFileMerger
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TStopwatch
#include "TStopwatch.h"
-#endif
class TList;
class TFile;
diff --git a/io/io/inc/TFilePrefetch.h b/io/io/inc/TFilePrefetch.h
index fd68579b8aaa453615fafdd009c416123ff7be9b..bebff0cf6651363e4f14cf63676b12dfb7be8a95 100644
--- a/io/io/inc/TFilePrefetch.h
+++ b/io/io/inc/TFilePrefetch.h
@@ -12,36 +12,16 @@
#ifndef ROOT_TFilePrefetch
#define ROOT_TFilePrefetch
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
-#ifndef ROOT_TThread
#include "TThread.h"
-#endif
-#ifndef ROOT_TFPBlock
#include "TFPBlock.h"
-#endif
-#ifndef ROOT_TSemaphore
#include "TSemaphore.h"
-#endif
-#ifndef ROOT_TMD5
#include "TMD5.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TObjString
#include "TObjString.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TStopwatch
#include "TStopwatch.h"
-#endif
#include <atomic>
#include <condition_variable>
diff --git a/io/io/inc/TFree.h b/io/io/inc/TFree.h
index bbc823325458c5722dedbd5f34caf3876f4e3c39..23d91fce72ea777e664e44b0ca27bd0467e006bc 100644
--- a/io/io/inc/TFree.h
+++ b/io/io/inc/TFree.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TFree : public TObject {
diff --git a/io/io/inc/TGenCollectionProxy.h b/io/io/inc/TGenCollectionProxy.h
index e0dc0aea16a37272a8bcc34cb13cc81335ae9e58..bf58175add8fefbd0aa5f2c7d7735d3157dc53a6 100644
--- a/io/io/inc/TGenCollectionProxy.h
+++ b/io/io/inc/TGenCollectionProxy.h
@@ -11,17 +11,11 @@
#ifndef ROOT_TGenCollectionProxy
#define ROOT_TGenCollectionProxy
-#ifndef ROOT_TBuffer
#include "TBuffer.h"
-#endif
-#ifndef ROOT_TVirtualCollectionProxy
#include "TVirtualCollectionProxy.h"
-#endif
-#ifndef ROOT_TCollectionProxyInfo
#include "TCollectionProxyInfo.h"
-#endif
#include <atomic>
#include <string>
diff --git a/io/io/inc/TKey.h b/io/io/inc/TKey.h
index f8f2378da59c8f45a04b2cf4984ba4d97b4cf237..c8dc5ea95a25efe336acd2c5e6795381a4d49355 100644
--- a/io/io/inc/TKey.h
+++ b/io/io/inc/TKey.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TKey
#define ROOT_TKey
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TDatime
#include "TDatime.h"
-#endif
-#ifndef ROOT_TBuffer
#include "TBuffer.h"
-#endif
class TClass;
class TBrowser;
diff --git a/io/io/inc/TKeyMapFile.h b/io/io/inc/TKeyMapFile.h
index 266b97542d744ccd05fff26388130cc0b4d9c673..25209d81a4d5f1faea37db981a00cb1c179f8895 100644
--- a/io/io/inc/TKeyMapFile.h
+++ b/io/io/inc/TKeyMapFile.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TKeyMapFile
#define ROOT_TKeyMapFile
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TBrowser;
class TMapFile;
diff --git a/io/io/inc/TLockFile.h b/io/io/inc/TLockFile.h
index 8ff844a6b4627873184f5f8a051a0bfbdd893451..10c27ff455546a9d142351463236088b434aade2 100644
--- a/io/io/inc/TLockFile.h
+++ b/io/io/inc/TLockFile.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TLockFile
#define ROOT_TLockFile
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TLockFile : public TObject {
diff --git a/io/io/inc/TMapFile.h b/io/io/inc/TMapFile.h
index 5955675ede06e7507834777e71416d5c2feb122d..8e1dee9dc8d73acd4c3ad09c21b778d4b074aaa9 100644
--- a/io/io/inc/TMapFile.h
+++ b/io/io/inc/TMapFile.h
@@ -15,12 +15,8 @@
#ifdef WIN32
#include "Windows4Root.h"
#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TROOT
#include "TROOT.h"
-#endif
class TBrowser;
class TDirectory;
diff --git a/io/io/inc/TMemFile.h b/io/io/inc/TMemFile.h
index 666ecbc2b1c1ad71b0e3b010503bbc6faba1a52d..1f2b3f852bcc6dcc37de21f6c037529bec23fe75 100644
--- a/io/io/inc/TMemFile.h
+++ b/io/io/inc/TMemFile.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TMemFile
#define ROOT_TMemFile
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
class TMemFile : public TFile {
diff --git a/io/io/inc/TStreamerInfo.h b/io/io/inc/TStreamerInfo.h
index fa6a37b107fc0b1db302f6928299e2db38b1799c..34adeb95e0fcb3c39de3c85a1eacebdd5a3e6a68 100644
--- a/io/io/inc/TStreamerInfo.h
+++ b/io/io/inc/TStreamerInfo.h
@@ -14,13 +14,9 @@
#include <atomic>
-#ifndef ROOT_TVirtualStreamerInfo
#include "TVirtualStreamerInfo.h"
-#endif
-#ifndef ROOT_ThreadLocalStorage
#include "ThreadLocalStorage.h"
-#endif
#include "TVirtualCollectionProxy.h"
diff --git a/io/io/inc/TVirtualCollectionIterators.h b/io/io/inc/TVirtualCollectionIterators.h
index 78f0628b186dc8fd4207b473623d34be31575ad9..eef859b7a95e7d0863c30573f36aee7af23d0888 100644
--- a/io/io/inc/TVirtualCollectionIterators.h
+++ b/io/io/inc/TVirtualCollectionIterators.h
@@ -18,12 +18,8 @@
Small helper class to generically acquire and release iterators.
*/
-#ifndef ROOT_TVirtualCollectionProxy
#include "TVirtualCollectionProxy.h"
-#endif
-#ifndef ROOT_TError
#include "TError.h"
-#endif
class TVirtualCollectionIterators
{
diff --git a/io/io/inc/TVirtualObject.h b/io/io/inc/TVirtualObject.h
index fd2cd6c5c844b2b8974d19cae2f63691289dab7c..df95fa06384e811ae0d9d642b1bf77d60cc96504 100644
--- a/io/io/inc/TVirtualObject.h
+++ b/io/io/inc/TVirtualObject.h
@@ -20,9 +20,7 @@ Wrapper around an object and giving indirect access to its content
even if the object is not of a class in the Cint/Reflex dictionary.
*/
-#ifndef ROOT_TClassRef
#include "TClassRef.h"
-#endif
class TVirtualObject {
diff --git a/io/io/inc/TZIPFile.h b/io/io/inc/TZIPFile.h
index b4c75371aa289d9ef95594c2756a1985bc3f34b9..6ce8c4c50787e91de2e06290334ab4c8ad8954e6 100644
--- a/io/io/inc/TZIPFile.h
+++ b/io/io/inc/TZIPFile.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TZIPFile
#define ROOT_TZIPFile
-#ifndef ROOT_TArchiveFile
#include "TArchiveFile.h"
-#endif
class TZIPMember;
diff --git a/io/rfio/inc/TRFIOFile.h b/io/rfio/inc/TRFIOFile.h
index 11fc647ca43c738ca5855f7fa2e9c924253544fc..5e5dc221689448fd1604f25569deb565c354eddb 100644
--- a/io/rfio/inc/TRFIOFile.h
+++ b/io/rfio/inc/TRFIOFile.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TRFIOFile
#define ROOT_TRFIOFile
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
class TRFIOFile : public TFile {
diff --git a/io/sql/inc/TBufferSQL2.h b/io/sql/inc/TBufferSQL2.h
index 020c14e2ff2c9a8c50b19fae4eb7452a43b20910..e49d28891e4d456937f9a50c81759ad28bec1b80 100644
--- a/io/sql/inc/TBufferSQL2.h
+++ b/io/sql/inc/TBufferSQL2.h
@@ -5,17 +5,11 @@
#ifndef ROOT_TBufferSQL2
#define ROOT_TBufferSQL2
-#ifndef ROOT_TBufferFile
#include "TBufferFile.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
class TMap;
class TExMap;
diff --git a/io/sql/inc/TKeySQL.h b/io/sql/inc/TKeySQL.h
index 179122931e8f85147c8c405d11046cd95e4860a8..d683969592277527bb8e6f58553f8d7c6eaeef00 100644
--- a/io/sql/inc/TKeySQL.h
+++ b/io/sql/inc/TKeySQL.h
@@ -13,9 +13,7 @@
#ifndef ROOT_TKeySQL
#define ROOT_TKeySQL
-#ifndef ROOT_TKey
#include "TKey.h"
-#endif
class TSQLFile;
diff --git a/io/sql/inc/TSQLClassInfo.h b/io/sql/inc/TSQLClassInfo.h
index 0fdc69d9536e6c1d4baa98c4bd61613944533a0d..efbfeeee7ff41ea4cf2cd768ad2c4cfa0fb4d96b 100644
--- a/io/sql/inc/TSQLClassInfo.h
+++ b/io/sql/inc/TSQLClassInfo.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TSQLClassInfo
#define ROOT_TSQLClassInfo
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TObjArray;
diff --git a/io/sql/inc/TSQLFile.h b/io/sql/inc/TSQLFile.h
index ac9fab0a97251cc10003c29880316e49f38e502a..406b628c6e2f7a7ac88a5ea5cd1c51a07095f6a8 100644
--- a/io/sql/inc/TSQLFile.h
+++ b/io/sql/inc/TSQLFile.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSQLFile
#define ROOT_TSQLFile
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
#include <stdlib.h>
class TList;
diff --git a/io/sql/inc/TSQLObjectData.h b/io/sql/inc/TSQLObjectData.h
index 2b53940165a92a10fa5188ab831163eed7e2d4be..a62c976d667c6f17808d4fa0a1e1375451237ec8 100644
--- a/io/sql/inc/TSQLObjectData.h
+++ b/io/sql/inc/TSQLObjectData.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TSQLObjectData
#define ROOT_TSQLObjectData
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TObjArray;
class TList;
diff --git a/io/sql/inc/TSQLStructure.h b/io/sql/inc/TSQLStructure.h
index 1f48e46cf096019cb9605cc8e2ccd8e6d7e2d084..5fa594134b0c842fd139da196ac11ebe5b1489b6 100644
--- a/io/sql/inc/TSQLStructure.h
+++ b/io/sql/inc/TSQLStructure.h
@@ -12,17 +12,11 @@
#ifndef ROOT_TSQLStructure
#define ROOT_TSQLStructure
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TAttAxis
#include "TAttAxis.h"
-#endif
#ifdef Bool
#undef Bool
diff --git a/io/xml/inc/TBufferXML.h b/io/xml/inc/TBufferXML.h
index ad5dc41cd097721990fb7722902fdc7f72e434b0..f71f0380f0dadf034af136ea617eca1c6e7da426 100644
--- a/io/xml/inc/TBufferXML.h
+++ b/io/xml/inc/TBufferXML.h
@@ -12,21 +12,11 @@
#ifndef ROOT_TBufferXML
#define ROOT_TBufferXML
-#ifndef ROOT_TBufferFile
#include "TBufferFile.h"
-#endif
-#ifndef ROOT_TXMLSetup
#include "TXMLSetup.h"
-#endif
-#ifndef ROOT_TXMLEngine
#include "TXMLEngine.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
#include <string>
diff --git a/io/xml/inc/TKeyXML.h b/io/xml/inc/TKeyXML.h
index af0a40780b624886d42bb50d49e8c35abe3edb2c..e54dfa868029c6d2892c8ad77c6988c83112b667 100644
--- a/io/xml/inc/TKeyXML.h
+++ b/io/xml/inc/TKeyXML.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TKeyXML
#define ROOT_TKeyXML
-#ifndef ROOT_TXMLEngine
#include "TXMLEngine.h"
-#endif
-#ifndef ROOT_TKey
#include "TKey.h"
-#endif
class TXMLFile;
diff --git a/io/xml/inc/TXMLEngine.h b/io/xml/inc/TXMLEngine.h
index 510518b1c34cf65687facbbb23ae936bdfb27e04..688bbb5b0a04e9031a6763f09f6e35a923dff6a5 100644
--- a/io/xml/inc/TXMLEngine.h
+++ b/io/xml/inc/TXMLEngine.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TXMLEngine
#define ROOT_TXMLEngine
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
typedef void* XMLNodePointer_t;
typedef void* XMLNsPointer_t;
diff --git a/io/xml/inc/TXMLFile.h b/io/xml/inc/TXMLFile.h
index 0f9feeb96c7324c63c1f190ba19b3222bff671c8..267de4e7e54e8a1963ae22cec3c8356f22489378 100644
--- a/io/xml/inc/TXMLFile.h
+++ b/io/xml/inc/TXMLFile.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TXMLFile
#define ROOT_TXMLFile
-#ifndef ROOT_TXMLEngine
#include "TXMLEngine.h"
-#endif
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
-#ifndef ROOT_TXMLSetup
#include "TXMLSetup.h"
-#endif
class TKeyXML;
diff --git a/io/xml/inc/TXMLPlayer.h b/io/xml/inc/TXMLPlayer.h
index 836eec85181a0d92725120b9d22843f2f3f0c039..ea29302227b0f95575ae75bf6d79b31eec34a660 100644
--- a/io/xml/inc/TXMLPlayer.h
+++ b/io/xml/inc/TXMLPlayer.h
@@ -12,17 +12,11 @@
#ifndef ROOT_TXMLPlayer
#define ROOT_TXMLPlayer
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TXMLSetup
#include "TXMLSetup.h"
-#endif
class TStreamerInfo;
class TStreamerElement;
diff --git a/io/xml/inc/TXMLSetup.h b/io/xml/inc/TXMLSetup.h
index 6cd148031954761b363f6c65c987fffaafbd9ea0..77f8deb696b9a265ab80bccafa653ddd5dbb9001 100644
--- a/io/xml/inc/TXMLSetup.h
+++ b/io/xml/inc/TXMLSetup.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TXMLSetup
#define ROOT_TXMLSetup
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#ifdef Bool
#undef Bool
diff --git a/io/xmlparser/inc/TDOMParser.h b/io/xmlparser/inc/TDOMParser.h
index 42199697f9a00ffb76b4e7cdef024911ea4d7c61..c6773dd69a0ed4f3a3ac111a8fef1aa9714897fd 100644
--- a/io/xmlparser/inc/TDOMParser.h
+++ b/io/xmlparser/inc/TDOMParser.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TDOMParser
#define ROOT_TDOMParser
-#ifndef ROOT_TXMLParser
#include "TXMLParser.h"
-#endif
-#ifndef ROOT_TXMLDocument
#include "TXMLDocument.h"
-#endif
class TDOMParser : public TXMLParser {
diff --git a/io/xmlparser/inc/TSAXParser.h b/io/xmlparser/inc/TSAXParser.h
index 0e592205a8f7b0016aab93dd214aa16cbf01f79e..6057ca6253263791958f23924b5e4d7708fa1de0 100644
--- a/io/xmlparser/inc/TSAXParser.h
+++ b/io/xmlparser/inc/TSAXParser.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSAXParser
#define ROOT_TSAXParser
-#ifndef ROOT_TXMLParser
#include "TXMLParser.h"
-#endif
class TList;
diff --git a/io/xmlparser/inc/TXMLAttr.h b/io/xmlparser/inc/TXMLAttr.h
index decf5d5b128f711bbd5ac562ec0581fbf25a5c71..30ebeaf204da5616e55828f3c890361c91c11bc4 100644
--- a/io/xmlparser/inc/TXMLAttr.h
+++ b/io/xmlparser/inc/TXMLAttr.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TXMLAttr
#define ROOT_TXMLAttr
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TXMLAttr : public TObject {
diff --git a/io/xmlparser/inc/TXMLDocument.h b/io/xmlparser/inc/TXMLDocument.h
index c45340c181c02297a5f18bb648800e0ae140c64c..bdd12d3a17c9a0a5a337c9553a2a578ddeeb7871 100644
--- a/io/xmlparser/inc/TXMLDocument.h
+++ b/io/xmlparser/inc/TXMLDocument.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TXMLDocument
#define ROOT_TXMLDocument
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
struct _xmlDoc;
diff --git a/io/xmlparser/inc/TXMLNode.h b/io/xmlparser/inc/TXMLNode.h
index 7c4b9ee517760e11543c93a12cf30bfecff0e3b2..a93b2edeb3b3d88943cda76129e862bf4c2591d6 100644
--- a/io/xmlparser/inc/TXMLNode.h
+++ b/io/xmlparser/inc/TXMLNode.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TXMLNode
#define ROOT_TXMLNode
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TList;
struct _xmlNode;
diff --git a/io/xmlparser/inc/TXMLParser.h b/io/xmlparser/inc/TXMLParser.h
index 700c9a0ff5d0b0edb01e55145400e725be0ac0e9..1a9bfea9a52a33b6619d08bc308840b83f976358 100644
--- a/io/xmlparser/inc/TXMLParser.h
+++ b/io/xmlparser/inc/TXMLParser.h
@@ -12,17 +12,11 @@
#ifndef ROOT_TXMLParser
#define ROOT_TXMLParser
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
struct _xmlParserCtxt;
diff --git a/math/fftw/inc/TFFTComplex.h b/math/fftw/inc/TFFTComplex.h
index ff217b3ea577b6e6d2babc8911aef76f5ac4878c..63848b7114817b3d4ffb23c42f48f6dcd5d4407e 100644
--- a/math/fftw/inc/TFFTComplex.h
+++ b/math/fftw/inc/TFFTComplex.h
@@ -39,9 +39,7 @@
//
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualFFT
#include "TVirtualFFT.h"
-#endif
class TComplex;
diff --git a/math/fftw/inc/TFFTComplexReal.h b/math/fftw/inc/TFFTComplexReal.h
index 47f5730f8858cad655534bc1ad32dc3e06f53aff..aa23e7404957b9c30eea28ed5a25473a845efe13 100644
--- a/math/fftw/inc/TFFTComplexReal.h
+++ b/math/fftw/inc/TFFTComplexReal.h
@@ -41,9 +41,7 @@
//
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualFFT
#include "TVirtualFFT.h"
-#endif
class TComplex;
diff --git a/math/fftw/inc/TFFTReal.h b/math/fftw/inc/TFFTReal.h
index 37c745f62aa0044a77f2f930ac38f765c5f4ace3..3feda56321a6c30fcbbebe1abf8dc88e88035b3c 100644
--- a/math/fftw/inc/TFFTReal.h
+++ b/math/fftw/inc/TFFTReal.h
@@ -59,9 +59,7 @@
//
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualFFT
#include "TVirtualFFT.h"
-#endif
class TComplex;
diff --git a/math/fftw/inc/TFFTRealComplex.h b/math/fftw/inc/TFFTRealComplex.h
index 353e52223acdee44f3156a713c87d83980bbb18a..1a5d770504824054607789f605918b43c0a4cbd6 100644
--- a/math/fftw/inc/TFFTRealComplex.h
+++ b/math/fftw/inc/TFFTRealComplex.h
@@ -44,9 +44,7 @@
//
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualFFT
#include "TVirtualFFT.h"
-#endif
class TComplex;
diff --git a/math/foam/inc/TFoam.h b/math/foam/inc/TFoam.h
index 5c5a6fcf6098ab9576fb5c2287d1ff34a6b88617..e548aad213f30f898c25c066e6cda088fae1ff30 100644
--- a/math/foam/inc/TFoam.h
+++ b/math/foam/inc/TFoam.h
@@ -11,9 +11,7 @@
// //
//////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
#include "TString.h"
diff --git a/math/foam/inc/TFoamCell.h b/math/foam/inc/TFoamCell.h
index d629fbc128446dc0ee6c5ebc98f5fbc86d9ae311..df3c7442706656af744b27326b575ebd4d7d05f7 100644
--- a/math/foam/inc/TFoamCell.h
+++ b/math/foam/inc/TFoamCell.h
@@ -12,9 +12,7 @@
// saves total memory allocation needed for the system of cells. //
////////////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TRef
#include "TRef.h"
-#endif
class TFoamVect;
diff --git a/math/foam/inc/TFoamIntegrand.h b/math/foam/inc/TFoamIntegrand.h
index 89921faede59eb20fd4959806bdcae5e595e3875..46158d21d51aacb971232eff30439c1d343cf008 100644
--- a/math/foam/inc/TFoamIntegrand.h
+++ b/math/foam/inc/TFoamIntegrand.h
@@ -9,9 +9,7 @@
// =====================
// Abstract class representing n-dimensional real positive integrand function
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TFoamIntegrand : public TObject {
public:
diff --git a/math/foam/inc/TFoamMaxwt.h b/math/foam/inc/TFoamMaxwt.h
index 52277dbe7f2dd62961901d7c0af94bcf00e2f783..e0364c31af95bcc7ffa0432a1a45c621e1726afb 100644
--- a/math/foam/inc/TFoamMaxwt.h
+++ b/math/foam/inc/TFoamMaxwt.h
@@ -10,9 +10,7 @@
// //
//////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TH1D;
diff --git a/math/foam/inc/TFoamSampler.h b/math/foam/inc/TFoamSampler.h
index fe4ca75d5753927d5858bf8befe54218b02cdccb..e10b568eb62416cd9e3aa7859098d8017513bce2 100644
--- a/math/foam/inc/TFoamSampler.h
+++ b/math/foam/inc/TFoamSampler.h
@@ -13,9 +13,7 @@
#define ROOT_TFoamSampler
-#ifndef ROOT_Math_DistSampler
#include "Math/DistSampler.h"
-#endif
namespace ROOT {
diff --git a/math/foam/inc/TFoamVect.h b/math/foam/inc/TFoamVect.h
index b5a1fc367455d0ae8b4dbbca87740979b6b665fd..b2adf0f54bd0e9291533e1ae76944ea1ce5380da 100644
--- a/math/foam/inc/TFoamVect.h
+++ b/math/foam/inc/TFoamVect.h
@@ -11,9 +11,7 @@
// //
////////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
///////////////////////////////////////////////////////////////////////////////
diff --git a/math/fumili/inc/TFumili.h b/math/fumili/inc/TFumili.h
index bcbe246bfe9a5b8816d055ee710ee12837436fe1..f53a2e3cd95db6ad409e5a6d8e929885665bd8ee 100644
--- a/math/fumili/inc/TFumili.h
+++ b/math/fumili/inc/TFumili.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TFumili
#define ROOT_TFumili
-#ifndef ROOT_TVirtualFitter
#include "TVirtualFitter.h"
-#endif
class TF1;
diff --git a/math/fumili/inc/TFumiliMinimizer.h b/math/fumili/inc/TFumiliMinimizer.h
index 9ccc9477bf6fc74a763fbbcba2734c3c625211c2..f6a75dc7ae4c25111b1bc26ed2b144ff51d56257 100644
--- a/math/fumili/inc/TFumiliMinimizer.h
+++ b/math/fumili/inc/TFumiliMinimizer.h
@@ -13,17 +13,11 @@
#ifndef ROOT_TFumiliMinimizer
#define ROOT_TFumiliMinimizer
-#ifndef ROOT_Math_Minimizer
#include "Math/Minimizer.h"
-#endif
-#ifndef ROOT_Math_FitMethodFunction
#include "Math/FitMethodFunction.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TFumili;
diff --git a/math/genvector/inc/Math/GenVector/Cartesian2D.h b/math/genvector/inc/Math/GenVector/Cartesian2D.h
index c43a62f5ec43f2b986ab8763795587dc057d0c64..ccccb9e54db5332987b458787f69ccee22adb7f6 100644
--- a/math/genvector/inc/Math/GenVector/Cartesian2D.h
+++ b/math/genvector/inc/Math/GenVector/Cartesian2D.h
@@ -16,13 +16,9 @@
#ifndef ROOT_Math_GenVector_Cartesian2D
#define ROOT_Math_GenVector_Cartesian2D 1
-#ifndef ROOT_Math_GenVector_Polar2Dfwd
#include "Math/GenVector/Polar2Dfwd.h"
-#endif
-#ifndef ROOT_Math_Math
#include "Math/Math.h"
-#endif
namespace ROOT {
@@ -218,12 +214,8 @@ private:
// I need to include other coordinate systems only when Cartesian is already defined
// since they depend on it
-#ifndef ROOT_Math_GenVector_GenVector_exception
#include "Math/GenVector/GenVector_exception.h"
-#endif
-#ifndef ROOT_Math_GenVector_Polar2D
#include "Math/GenVector/Polar2D.h"
-#endif
// ====== Set member functions for coordinates in other systems =======
diff --git a/math/genvector/inc/Math/GenVector/Cartesian3D.h b/math/genvector/inc/Math/GenVector/Cartesian3D.h
index 3737348c2c2df07dffcf6a6f035cc467dbd333da..dfd87ba911af7ea2d8dbb53eef681a6d97cafde6 100644
--- a/math/genvector/inc/Math/GenVector/Cartesian3D.h
+++ b/math/genvector/inc/Math/GenVector/Cartesian3D.h
@@ -19,20 +19,14 @@
#ifndef ROOT_Math_GenVector_Cartesian3D
#define ROOT_Math_GenVector_Cartesian3D 1
-#ifndef ROOT_Math_GenVector_Polar3Dfwd
#include "Math/GenVector/Polar3Dfwd.h"
-#endif
-#ifndef ROOT_Math_Math
#include "Math/Math.h"
-#endif
#include <limits>
-#ifndef ROOT_Math_GenVector_eta
#include "Math/GenVector/eta.h"
-#endif
namespace ROOT {
@@ -252,15 +246,9 @@ private:
// need to put here setter methods to resolve nasty cyclical dependencies
// I need to include other coordinate systems only when Cartesian is already defined
// since they depend on it
-#ifndef ROOT_Math_GenVector_GenVector_exception
#include "Math/GenVector/GenVector_exception.h"
-#endif
-#ifndef ROOT_Math_GenVector_CylindricalEta3D
#include "Math/GenVector/CylindricalEta3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_Polar3D
#include "Math/GenVector/Polar3D.h"
-#endif
// ====== Set member functions for coordinates in other systems =======
diff --git a/math/genvector/inc/Math/GenVector/Cylindrical3D.h b/math/genvector/inc/Math/GenVector/Cylindrical3D.h
index 809fb72777501e9f717cc829ffb6cf8328fdc5be..1630c02782d4bdb81b8d494d19a087d22df5989e 100644
--- a/math/genvector/inc/Math/GenVector/Cylindrical3D.h
+++ b/math/genvector/inc/Math/GenVector/Cylindrical3D.h
@@ -16,13 +16,9 @@
#ifndef ROOT_Math_GenVector_Cylindrical3D
#define ROOT_Math_GenVector_Cylindrical3D 1
-#ifndef ROOT_Math_Math
#include "Math/Math.h"
-#endif
-#ifndef ROOT_Math_GenVector_eta
#include "Math/GenVector/eta.h"
-#endif
#include <limits>
@@ -253,21 +249,13 @@ private:
// move implementations here to avoid circle dependencies
-#ifndef ROOT_Math_GenVector_Cartesian3D
#include "Math/GenVector/Cartesian3D.h"
-#endif
#if defined(__MAKECINT__) || defined(G__DICTIONARY)
-#ifndef ROOT_Math_GenVector_GenVector_exception
#include "Math/GenVector/GenVector_exception.h"
-#endif
-#ifndef ROOT_Math_GenVector_CylindricalEta3D
#include "Math/GenVector/CylindricalEta3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_Polar3D
#include "Math/GenVector/Polar3D.h"
#endif
-#endif
namespace ROOT {
diff --git a/math/genvector/inc/Math/GenVector/CylindricalEta3D.h b/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
index 53b59b17fa70a9211403b4a58cc6f3130722ea40..0b4b0e20739ab75340aadf9361220688aea75ed2 100644
--- a/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
+++ b/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
@@ -20,13 +20,9 @@
#ifndef ROOT_Math_GenVector_CylindricalEta3D
#define ROOT_Math_GenVector_CylindricalEta3D 1
-#ifndef ROOT_Math_Math
#include "Math/Math.h"
-#endif
-#ifndef ROOT_Math_GenVector_etaMax
#include "Math/GenVector/etaMax.h"
-#endif
#include <limits>
@@ -281,18 +277,12 @@ private:
// move implementations here to avoid circle dependencies
-#ifndef ROOT_Math_GenVector_Cartesian3D
#include "Math/GenVector/Cartesian3D.h"
-#endif
#if defined(__MAKECINT__) || defined(G__DICTIONARY)
-#ifndef ROOT_Math_GenVector_GenVector_exception
#include "Math/GenVector/GenVector_exception.h"
-#endif
-#ifndef ROOT_Math_GenVector_Polar3D
#include "Math/GenVector/Polar3D.h"
#endif
-#endif
namespace ROOT {
diff --git a/math/genvector/inc/Math/GenVector/DisplacementVector2D.h b/math/genvector/inc/Math/GenVector/DisplacementVector2D.h
index 423240b0c6b1281aa86d816446e9b74077116727..c9be01c3a73856eb3f45fbd011edcac12996e2fe 100644
--- a/math/genvector/inc/Math/GenVector/DisplacementVector2D.h
+++ b/math/genvector/inc/Math/GenVector/DisplacementVector2D.h
@@ -17,25 +17,15 @@
#ifndef ROOT_Math_GenVector_DisplacementVector2D
#define ROOT_Math_GenVector_DisplacementVector2D 1
-#ifndef ROOT_Math_GenVector_Cartesian2D
#include "Math/GenVector/Cartesian2D.h"
-#endif
-#ifndef ROOT_Math_GenVector_PositionVector2Dfwd
#include "Math/GenVector/PositionVector2Dfwd.h"
-#endif
-#ifndef ROOT_Math_GenVector_GenVectorIO
#include "Math/GenVector/GenVectorIO.h"
-#endif
-#ifndef ROOT_Math_GenVector_BitReproducible
#include "Math/GenVector/BitReproducible.h"
-#endif
-#ifndef ROOT_Math_GenVector_CoordinateSystemTags
#include "Math/GenVector/CoordinateSystemTags.h"
-#endif
//#include "Math/GenVector/Expression2D.h"
diff --git a/math/genvector/inc/Math/GenVector/DisplacementVector3D.h b/math/genvector/inc/Math/GenVector/DisplacementVector3D.h
index 66d82c8c9a53aa5013554c5550320d15bee24b28..3fceba90daeb13c2105dcb4865fc44d68563057f 100644
--- a/math/genvector/inc/Math/GenVector/DisplacementVector3D.h
+++ b/math/genvector/inc/Math/GenVector/DisplacementVector3D.h
@@ -20,25 +20,15 @@
#ifndef ROOT_Math_GenVector_DisplacementVector3D
#define ROOT_Math_GenVector_DisplacementVector3D 1
-#ifndef ROOT_Math_GenVector_Cartesian3D
#include "Math/GenVector/Cartesian3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_PositionVector3Dfwd
#include "Math/GenVector/PositionVector3Dfwd.h"
-#endif
-#ifndef ROOT_Math_GenVector_GenVectorIO
#include "Math/GenVector/GenVectorIO.h"
-#endif
-#ifndef ROOT_Math_GenVector_BitReproducible
#include "Math/GenVector/BitReproducible.h"
-#endif
-#ifndef ROOT_Math_GenVector_CoordinateSystemTags
#include "Math/GenVector/CoordinateSystemTags.h"
-#endif
#include <cassert>
diff --git a/math/genvector/inc/Math/GenVector/LorentzVector.h b/math/genvector/inc/Math/GenVector/LorentzVector.h
index 27b5fd90dc6f6f6e4a6a41a6318f71678a47ab9d..026a3593c9133f177a90f21a164dee03eb6c94f8 100644
--- a/math/genvector/inc/Math/GenVector/LorentzVector.h
+++ b/math/genvector/inc/Math/GenVector/LorentzVector.h
@@ -18,17 +18,11 @@
#ifndef ROOT_Math_GenVector_LorentzVector
#define ROOT_Math_GenVector_LorentzVector 1
-#ifndef ROOT_Math_GenVector_PxPyPzE4D
#include "Math/GenVector/PxPyPzE4D.h"
-#endif
-#ifndef ROOT_Math_GenVector_DisplacementVector3D
#include "Math/GenVector/DisplacementVector3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_GenVectorIO
#include "Math/GenVector/GenVectorIO.h"
-#endif
diff --git a/math/genvector/inc/Math/GenVector/Polar2D.h b/math/genvector/inc/Math/GenVector/Polar2D.h
index 39b72c4c9d4cb43a2cca2ad1961826617d92e1a3..895778d3a55abbbded7c60f96ffbcefcd3dbdeca 100644
--- a/math/genvector/inc/Math/GenVector/Polar2D.h
+++ b/math/genvector/inc/Math/GenVector/Polar2D.h
@@ -19,13 +19,9 @@
#ifndef ROOT_Math_GenVector_Polar2D
#define ROOT_Math_GenVector_Polar2D 1
-#ifndef ROOT_Math_Math
#include "Math/Math.h"
-#endif
-#ifndef ROOT_Math_GenVector_etaMax
#include "Math/GenVector/etaMax.h"
-#endif
@@ -226,15 +222,11 @@ private:
// move implementations here to avoid circle dependencies
-#ifndef ROOT_Math_GenVector_Cartesian2D
#include "Math/GenVector/Cartesian2D.h"
-#endif
#if defined(__MAKECINT__) || defined(G__DICTIONARY)
-#ifndef ROOT_Math_GenVector_GenVector_exception
#include "Math/GenVector/GenVector_exception.h"
#endif
-#endif
namespace ROOT {
diff --git a/math/genvector/inc/Math/GenVector/Polar3D.h b/math/genvector/inc/Math/GenVector/Polar3D.h
index 8023293c463e253d9356fab4732b5f8f39ad530e..3fa1e66e15922e7106b231ca4b7ceb0b293d9690 100644
--- a/math/genvector/inc/Math/GenVector/Polar3D.h
+++ b/math/genvector/inc/Math/GenVector/Polar3D.h
@@ -19,13 +19,9 @@
#ifndef ROOT_Math_GenVector_Polar3D
#define ROOT_Math_GenVector_Polar3D 1
-#ifndef ROOT_Math_Math
#include "Math/Math.h"
-#endif
-#ifndef ROOT_Math_GenVector_eta
#include "Math/GenVector/eta.h"
-#endif
namespace ROOT {
@@ -250,18 +246,12 @@ private:
// move implementations here to avoid circle dependencies
-#ifndef ROOT_Math_GenVector_Cartesian3D
#include "Math/GenVector/Cartesian3D.h"
-#endif
#if defined(__MAKECINT__) || defined(G__DICTIONARY)
-#ifndef ROOT_Math_GenVector_GenVector_exception
#include "Math/GenVector/GenVector_exception.h"
-#endif
-#ifndef ROOT_Math_GenVector_CylindricalEta3D
#include "Math/GenVector/CylindricalEta3D.h"
#endif
-#endif
namespace ROOT {
diff --git a/math/genvector/inc/Math/GenVector/PositionVector2D.h b/math/genvector/inc/Math/GenVector/PositionVector2D.h
index 7ffb8ba8b172af96a114e152189c2664cff1f112..6ac7e7574dd96e283b90260dd17f364985d164e5 100644
--- a/math/genvector/inc/Math/GenVector/PositionVector2D.h
+++ b/math/genvector/inc/Math/GenVector/PositionVector2D.h
@@ -16,21 +16,13 @@
#ifndef ROOT_Math_GenVector_PositionVector2D
#define ROOT_Math_GenVector_PositionVector2D 1
-#ifndef ROOT_Math_GenVector_DisplacementVector2Dfwd
#include "Math/GenVector/DisplacementVector2D.h"
-#endif
-#ifndef ROOT_Math_GenVector_GenVectorIO
#include "Math/GenVector/GenVectorIO.h"
-#endif
-#ifndef ROOT_Math_GenVector_BitReproducible
#include "Math/GenVector/BitReproducible.h"
-#endif
-#ifndef ROOT_Math_GenVector_CoordinateSystemTags
#include "Math/GenVector/CoordinateSystemTags.h"
-#endif
namespace ROOT {
diff --git a/math/genvector/inc/Math/GenVector/PositionVector3D.h b/math/genvector/inc/Math/GenVector/PositionVector3D.h
index b567bc0f0aac29853d2cc2c1aff98782ca6c73c7..e27d9dce48887b14f868897a0e9ee17814079c9b 100644
--- a/math/genvector/inc/Math/GenVector/PositionVector3D.h
+++ b/math/genvector/inc/Math/GenVector/PositionVector3D.h
@@ -17,25 +17,15 @@
#ifndef ROOT_Math_GenVector_PositionVector3D
#define ROOT_Math_GenVector_PositionVector3D 1
-#ifndef ROOT_Math_GenVector_DisplacementVector3Dfwd
#include "Math/GenVector/DisplacementVector3Dfwd.h"
-#endif
-#ifndef ROOT_Math_GenVector_Cartesian3D
#include "Math/GenVector/Cartesian3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_GenVectorIO
#include "Math/GenVector/GenVectorIO.h"
-#endif
-#ifndef ROOT_Math_GenVector_BitReproducible
#include "Math/GenVector/BitReproducible.h"
-#endif
-#ifndef ROOT_Math_GenVector_CoordinateSystemTags
#include "Math/GenVector/CoordinateSystemTags.h"
-#endif
#include <cassert>
diff --git a/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h b/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h
index 81326a5df28678a6286b31751c4a9bbe5b8c43db..539e6ecca22fedff44f2ef0c50b4ed79e8de0f58 100644
--- a/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h
+++ b/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h
@@ -19,17 +19,11 @@
#ifndef ROOT_Math_GenVector_PtEtaPhiE4D
#define ROOT_Math_GenVector_PtEtaPhiE4D 1
-#ifndef ROOT_Math_Math
#include "Math/Math.h"
-#endif
-#ifndef ROOT_Math_GenVector_etaMax
#include "Math/GenVector/etaMax.h"
-#endif
-#ifndef ROOT_Math_GenVector_GenVector_exception
#include "Math/GenVector/GenVector_exception.h"
-#endif
@@ -371,14 +365,10 @@ private:
// move implementations here to avoid circle dependencies
-#ifndef ROOT_Math_GenVector_PxPyPzE4D
#include "Math/GenVector/PxPyPzE4D.h"
-#endif
#if defined(__MAKECINT__) || defined(G__DICTIONARY)
-#ifndef ROOT_Math_GenVector_PtEtaPhiM4D
#include "Math/GenVector/PtEtaPhiM4D.h"
#endif
-#endif
namespace ROOT {
diff --git a/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h b/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h
index 1d63faca533e76e0eb46ad2e32d0e08646f72e8d..5055c33e0eb2d7900bb84217851d9476e024db1c 100644
--- a/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h
+++ b/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h
@@ -18,17 +18,11 @@
#ifndef ROOT_Math_GenVector_PtEtaPhiM4D
#define ROOT_Math_GenVector_PtEtaPhiM4D 1
-#ifndef ROOT_Math_Math
#include "Math/Math.h"
-#endif
-#ifndef ROOT_Math_GenVector_etaMax
#include "Math/GenVector/etaMax.h"
-#endif
-#ifndef ROOT_Math_GenVector_GenVector_exception
#include "Math/GenVector/GenVector_exception.h"
-#endif
//#define TRACE_CE
@@ -396,9 +390,7 @@ private:
// move implementations here to avoid circle dependencies
-#ifndef ROOT_Math_GenVector_PxPyPzE4D
#include "Math/GenVector/PxPyPzE4D.h"
-#endif
diff --git a/math/genvector/inc/Math/GenVector/PxPyPzE4D.h b/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
index 914df609f41c6a773c11ea94cc1308c1184bd4da..ec2a48d983f3d98c05ac693155e34be95085a280 100644
--- a/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
+++ b/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
@@ -18,13 +18,9 @@
#ifndef ROOT_Math_GenVector_PxPyPzE4D
#define ROOT_Math_GenVector_PxPyPzE4D 1
-#ifndef ROOT_Math_GenVector_eta
#include "Math/GenVector/eta.h"
-#endif
-#ifndef ROOT_Math_GenVector_GenVector_exception
#include "Math/GenVector/GenVector_exception.h"
-#endif
#include <cmath>
@@ -358,12 +354,8 @@ private:
#if defined(__MAKECINT__) || defined(G__DICTIONARY)
// move implementations here to avoid circle dependencies
-#ifndef ROOT_Math_GenVector_PtEtaPhiE4D
#include "Math/GenVector/PtEtaPhiE4D.h"
-#endif
-#ifndef ROOT_Math_GenVector_PtEtaPhiM4D
#include "Math/GenVector/PtEtaPhiM4D.h"
-#endif
namespace ROOT {
diff --git a/math/genvector/inc/Math/GenVector/PxPyPzM4D.h b/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
index 5b2efdd9629a78d770d58d98fd0ab4c186fccb01..711c14990ba22e9ec416fa9b1fc309506d31f38c 100644
--- a/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
+++ b/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
@@ -18,13 +18,9 @@
#ifndef ROOT_Math_GenVector_PxPyPzM4D
#define ROOT_Math_GenVector_PxPyPzM4D 1
-#ifndef ROOT_Math_GenVector_eta
#include "Math/GenVector/eta.h"
-#endif
-#ifndef ROOT_Math_GenVector_GenVector_exception
#include "Math/GenVector/GenVector_exception.h"
-#endif
#include <cmath>
@@ -387,12 +383,8 @@ private:
// move implementations here to avoid circle dependencies
-#ifndef ROOT_Math_GenVector_PxPyPzE4D
#include "Math/GenVector/PxPyPzE4D.h"
-#endif
-#ifndef ROOT_Math_GenVector_PtEtaPhiM4D
#include "Math/GenVector/PtEtaPhiM4D.h"
-#endif
namespace ROOT {
diff --git a/math/genvector/inc/Math/GenVector/RotationZYX.h b/math/genvector/inc/Math/GenVector/RotationZYX.h
index 0552edd89a205f3ed9e02ce060cf47bfade6a2af..f13f4bd33701fec726e51b48df8883d15b73cd32 100644
--- a/math/genvector/inc/Math/GenVector/RotationZYX.h
+++ b/math/genvector/inc/Math/GenVector/RotationZYX.h
@@ -18,30 +18,18 @@
#ifndef ROOT_Math_GenVector_RotationZYX
#define ROOT_Math_GenVector_RotationZYX 1
-#ifndef ROOT_Math_Math
#include "Math/Math.h"
-#endif
-#ifndef ROOT_Math_GenVector_Rotation3D
#include "Math/GenVector/Rotation3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_DisplacementVector3D
#include "Math/GenVector/DisplacementVector3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_PositionVector3D
#include "Math/GenVector/PositionVector3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_LorentzVector
#include "Math/GenVector/LorentzVector.h"
-#endif
-#ifndef ROOT_Math_GenVector_3DConversions
#include "Math/GenVector/3DConversions.h"
-#endif
#include <algorithm>
diff --git a/math/genvector/inc/Math/GenVector/Transform3D.h b/math/genvector/inc/Math/GenVector/Transform3D.h
index 316a0a5b4dfe4472316b2f9ecdc31da62d941d0d..1071594a8f1d103245ee6bcf89ee43c64e93bb37 100644
--- a/math/genvector/inc/Math/GenVector/Transform3D.h
+++ b/math/genvector/inc/Math/GenVector/Transform3D.h
@@ -18,21 +18,13 @@
-#ifndef ROOT_Math_GenVector_DisplacementVector3D
#include "Math/GenVector/DisplacementVector3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_PositionVector3D
#include "Math/GenVector/PositionVector3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_Rotation3D
#include "Math/GenVector/Rotation3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_Translation3D
#include "Math/GenVector/Translation3D.h"
-#endif
#include "Math/GenVector/AxisAnglefwd.h"
diff --git a/math/genvector/inc/Math/GenVector/Translation3D.h b/math/genvector/inc/Math/GenVector/Translation3D.h
index e90ddffc9359cc8187ced4ecefe9cfafb5f2ad46..b7d0d8feff7aad064b0070ac29ccf6156b327ef5 100644
--- a/math/genvector/inc/Math/GenVector/Translation3D.h
+++ b/math/genvector/inc/Math/GenVector/Translation3D.h
@@ -17,17 +17,11 @@
#define ROOT_Math_GenVector_Translation3D 1
-#ifndef ROOT_Math_GenVector_DisplacementVector3D
#include "Math/GenVector/DisplacementVector3D.h"
-#endif
-#ifndef ROOT_Math_GenVector_PositionVector3Dfwd
#include "Math/GenVector/PositionVector3Dfwd.h"
-#endif
-#ifndef ROOT_Math_GenVector_LorentzVectorfwd
#include "Math/GenVector/LorentzVectorfwd.h"
-#endif
#include <iostream>
diff --git a/math/genvector/inc/Math/GenVector/VectorUtil.h b/math/genvector/inc/Math/GenVector/VectorUtil.h
index b231107014247739c5bc580709264b10984e2e4b..07a2f6c99d5165390d126c62934b0a5782c68177 100644
--- a/math/genvector/inc/Math/GenVector/VectorUtil.h
+++ b/math/genvector/inc/Math/GenVector/VectorUtil.h
@@ -18,9 +18,7 @@
#ifndef ROOT_Math_GenVector_VectorUtil
#define ROOT_Math_GenVector_VectorUtil 1
-#ifndef ROOT_Math_Math
#include "Math/Math.h"
-#endif
#include "Math/GenVector/Boost.h"
diff --git a/math/genvector/inc/Math/GenVector/eta.h b/math/genvector/inc/Math/GenVector/eta.h
index caf61810d537c4e5899c7d3dd2ecb7f8bea49b75..434471771e73459248bb84391f9c41f9cf8950fc 100644
--- a/math/genvector/inc/Math/GenVector/eta.h
+++ b/math/genvector/inc/Math/GenVector/eta.h
@@ -17,9 +17,7 @@
#ifndef ROOT_Math_GenVector_eta
#define ROOT_Math_GenVector_eta 1
-#ifndef ROOT_Math_GenVector_etaMax
#include "Math/GenVector/etaMax.h"
-#endif
#include <limits>
diff --git a/math/mathcore/inc/Fit/BasicFCN.h b/math/mathcore/inc/Fit/BasicFCN.h
index 403e8e15b6992ff0143b76e9c5ba626e5527149d..d2e966aa9b8550f083673df66738ecc9048b8063 100644
--- a/math/mathcore/inc/Fit/BasicFCN.h
+++ b/math/mathcore/inc/Fit/BasicFCN.h
@@ -13,13 +13,9 @@
#ifndef ROOT_Fit_BasicFCN
#define ROOT_Fit_BasicFCN
-#ifndef ROOT_Math_FitMethodFunction
#include "Math/FitMethodFunction.h"
-#endif
-#ifndef ROOT_Math_IParamFunction
#include "Math/IParamFunction.h"
-#endif
#include "Math/IParamFunctionfwd.h"
diff --git a/math/mathcore/inc/Fit/BinData.h b/math/mathcore/inc/Fit/BinData.h
index 14d2cd2f582c5aaebcd6a194adf5206df3e67b74..8d4bf459bb8f4578145b51128af13984e602b348 100644
--- a/math/mathcore/inc/Fit/BinData.h
+++ b/math/mathcore/inc/Fit/BinData.h
@@ -13,16 +13,12 @@
#ifndef ROOT_Fit_BinData
#define ROOT_Fit_BinData
-#ifndef ROOT_Fit_DataVector
#include "Fit/DataVector.h"
-#endif
#ifdef USE_BINPOINT_CLASS
-#ifndef ROOT_Fit_BinPoint
#include "Fit/BinPoint.h"
-#endif
#endif
diff --git a/math/mathcore/inc/Fit/Chi2FCN.h b/math/mathcore/inc/Fit/Chi2FCN.h
index c72be93fb9f48b68c989d60a2e763ceb2e364f5d..5b90b746dfd8c77646675ec573694c9fae3813ec 100644
--- a/math/mathcore/inc/Fit/Chi2FCN.h
+++ b/math/mathcore/inc/Fit/Chi2FCN.h
@@ -13,33 +13,23 @@
#ifndef ROOT_Fit_Chi2FCN
#define ROOT_Fit_Chi2FCN
-#ifndef ROOT_Fit_BasicFCN
#include "Fit/BasicFCN.h"
-#endif
-#ifndef ROOT_Math_IParamFunction
#include "Math/IParamFunction.h"
-#endif
#include "Math/IFunction.h"
#include "Math/IFunctionfwd.h"
-#ifndef ROOT_Fit_BinData
#include "Fit/BinData.h"
-#endif
-#ifndef ROOT_Fit_FitUtil
#include "Fit/FitUtil.h"
-#endif
//#define ROOT_FIT_PARALLEL
#ifdef ROOT_FIT_PARALLEL
-#ifndef ROOT_Fit_FitUtilParallel
#include "Fit/FitUtilParallel.h"
#endif
-#endif
#include <memory>
diff --git a/math/mathcore/inc/Fit/DataVector.h b/math/mathcore/inc/Fit/DataVector.h
index 80229403a111745bb2940c4dc27926418690c794..b7cffe88d7b9ea40fe044e341cbb3e440bbbf6a9 100644
--- a/math/mathcore/inc/Fit/DataVector.h
+++ b/math/mathcore/inc/Fit/DataVector.h
@@ -26,14 +26,10 @@ Classes for describing the input data for fitting
// #include "Fit/DataVectorfwd.h"
// #endif
-#ifndef ROOT_Fit_DataOptions
#include "Fit/DataOptions.h"
-#endif
-#ifndef ROOT_Fit_DataRange
#include "Fit/DataRange.h"
-#endif
#include <vector>
diff --git a/math/mathcore/inc/Fit/FcnAdapter.h b/math/mathcore/inc/Fit/FcnAdapter.h
index 76ef1f0c07e83fe06d2ba80486d7aaf910304c91..d1378dac000e4f1e5cf582553cc1bf9edc4e5b10 100644
--- a/math/mathcore/inc/Fit/FcnAdapter.h
+++ b/math/mathcore/inc/Fit/FcnAdapter.h
@@ -10,9 +10,7 @@
#ifndef ROOT_Fit_FcnAdapter_H_
#define ROOT_Fit_FcnAdapter_H_
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
//___________________________________________________________
diff --git a/math/mathcore/inc/Fit/FitConfig.h b/math/mathcore/inc/Fit/FitConfig.h
index a8839c1ac9a7a12bb013c72f4c6826a6cf6b309b..9f5961163e74efa6ec612bca1cd10e5979935213 100644
--- a/math/mathcore/inc/Fit/FitConfig.h
+++ b/math/mathcore/inc/Fit/FitConfig.h
@@ -14,17 +14,11 @@
#define ROOT_Fit_FitConfig
-#ifndef ROOT_Fit_ParameterSettings
#include "Fit/ParameterSettings.h"
-#endif
-#ifndef ROOT_Math_MinimizerOptions
#include "Math/MinimizerOptions.h"
-#endif
-#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
#include <vector>
diff --git a/math/mathcore/inc/Fit/FitResult.h b/math/mathcore/inc/Fit/FitResult.h
index 16f7ca00b88640dc355bb27bc88c7b5b9775a04a..f89a74df42e4b8066d2a88b0d636611dcdd23996 100644
--- a/math/mathcore/inc/Fit/FitResult.h
+++ b/math/mathcore/inc/Fit/FitResult.h
@@ -13,12 +13,8 @@
#ifndef ROOT_Fit_FitResult
#define ROOT_Fit_FitResult
-#ifndef ROOT_Fit_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Fit_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
#include <vector>
#include <map>
diff --git a/math/mathcore/inc/Fit/FitUtil.h b/math/mathcore/inc/Fit/FitUtil.h
index b0de43cef30a0b9e41521f5f0bfdc5cf63e5aaa9..32d2a866a81315a89ed5b3cb83c0af83e5be2ccb 100644
--- a/math/mathcore/inc/Fit/FitUtil.h
+++ b/math/mathcore/inc/Fit/FitUtil.h
@@ -13,13 +13,9 @@
#ifndef ROOT_Fit_FitUtil
#define ROOT_Fit_FitUtil
-#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
-#ifndef ROOT_Fit_DataVectorfwd
#include "Fit/DataVectorfwd.h"
-#endif
namespace ROOT {
diff --git a/math/mathcore/inc/Fit/FitUtilParallel.h b/math/mathcore/inc/Fit/FitUtilParallel.h
index 2fd8e7c40dfefbd84fc9bd2e655b398aa1cf579b..23e8c32699eeb5c2eacce92a06c8caec20ecf862 100644
--- a/math/mathcore/inc/Fit/FitUtilParallel.h
+++ b/math/mathcore/inc/Fit/FitUtilParallel.h
@@ -22,13 +22,9 @@
#ifdef ROOT_FIT_PARALLEL
-#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
-#ifndef ROOT_Fit_DataVectorfwd
#include "Fit/DataVectorfwd.h"
-#endif
namespace ROOT {
diff --git a/math/mathcore/inc/Fit/Fitter.h b/math/mathcore/inc/Fit/Fitter.h
index ce410be1a89b2179a3a4e2f89c8a94d239d158bd..90bcd16cd7cd4381d482fb760f2e0c5073ef9e56 100644
--- a/math/mathcore/inc/Fit/Fitter.h
+++ b/math/mathcore/inc/Fit/Fitter.h
@@ -25,24 +25,14 @@ Classes used for fitting (regression analysis) and estimation of parameter value
// #ifndef ROOT_Fit_DataVectorfwd
// #include "Fit/DataVectorfwd.h"
// #endif
-#ifndef ROOT_Fit_BinData
#include "Fit/BinData.h"
-#endif
-#ifndef ROOT_Fit_UnBinData
#include "Fit/UnBinData.h"
-#endif
-#ifndef ROOT_Fit_FitConfig
#include "Fit/FitConfig.h"
-#endif
-#ifndef ROOT_Fit_FitResult
#include "Fit/FitResult.h"
-#endif
-#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
#include <memory>
@@ -530,9 +520,7 @@ bool Fitter::GetDataFromFCN() {
#ifndef __CINT__
-#ifndef ROOT_Math_WrappedFunction
#include "Math/WrappedFunction.h"
-#endif
template<class Function>
bool ROOT::Fit::Fitter::FitFCN(unsigned int npar, Function & f, const double * par, unsigned int datasize,bool chi2fit) {
diff --git a/math/mathcore/inc/Fit/LogLikelihoodFCN.h b/math/mathcore/inc/Fit/LogLikelihoodFCN.h
index 885d6d4d1fee73ef3eb1063e914081e3258aa424..8ec04665c32ee1ac8bdf8f01055b54c04d7634c9 100644
--- a/math/mathcore/inc/Fit/LogLikelihoodFCN.h
+++ b/math/mathcore/inc/Fit/LogLikelihoodFCN.h
@@ -13,27 +13,17 @@
#ifndef ROOT_Fit_LogLikelihoodFCN
#define ROOT_Fit_LogLikelihoodFCN
-#ifndef ROOT_Fit_BasicFCN
#include "Fit/BasicFCN.h"
-#endif
-#ifndef ROOT_Math_IParamFunction
#include "Math/IParamFunction.h"
-#endif
-#ifndef ROOT_Fit_UnBinData
#include "Fit/UnBinData.h"
-#endif
-#ifndef ROOT_Fit_FitUtil
#include "Fit/FitUtil.h"
-#endif
#ifdef ROOT_FIT_PARALLEL
-#ifndef ROOT_Fit_FitUtilParallel
#include "Fit/FitUtilParallel.h"
#endif
-#endif
#include <memory>
diff --git a/math/mathcore/inc/Fit/ParameterSettings.h b/math/mathcore/inc/Fit/ParameterSettings.h
index 131d4c9d7aca1ed24f79727f5346707571a222fd..f4423f628b9124714532bd51d521d3b2549f3a6b 100644
--- a/math/mathcore/inc/Fit/ParameterSettings.h
+++ b/math/mathcore/inc/Fit/ParameterSettings.h
@@ -15,9 +15,7 @@
#include <string>
-#ifndef ROOT_Math_Error
#include "Math/Error.h"
-#endif
namespace ROOT {
diff --git a/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h b/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h
index e98f5ba81ed31b40fef9449916f99ea2c3eeb3dd..ba3402629880a5bc509f64ed9552701fd7e54db2 100644
--- a/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h
+++ b/math/mathcore/inc/Fit/PoissonLikelihoodFCN.h
@@ -13,21 +13,13 @@
#ifndef ROOT_Fit_PoissonLikelihoodFCN
#define ROOT_Fit_PoissonLikelihoodFCN
-#ifndef ROOT_Fit_BasicFCN
#include "Fit/BasicFCN.h"
-#endif
-#ifndef ROOT_Math_IParamFunction
#include "Math/IParamFunction.h"
-#endif
-#ifndef ROOT_Fit_BinData
#include "Fit/BinData.h"
-#endif
-#ifndef ROOT_Fit_FitUtil
#include "Fit/FitUtil.h"
-#endif
#include <memory>
diff --git a/math/mathcore/inc/Fit/SparseData.h b/math/mathcore/inc/Fit/SparseData.h
index 148784d66c74d9c4dfbd99360ae66010882320e3..b06a6dd6f54a084f8fe48abb281d047bf4b034d3 100644
--- a/math/mathcore/inc/Fit/SparseData.h
+++ b/math/mathcore/inc/Fit/SparseData.h
@@ -15,12 +15,8 @@
#include <vector>
-#ifndef ROOT_Fit_DataVector
#include "Fit/DataVector.h"
-#endif
-#ifndef ROOT_Fit_BinData
#include "Fit/BinData.h"
-#endif
namespace ROOT {
diff --git a/math/mathcore/inc/Fit/UnBinData.h b/math/mathcore/inc/Fit/UnBinData.h
index ea5d6acceb8b2eb549a79adb7bab44ecced403f7..af3b38b678fc065c80f126fdc855753f2866cd8d 100644
--- a/math/mathcore/inc/Fit/UnBinData.h
+++ b/math/mathcore/inc/Fit/UnBinData.h
@@ -13,13 +13,9 @@
#ifndef ROOT_Fit_UnBinData
#define ROOT_Fit_UnBinData
-#ifndef ROOT_Fit_DataVector
#include "Fit/DataVector.h"
-#endif
-#ifndef ROOT_Math_Error
#include "Math/Error.h"
-#endif
diff --git a/math/mathcore/inc/Math/AdaptiveIntegratorMultiDim.h b/math/mathcore/inc/Math/AdaptiveIntegratorMultiDim.h
index 41bfde3b659e4464ad7f5f1c45194107996d3cbe..d14e5f41af9f701cf3afa1d9b564624865ea3896 100644
--- a/math/mathcore/inc/Math/AdaptiveIntegratorMultiDim.h
+++ b/math/mathcore/inc/Math/AdaptiveIntegratorMultiDim.h
@@ -14,9 +14,7 @@
#ifndef ROOT_Math_AdaptiveIntegratorMultiDim
#define ROOT_Math_AdaptiveIntegratorMultiDim
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
#include "Math/VirtualIntegrator.h"
diff --git a/math/mathcore/inc/Math/BasicMinimizer.h b/math/mathcore/inc/Math/BasicMinimizer.h
index 6c2dfbbdf7ee7fbafb3056f1f3a2f80ad84f7f22..0577c7eece1ecf26fc406a003b1798d197e705d8 100644
--- a/math/mathcore/inc/Math/BasicMinimizer.h
+++ b/math/mathcore/inc/Math/BasicMinimizer.h
@@ -14,18 +14,12 @@
#ifndef ROOT_Math_BasicMinimizer
#define ROOT_Math_BasicMinimizer
-#ifndef ROOT_Math_Minimizer
#include "Math/Minimizer.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
#ifndef ROOT_Math_MinimTransformVariable
#include "Math/MinimTransformVariable.h"
diff --git a/math/mathcore/inc/Math/BrentMethods.h b/math/mathcore/inc/Math/BrentMethods.h
index 9395828757558692aa6eda00996c71cf89639540..c1c90a666684029d7866ee23645fd7e58f040fdb 100644
--- a/math/mathcore/inc/Math/BrentMethods.h
+++ b/math/mathcore/inc/Math/BrentMethods.h
@@ -1,9 +1,7 @@
#ifndef ROOT_Math_BrentMethods
#define ROOT_Math_BrentMethods
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
namespace ROOT {
diff --git a/math/mathcore/inc/Math/BrentMinimizer1D.h b/math/mathcore/inc/Math/BrentMinimizer1D.h
index 89ccf824d63fe6b2becf73ba2d80687bc0072668..e4884382d10eb5b6b42a3d558cb27a1b529ff214 100644
--- a/math/mathcore/inc/Math/BrentMinimizer1D.h
+++ b/math/mathcore/inc/Math/BrentMinimizer1D.h
@@ -31,13 +31,9 @@
#ifndef ROOT_Math_BrentMinimizer1D
#define ROOT_Math_BrentMinimizer1D
-#ifndef ROOT_Math_IMinimizer1D
#include "Math/IMinimizer1D.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
namespace ROOT {
diff --git a/math/mathcore/inc/Math/BrentRootFinder.h b/math/mathcore/inc/Math/BrentRootFinder.h
index a864241aa35b8f4c245dedc6d87c82980fb01443..9cabdd3b57733abb9042e6406b3a348a27b9594c 100644
--- a/math/mathcore/inc/Math/BrentRootFinder.h
+++ b/math/mathcore/inc/Math/BrentRootFinder.h
@@ -30,13 +30,9 @@
#ifndef ROOT_Math_BrentRootFinder
#define ROOT_Math_BrentRootFinder
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_IRootFinderMethod
#include "Math/IRootFinderMethod.h"
-#endif
namespace ROOT {
namespace Math {
diff --git a/math/mathcore/inc/Math/Delaunay2D.h b/math/mathcore/inc/Math/Delaunay2D.h
index 472bdedb4ce9f0991747960710d8ed5d58a847b0..3713182ed48ca3802ebf085388dc92ab53765c5f 100644
--- a/math/mathcore/inc/Math/Delaunay2D.h
+++ b/math/mathcore/inc/Math/Delaunay2D.h
@@ -21,9 +21,7 @@
//#define THREAD_SAFE
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
#include <map>
#include <vector>
diff --git a/math/mathcore/inc/Math/DistFunc.h b/math/mathcore/inc/Math/DistFunc.h
index 08a2b64bbdbed63c9b11a28bfcba7d9a4fc1ece0..ad0f59fa5b185276500a268c3182fd13dca90dae 100644
--- a/math/mathcore/inc/Math/DistFunc.h
+++ b/math/mathcore/inc/Math/DistFunc.h
@@ -18,35 +18,25 @@
#define ROOT_Math_DistFunc
-#ifndef ROOT_RConfigure
#include "RConfigure.h"
-#endif
// pdf functions from MathCore
-#ifndef ROOT_Math_PdfFuncMathCore
#include "Math/PdfFuncMathCore.h"
-#endif
// all cdf are in MathCore now
-#ifndef ROOT_Math_ProbFuncMathCore
#include "Math/ProbFuncMathCore.h"
-#endif
//quantiles functions from mathcore
-#ifndef ROOT_Math_QuantFuncMathCore
#include "Math/QuantFuncMathCore.h"
-#endif
// include distributions from MathMore when is there
#ifdef R__HAS_MATHMORE
// // extra pdf functions from MathMore
-#ifndef ROOT_Math_PdfFuncMathMore
#include "Math/PdfFuncMathMore.h"
-#endif
// no -more extra cdf in MathMore
// #ifndef ROOT_Math_ProbFuncMathMore
@@ -54,9 +44,7 @@
// #endif
// inverse (quantiles) are all in mathmore
-#ifndef ROOT_Math_QuantFuncMathMore
#include "Math/QuantFuncMathMore.h"
-#endif
#endif
diff --git a/math/mathcore/inc/Math/DistFuncMathCore.h b/math/mathcore/inc/Math/DistFuncMathCore.h
index 7b425242845aeac62a64742bd561ea98f891f447..be9df9282a6196db9563b3dc3588d03104f3ea05 100644
--- a/math/mathcore/inc/Math/DistFuncMathCore.h
+++ b/math/mathcore/inc/Math/DistFuncMathCore.h
@@ -14,19 +14,13 @@
// pdf functions from Mathcore
-#ifndef ROOT_Math_PdfFuncMathCore
#include "Math/PdfFuncMathCore.h"
-#endif
// cdf from mathcore
-#ifndef ROOT_Math_ProbFuncMathCore
#include "Math/ProbFuncMathCore.h"
-#endif
// quantile functions from mathcore
-#ifndef ROOT_Math_QuantFuncMathCore
#include "Math/QuantFuncMathCore.h"
-#endif
#endif // ROOT_Math_DistFunc
diff --git a/math/mathcore/inc/Math/DistSampler.h b/math/mathcore/inc/Math/DistSampler.h
index 79cd8f47a1f401edb5658e60aea85bb03a9d65f4..f51a823b88b9a7b3a18102739a18422e18077629 100644
--- a/math/mathcore/inc/Math/DistSampler.h
+++ b/math/mathcore/inc/Math/DistSampler.h
@@ -13,13 +13,9 @@
#ifndef ROOT_Math_DistSampler
#define ROOT_Math_DistSampler
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_WrappedFunction
#include "Math/WrappedFunction.h"
-#endif
#include <vector>
#include <cassert>
diff --git a/math/mathcore/inc/Math/FitMethodFunction.h b/math/mathcore/inc/Math/FitMethodFunction.h
index e8fade98e2333ee38393799520178749fff6036d..1e5567e32b4663908f5ced6bd0b314d7c317fe25 100644
--- a/math/mathcore/inc/Math/FitMethodFunction.h
+++ b/math/mathcore/inc/Math/FitMethodFunction.h
@@ -13,9 +13,7 @@
#ifndef ROOT_Math_FitMethodFunction
#define ROOT_Math_FitMethodFunction
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
// #ifndef ROOT_Math_IParamFunctionfwd
// #include "Math/IParamFunctionfwd.h"
diff --git a/math/mathcore/inc/Math/Functor.h b/math/mathcore/inc/Math/Functor.h
index eed48ba96e6a03a295c3e94ef12cfbed7b680eb8..6cda5baf2eb72ca2a474ff9dc929b0414e5f76fd 100644
--- a/math/mathcore/inc/Math/Functor.h
+++ b/math/mathcore/inc/Math/Functor.h
@@ -14,9 +14,7 @@
#ifndef ROOT_Math_Functor
#define ROOT_Math_Functor
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
// #ifndef Root_Math_StaticCheck
// #include "Math/StaticCheck.h"
diff --git a/math/mathcore/inc/Math/GaussIntegrator.h b/math/mathcore/inc/Math/GaussIntegrator.h
index d90b47dbf0d5f4d8c46eee15d64ec85439c9f79a..dbc619236cb90a12775d441a92fb65c58da51969 100644
--- a/math/mathcore/inc/Math/GaussIntegrator.h
+++ b/math/mathcore/inc/Math/GaussIntegrator.h
@@ -16,13 +16,9 @@
#ifndef ROOT_Math_GaussIntegrator
#define ROOT_Math_GaussIntegrator
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
-#ifndef ROOT_Math_VirtualIntegrator
#include "Math/VirtualIntegrator.h"
-#endif
namespace ROOT {
diff --git a/math/mathcore/inc/Math/GaussLegendreIntegrator.h b/math/mathcore/inc/Math/GaussLegendreIntegrator.h
index f8976a6edc49b07ec59b6d1364e52c0f08e0e3c9..9a08c712c2977cd57eb13350a57f7deb0222e1a6 100644
--- a/math/mathcore/inc/Math/GaussLegendreIntegrator.h
+++ b/math/mathcore/inc/Math/GaussLegendreIntegrator.h
@@ -17,9 +17,7 @@
#define ROOT_Math_GaussLegendreIntegrator
-#ifndef ROOT_Math_GaussIntegrator
#include "Math/GaussIntegrator.h"
-#endif
namespace ROOT {
diff --git a/math/mathcore/inc/Math/GenAlgoOptions.h b/math/mathcore/inc/Math/GenAlgoOptions.h
index d880f7edaffad988cec8f062e023159e5f27b430..0fd7b3027f0640d2385558584f3e04375f7ee301 100644
--- a/math/mathcore/inc/Math/GenAlgoOptions.h
+++ b/math/mathcore/inc/Math/GenAlgoOptions.h
@@ -12,9 +12,7 @@
#define ROOT_Math_GenAlgoOptions
-#ifndef ROOT_Math_IOptions
#include "Math/IOptions.h"
-#endif
#include <map>
#include <iomanip>
diff --git a/math/mathcore/inc/Math/IFunction.h b/math/mathcore/inc/Math/IFunction.h
index 533aabc0db0d42c54d1520423e272b03de29099f..a7f125a114a78fbf97c307d328acd73d13218013 100644
--- a/math/mathcore/inc/Math/IFunction.h
+++ b/math/mathcore/inc/Math/IFunction.h
@@ -32,9 +32,7 @@
*/
//typedefs and tags definitions
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
namespace ROOT {
diff --git a/math/mathcore/inc/Math/IOptions.h b/math/mathcore/inc/Math/IOptions.h
index 9a744b0a500d2798b0f86c75e46e1bf10571789c..7dd47cb37ae9d6e76e31e45eac2da17b15224e6a 100644
--- a/math/mathcore/inc/Math/IOptions.h
+++ b/math/mathcore/inc/Math/IOptions.h
@@ -12,9 +12,7 @@
#define ROOT_Math_IOptions
-#ifndef ROOT_Math_Error
#include "Math/Error.h"
-#endif
#include <iostream>
diff --git a/math/mathcore/inc/Math/IParamFunction.h b/math/mathcore/inc/Math/IParamFunction.h
index 2c3fdda1ba9c39ddbbc6007b32206aba2350291d..8c210c58f4d9b2e7ad78f6d6fb97b32aafe83f28 100644
--- a/math/mathcore/inc/Math/IParamFunction.h
+++ b/math/mathcore/inc/Math/IParamFunction.h
@@ -13,17 +13,11 @@
#ifndef ROOT_Math_IParamFunction
#define ROOT_Math_IParamFunction
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
-#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_Util
#include "Math/Util.h"
-#endif
#include <cassert>
diff --git a/math/mathcore/inc/Math/IParamFunctionfwd.h b/math/mathcore/inc/Math/IParamFunctionfwd.h
index 082d2b121745009c2ac1e3146e862ec6d99d77a9..659d2a784184edff5ab491acbb0ce73cd2c47e0d 100644
--- a/math/mathcore/inc/Math/IParamFunctionfwd.h
+++ b/math/mathcore/inc/Math/IParamFunctionfwd.h
@@ -13,9 +13,7 @@
#ifndef ROOT_Math_IParamFunctionfwd
#define ROOT_Math_IParamFunctionfwd
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
namespace ROOT {
diff --git a/math/mathcore/inc/Math/IRootFinderMethod.h b/math/mathcore/inc/Math/IRootFinderMethod.h
index 6de86add5726682b0397712a9028a62517279b25..f8af08ee4929a81e489b3fea7d053a7aaa7d9bd9 100644
--- a/math/mathcore/inc/Math/IRootFinderMethod.h
+++ b/math/mathcore/inc/Math/IRootFinderMethod.h
@@ -16,13 +16,9 @@
#ifndef ROOT_Math_IRootFinderMethod
#define ROOT_Math_IRootFinderMethod
-#ifndef ROOT_Math_Error
#include "Math/Error.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
namespace ROOT {
namespace Math {
diff --git a/math/mathcore/inc/Math/Integrator.h b/math/mathcore/inc/Math/Integrator.h
index 82ed94c92067e68ab5990d342748dd12f4bc5b69..c7e6aa07e3777147dbae4fe4e82c7893b7191b4f 100644
--- a/math/mathcore/inc/Math/Integrator.h
+++ b/math/mathcore/inc/Math/Integrator.h
@@ -14,21 +14,13 @@
#ifndef ROOT_Math_Integrator
#define ROOT_Math_Integrator
-#ifndef ROOT_Math_AllIntegrationTypes
#include "Math/AllIntegrationTypes.h"
-#endif
-#ifndef ROOT_Math_IntegratorOptions
#include "Math/IntegratorOptions.h"
-#endif
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
-#ifndef ROOT_Math_VirtualIntegrator
#include "Math/VirtualIntegrator.h"
-#endif
#include <memory>
@@ -491,9 +483,7 @@ private:
#ifndef __CINT__
-#ifndef ROOT_Math_WrappedFunction
#include "Math/WrappedFunction.h"
-#endif
template<class Function>
void ROOT::Math::IntegratorOneDim::SetFunction( Function & f) {
diff --git a/math/mathcore/inc/Math/IntegratorMultiDim.h b/math/mathcore/inc/Math/IntegratorMultiDim.h
index c27c4ba142e0aa4437997b5d8598bd9dc7e9f993..82447f866cd4d882f8343822bc15a37888d2640e 100644
--- a/math/mathcore/inc/Math/IntegratorMultiDim.h
+++ b/math/mathcore/inc/Math/IntegratorMultiDim.h
@@ -15,27 +15,17 @@
#define ROOT_Math_IntegratorMultiDim
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_IntegrationTypes
#include "Math/AllIntegrationTypes.h"
-#endif
-#ifndef ROOT_Math_IntegratorOptions
#include "Math/IntegratorOptions.h"
-#endif
-#ifndef ROOT_Math_VirtualIntegrator
#include "Math/VirtualIntegrator.h"
-#endif
#ifndef __CINT__
-#ifndef ROOT_Math_WrappedFunction
#include "Math/WrappedFunction.h"
-#endif
#endif
diff --git a/math/mathcore/inc/Math/IntegratorOptions.h b/math/mathcore/inc/Math/IntegratorOptions.h
index 03c9470d831d34391be5a5fa918e2d7c3ec57f41..91395cec8bbe9d4600620ef975c3dddc9967ce60 100644
--- a/math/mathcore/inc/Math/IntegratorOptions.h
+++ b/math/mathcore/inc/Math/IntegratorOptions.h
@@ -11,9 +11,7 @@
#ifndef ROOT_Math_IntegratorOptions
#define ROOT_Math_IntegratorOptions
-#ifndef ROOT_Math_AllIntegrationTypes
#include "Math/AllIntegrationTypes.h"
-#endif
#include <string>
#include <iostream>
diff --git a/math/mathcore/inc/Math/MersenneTwisterEngine.h b/math/mathcore/inc/Math/MersenneTwisterEngine.h
index 7ed11ba12f40957732ebfcb59ef88baa29f99da8..9944bd21d752862ac26ff097afdd150815e49132 100644
--- a/math/mathcore/inc/Math/MersenneTwisterEngine.h
+++ b/math/mathcore/inc/Math/MersenneTwisterEngine.h
@@ -13,9 +13,7 @@
#ifndef ROOT_Math_MersenneTwisterEngine
#define ROOT_Math_MersenneTwisterEngine
-#ifndef ROOT_Math_TRandomEngine
#include "Math/TRandomEngine.h"
-#endif
#include <cstdint>
#include <vector>
diff --git a/math/mathcore/inc/Math/MinimTransformFunction.h b/math/mathcore/inc/Math/MinimTransformFunction.h
index 59410da37e82c91dc83e08a15c67043642083860..6bd50bb70e09ffed0a5d9db68a77ce67d831ded5 100644
--- a/math/mathcore/inc/Math/MinimTransformFunction.h
+++ b/math/mathcore/inc/Math/MinimTransformFunction.h
@@ -15,9 +15,7 @@
#define ROOT_Math_MinimTransformFunction
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
#ifndef ROOT_Math_MinimTransformVariable
#include "Math/MinimTransformVariable.h"
diff --git a/math/mathcore/inc/Math/MinimTransformVariable.h b/math/mathcore/inc/Math/MinimTransformVariable.h
index 715c2a2a9927e1750acb86867641b2856715a2ec..5e4b45f31e617933393d9f90f6bbaa922f44fb29 100644
--- a/math/mathcore/inc/Math/MinimTransformVariable.h
+++ b/math/mathcore/inc/Math/MinimTransformVariable.h
@@ -12,9 +12,7 @@
#ifndef ROOT_Math_MinimizerVariable
#define ROOT_Math_MinimizerVariable
-#ifndef ROOT_Math_MinimizerVariableTransformation
#include "MinimizerVariableTransformation.h"
-#endif
#include <memory>
diff --git a/math/mathcore/inc/Math/Minimizer.h b/math/mathcore/inc/Math/Minimizer.h
index abdb60367eb56e09cd4ffc49575555dde00d3af5..92d362e98b70c909393fce2bbc198b2f74617990 100644
--- a/math/mathcore/inc/Math/Minimizer.h
+++ b/math/mathcore/inc/Math/Minimizer.h
@@ -13,21 +13,13 @@
#ifndef ROOT_Math_Minimizer
#define ROOT_Math_Minimizer
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
-#ifndef ROOT_Math_MinimizerOptions
#include "Math/MinimizerOptions.h"
-#endif
-#ifndef ROOT_Math_Util
#include "Math/Util.h"
-#endif
-#ifndef ROOT_Math_Error
#include "Math/Error.h"
-#endif
diff --git a/math/mathcore/inc/Math/MixMaxEngine.h b/math/mathcore/inc/Math/MixMaxEngine.h
index 0a2051dcbb91317b76e974441712983d2849ef6c..2339939ecde3ec2a5659df3fa81987756bd483df 100644
--- a/math/mathcore/inc/Math/MixMaxEngine.h
+++ b/math/mathcore/inc/Math/MixMaxEngine.h
@@ -17,9 +17,7 @@
#include <vector>
#include <string>
-#ifndef ROOT_Math_TRandomEngine
#include "Math/TRandomEngine.h"
-#endif
// struct rng_state_st; /// forward declare generator state
diff --git a/math/mathcore/inc/Math/MultiDimParamFunctionAdapter.h b/math/mathcore/inc/Math/MultiDimParamFunctionAdapter.h
index 05f7718f08552cb62642eed3a101e7784b5f8d66..0241017c21326b4e6f363f4205ec10a78d45e91e 100644
--- a/math/mathcore/inc/Math/MultiDimParamFunctionAdapter.h
+++ b/math/mathcore/inc/Math/MultiDimParamFunctionAdapter.h
@@ -13,16 +13,10 @@
#ifndef ROOT_Math_MultiDimParamFunctionAdapter
#define ROOT_Math_MultiDimParamFunctionAdapter
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
-#ifndef ROOT_Math_IParamFunction
#include "Math/IParamFunction.h"
-#endif
-#ifndef ROOT_Math_WrappedFunction
#include "Math/WrappedFunction.h"
-#endif
#include <cassert>
diff --git a/math/mathcore/inc/Math/OneDimFunctionAdapter.h b/math/mathcore/inc/Math/OneDimFunctionAdapter.h
index e4674552e15697c155550465c85d65152f6a8922..77ef4f669ed23110dfe356fa1f89c9d4d5c444ed 100644
--- a/math/mathcore/inc/Math/OneDimFunctionAdapter.h
+++ b/math/mathcore/inc/Math/OneDimFunctionAdapter.h
@@ -13,12 +13,8 @@
#ifndef ROOT_Math_OneDimFunctionAdapter
#define ROOT_Math_OneDimFunctionAdapter
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
-#ifndef ROOT_Math_IParamFunction
#include "Math/IParamFunction.h"
-#endif
#include <cassert>
diff --git a/math/mathcore/inc/Math/PdfFunc.h b/math/mathcore/inc/Math/PdfFunc.h
index c07d7a101fec46d93af4e506b8f190dd40121764..0c39097fcf99934faf5e11a726e8e54ff4a6bac7 100644
--- a/math/mathcore/inc/Math/PdfFunc.h
+++ b/math/mathcore/inc/Math/PdfFunc.h
@@ -19,14 +19,10 @@
#define ROOT_Math_PdfFunc
-#ifndef ROOT_RConfigure
#include "RConfigure.h"
-#endif
// all cdf are in mathcore now
-#ifndef ROOT_Math_PdfFuncMathCore
#include "Math/PdfFuncMathCore.h"
-#endif
// // include distributions from MathMore when is there
// #ifdef R__HAS_MATHMORE
diff --git a/math/mathcore/inc/Math/ProbFunc.h b/math/mathcore/inc/Math/ProbFunc.h
index 004be7bc7051c885435c6c90e81cff6b1de982ce..fe0a89ac1f8588aa7d4631adc0c9f3ccfa1ad861 100644
--- a/math/mathcore/inc/Math/ProbFunc.h
+++ b/math/mathcore/inc/Math/ProbFunc.h
@@ -19,15 +19,11 @@
#define ROOT_Math_ProbFunc
-#ifndef ROOT_RConfigure
#include "RConfigure.h"
-#endif
// all cdf are in MathCore others in mathmore
-#ifndef ROOT_Math_ProbFuncMathCore
#include "Math/ProbFuncMathCore.h"
-#endif
// include distributions from MathMore when is there
// #ifdef R__HAS_MATHMORE
diff --git a/math/mathcore/inc/Math/QuantFunc.h b/math/mathcore/inc/Math/QuantFunc.h
index d9607536e25477c4a061f5a037f6d42ee3d04f65..8d34219427bd0156157456f2ac62a495c3bec87c 100644
--- a/math/mathcore/inc/Math/QuantFunc.h
+++ b/math/mathcore/inc/Math/QuantFunc.h
@@ -19,23 +19,17 @@
#define ROOT_Math_QuantFunc
-#ifndef ROOT_RConfigure
#include "RConfigure.h"
-#endif
-#ifndef ROOT_Math_QuantFuncMathCore
#include "Math/QuantFuncMathCore.h"
-#endif
// include distributions from MathMore when is there
#ifdef R__HAS_MATHMORE
// extra quantiles in MathMore
-#ifndef ROOT_Math_QuantFuncMathMore
#include "Math/QuantFuncMathMore.h"
-#endif
#endif
diff --git a/math/mathcore/inc/Math/RootFinder.h b/math/mathcore/inc/Math/RootFinder.h
index e5850ebc0fbafccd2bcbef1a2b72e74ffac0be79..b96fe7e5dfeec66ed6ee9276e2dd7d665056c798 100644
--- a/math/mathcore/inc/Math/RootFinder.h
+++ b/math/mathcore/inc/Math/RootFinder.h
@@ -32,13 +32,9 @@
#define ROOT_Math_RootFinder
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_IRootFinderMethod
#include "Math/IRootFinderMethod.h"
-#endif
/**
@@ -221,13 +217,9 @@ namespace ROOT {
} // namespace ROOT
-#ifndef ROOT_Math_WrappedFunction
#include "Math/WrappedFunction.h"
-#endif
-#ifndef ROOT_Math_Functor
#include "Math/Functor.h"
-#endif
template<class Function, class Derivative>
bool ROOT::Math::RootFinder::Solve(Function &f, Derivative &d, double start,
diff --git a/math/mathcore/inc/Math/SpecFunc.h b/math/mathcore/inc/Math/SpecFunc.h
index bdb4d649431fcc9bb1a9845e374377fe1974e32c..b10b8cda789bd0f057b4b738d5479cd94c8cd821 100644
--- a/math/mathcore/inc/Math/SpecFunc.h
+++ b/math/mathcore/inc/Math/SpecFunc.h
@@ -20,22 +20,16 @@
#define ROOT_Math_SpecFunc
-#ifndef ROOT_RConfigure
#include "RConfigure.h"
-#endif
-#ifndef ROOT_Math_SpecFuncMathCore
#include "Math/SpecFuncMathCore.h"
-#endif
#ifdef R__HAS_MATHMORE
// in case Mathmore exists include their GSL based special functions
-#ifndef ROOT_Math_SpecFuncMathMore
#include "Math/SpecFuncMathMore.h"
-#endif
#endif
diff --git a/math/mathcore/inc/Math/VirtualIntegrator.h b/math/mathcore/inc/Math/VirtualIntegrator.h
index 1ae41c74a5e356e13144f2e2768c0a2f94543b82..a67bc5d0227c7b68dd84c643a64007d22b32afe6 100644
--- a/math/mathcore/inc/Math/VirtualIntegrator.h
+++ b/math/mathcore/inc/Math/VirtualIntegrator.h
@@ -14,17 +14,11 @@
#ifndef ROOT_Math_VirtualIntegrator
#define ROOT_Math_VirtualIntegrator
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_Error
#include "Math/Error.h"
-#endif
-#ifndef ROOT_Math_IntegratorOptions
#include "Math/IntegratorOptions.h"
-#endif
#include <vector>
diff --git a/math/mathcore/inc/Math/WrappedFunction.h b/math/mathcore/inc/Math/WrappedFunction.h
index 4c48d645e60233dd8713ddce51acecc5a40f6967..73314010515c2a7b139ebae2734ba6b79bd689ae 100644
--- a/math/mathcore/inc/Math/WrappedFunction.h
+++ b/math/mathcore/inc/Math/WrappedFunction.h
@@ -25,9 +25,7 @@
#ifndef ROOT_Math_WrappedFunction
#define ROOT_Math_WrappedFunction
-#ifndef ROOT_Math_IFunction
#include "IFunction.h"
-#endif
namespace ROOT {
diff --git a/math/mathcore/inc/Math/WrappedParamFunction.h b/math/mathcore/inc/Math/WrappedParamFunction.h
index 1446f4ef2097e01e8d37a596a317a77ea7cb15e0..a4d5b6ac2f3bb9b55550fc5f8f020238a215cb41 100644
--- a/math/mathcore/inc/Math/WrappedParamFunction.h
+++ b/math/mathcore/inc/Math/WrappedParamFunction.h
@@ -13,9 +13,7 @@
#ifndef ROOT_Math_WrappedParamFunction
#define ROOT_Math_WrappedParamFunction
-#ifndef ROOT_Math_IParamFunction
#include "Math/IParamFunction.h"
-#endif
//#include <iostream>
//#include <iterator>
diff --git a/math/mathcore/inc/TComplex.h b/math/mathcore/inc/TComplex.h
index f164ad9a04ae6aa80755db066813409c96f93592..9831a3728c845e9f7a8b8627fa6f2db1cde2dcd2 100644
--- a/math/mathcore/inc/TComplex.h
+++ b/math/mathcore/inc/TComplex.h
@@ -18,9 +18,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
#include "Rtypes.h"
diff --git a/math/mathcore/inc/TKDTree.h b/math/mathcore/inc/TKDTree.h
index 7ca38c410568acfda4f5792b052a50f191ba2aa5..12b6ef19804c7adc1c489a4c9f864174b5cf5bb5 100644
--- a/math/mathcore/inc/TKDTree.h
+++ b/math/mathcore/inc/TKDTree.h
@@ -1,9 +1,7 @@
#ifndef ROOT_TKDTree
#define ROOT_TKDTree
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
#include "TMath.h"
#include <vector>
diff --git a/math/mathcore/inc/TKDTreeBinning.h b/math/mathcore/inc/TKDTreeBinning.h
index afdeaef224bd3c448b6818f6d75200df46a23b5c..e620f2566b2765caa26c214a4b8e7b2d35b1db33 100644
--- a/math/mathcore/inc/TKDTreeBinning.h
+++ b/math/mathcore/inc/TKDTreeBinning.h
@@ -18,9 +18,7 @@
#include <map>
#include <utility>
-#ifndef ROOT_TKDTree
#include "TKDTree.h"
-#endif
namespace ROOT {
namespace Fit {
diff --git a/math/mathcore/inc/TMath.h b/math/mathcore/inc/TMath.h
index 5a6a3655046d71c02abc29fad125759b2d7d0177..5479ee034144ce1681b07c1f4782ab52f29254e2 100644
--- a/math/mathcore/inc/TMath.h
+++ b/math/mathcore/inc/TMath.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TMathBase
#include "TMathBase.h"
-#endif
#include "TError.h"
#include <algorithm>
diff --git a/math/mathcore/inc/TRandom.h b/math/mathcore/inc/TRandom.h
index 6379e628b8e090653404218145d59ea52cdcaabb..d61ed6b54256728c9d964dcefcd7d1c5c487073d 100644
--- a/math/mathcore/inc/TRandom.h
+++ b/math/mathcore/inc/TRandom.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TRandom
#define ROOT_TRandom
-#ifndef ROOT_Math_TRandomEngine
#include "Math/TRandomEngine.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
@@ -24,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TRandom : public ROOT::Math::TRandomEngine, public TNamed {
diff --git a/math/mathcore/inc/TRandom1.h b/math/mathcore/inc/TRandom1.h
index 4caf5d1f7826c8fd9fbe2dc69021052cc8af5683..1800c41c28c1bfaaccc7b6471ef5ae4a904e11f8 100644
--- a/math/mathcore/inc/TRandom1.h
+++ b/math/mathcore/inc/TRandom1.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TRandom
#include "TRandom.h"
-#endif
class TRandom1 : public TRandom {
diff --git a/math/mathcore/inc/TRandom2.h b/math/mathcore/inc/TRandom2.h
index ab2cca177960c178535324883f8a3033d2191f51..20aba6ac43cb69b064ce85d6811f25b13efd6b6b 100644
--- a/math/mathcore/inc/TRandom2.h
+++ b/math/mathcore/inc/TRandom2.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TRandom
#include "TRandom.h"
-#endif
class TRandom2 : public TRandom {
diff --git a/math/mathcore/inc/TRandom3.h b/math/mathcore/inc/TRandom3.h
index 6c77906f7eab4bd5f925125d45a77efd2ed7f5da..25ac5abf4c80ac222e5a10587ba8d48eb047a09f 100644
--- a/math/mathcore/inc/TRandom3.h
+++ b/math/mathcore/inc/TRandom3.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TRandom
#include "TRandom.h"
-#endif
class TRandom3 : public TRandom {
diff --git a/math/mathcore/inc/TRandomGen.h b/math/mathcore/inc/TRandomGen.h
index 556cc40e380c065e01b08b8bb228867c77fdc528..9a14a76238099fcbe4430c300b3102d2525d63b3 100644
--- a/math/mathcore/inc/TRandomGen.h
+++ b/math/mathcore/inc/TRandomGen.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TRandom
#include "TRandom.h"
-#endif
template<class Engine>
class TRandomGen : public TRandom {
diff --git a/math/mathcore/inc/TStatistic.h b/math/mathcore/inc/TStatistic.h
index 717fc5739d5021f402382665f9eea4d63c42b3c2..c18fe734f934b336002a40b895eeacf84c225ab5 100644
--- a/math/mathcore/inc/TStatistic.h
+++ b/math/mathcore/inc/TStatistic.h
@@ -22,25 +22,15 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TCollection
#include "TCollection.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TROOT
#include "TROOT.h"
-#endif
class TStatistic : public TObject {
diff --git a/math/mathcore/src/BrentMethods.cxx b/math/mathcore/src/BrentMethods.cxx
index 608852cba68b6ccded438d112fbc5045caff939c..f16bf47652fec4ea82363f18ad5397d30b87c242 100644
--- a/math/mathcore/src/BrentMethods.cxx
+++ b/math/mathcore/src/BrentMethods.cxx
@@ -15,9 +15,7 @@
#include <cmath>
#include <algorithm>
-#ifndef ROOT_Math_Error
#include "Math/Error.h"
-#endif
#include <iostream>
diff --git a/math/mathcore/src/BrentMinimizer1D.cxx b/math/mathcore/src/BrentMinimizer1D.cxx
index 464a0b28f18c3f495f47a6a33963e68c9ebad121..c6237162c6a5f01516b05bb0512616ecef5f1cf0 100644
--- a/math/mathcore/src/BrentMinimizer1D.cxx
+++ b/math/mathcore/src/BrentMinimizer1D.cxx
@@ -32,9 +32,7 @@
#include "Math/IFunction.h"
#include "Math/IFunctionfwd.h"
-#ifndef ROOT_Math_Error
#include "Math/Error.h"
-#endif
namespace ROOT {
namespace Math {
diff --git a/math/mathcore/src/BrentRootFinder.cxx b/math/mathcore/src/BrentRootFinder.cxx
index ba8875181529245f94d39557baae1c479c61bf21..634c8d62f552ab95ec001490c0540e03ba108b32 100644
--- a/math/mathcore/src/BrentRootFinder.cxx
+++ b/math/mathcore/src/BrentRootFinder.cxx
@@ -13,9 +13,7 @@
#include "Math/IFunctionfwd.h"
#include <cmath>
-#ifndef ROOT_Math_Error
#include "Math/Error.h"
-#endif
namespace ROOT {
namespace Math {
diff --git a/math/mathcore/src/RichardsonDerivator.cxx b/math/mathcore/src/RichardsonDerivator.cxx
index 11eb66cbb63992ff83b85ab1d5262deca5131a1a..2704c7ae7ef8d3799a6996902976ac7291043298 100644
--- a/math/mathcore/src/RichardsonDerivator.cxx
+++ b/math/mathcore/src/RichardsonDerivator.cxx
@@ -13,9 +13,7 @@
#include <cmath>
#include <limits>
-#ifndef ROOT_Math_Error
#include "Math/Error.h"
-#endif
namespace ROOT {
namespace Math {
diff --git a/math/mathcore/src/RootFinder.cxx b/math/mathcore/src/RootFinder.cxx
index dbb1c3a1a2ec1ea067d01d4127b285df88ba93e2..347308608c42173d31d8bc1f37f57b85365e25fd 100644
--- a/math/mathcore/src/RootFinder.cxx
+++ b/math/mathcore/src/RootFinder.cxx
@@ -28,9 +28,7 @@
#include <cassert>
-#ifndef ROOT_Math_Error
#include "Math/Error.h"
-#endif
namespace ROOT {
namespace Math {
diff --git a/math/mathmore/inc/Math/ChebyshevApprox.h b/math/mathmore/inc/Math/ChebyshevApprox.h
index ac94c0f27f72dbd4c955a14d0e08da0e4be9fef8..3ee79ff8babc58c9ea1d8e82f59adce712f507b1 100644
--- a/math/mathmore/inc/Math/ChebyshevApprox.h
+++ b/math/mathmore/inc/Math/ChebyshevApprox.h
@@ -42,13 +42,9 @@
*/
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_GSLFunctionAdapter
#include "Math/GSLFunctionAdapter.h"
-#endif
#include <memory>
#include <cstddef>
diff --git a/math/mathmore/inc/Math/Derivator.h b/math/mathmore/inc/Math/Derivator.h
index f2c2c886ddc51e0736ac330627347d14a56365c3..628c38c79643945270b9a725ab679c58a893a5f4 100644
--- a/math/mathmore/inc/Math/Derivator.h
+++ b/math/mathmore/inc/Math/Derivator.h
@@ -34,13 +34,9 @@
#define ROOT_Math_Derivator
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
namespace ROOT {
diff --git a/math/mathmore/inc/Math/DistFuncMathMore.h b/math/mathmore/inc/Math/DistFuncMathMore.h
index 08b9356ebc15a54306d6538792ae007676302bff..4062af3a2279dda0f75c75c4e8ca4515d0b279e5 100644
--- a/math/mathmore/inc/Math/DistFuncMathMore.h
+++ b/math/mathmore/inc/Math/DistFuncMathMore.h
@@ -25,9 +25,7 @@
#ifndef ROOT_Math_DistFuncMathMore
#define ROOT_Math_DistFuncMathMore
-#ifndef ROOT_Math_PdfFuncMathMore
#include "Math/PdfFuncMathMore.h"
-#endif
// #ifndef ROOT_Math_ProbFuncMathMore
@@ -35,9 +33,7 @@
// #endif
// quantile functions from mathmore
-#ifndef ROOT_Math_QuantFuncMathMore
#include "Math/QuantFuncMathMore.h"
-#endif
diff --git a/math/mathmore/inc/Math/GSLIntegrator.h b/math/mathmore/inc/Math/GSLIntegrator.h
index 7aabcd5e834e518408d03010e5ff22c89fc1103d..9f061d98ba6bd33fe6acb13265b22e807f852441 100644
--- a/math/mathmore/inc/Math/GSLIntegrator.h
+++ b/math/mathmore/inc/Math/GSLIntegrator.h
@@ -32,24 +32,16 @@
#define ROOT_Math_GSLIntegrator
-#ifndef ROOT_Math_VirtualIntegrator
#include "Math/VirtualIntegrator.h"
-#endif
-#ifndef ROOT_Math_IntegrationTypes
#include "Math/IntegrationTypes.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_GSLFunctionAdapter
#include "Math/GSLFunctionAdapter.h"
-#endif
#include <vector>
diff --git a/math/mathmore/inc/Math/GSLMCIntegrator.h b/math/mathmore/inc/Math/GSLMCIntegrator.h
index d18c9a9e74bdcbd7aefd9a57967bb399b0b1f2f0..bf44d16c8a8ad4bfd6555f56b5a7e1898aed5996 100644
--- a/math/mathmore/inc/Math/GSLMCIntegrator.h
+++ b/math/mathmore/inc/Math/GSLMCIntegrator.h
@@ -29,31 +29,19 @@
#ifndef ROOT_Math_GSLMCIntegrator
#define ROOT_Math_GSLMCIntegrator
-#ifndef ROOT_Math_MCIntegrationTypes
#include "Math/MCIntegrationTypes.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
-#ifndef ROOT_Math_MCIntegrationTypes
#include "Math/MCIntegrationTypes.h"
-#endif
-#ifndef ROOT_Math_MCParameters
#include "Math/MCParameters.h"
-#endif
-#ifndef ROOT_Math_VirtualIntegrator
#include "Math/VirtualIntegrator.h"
-#endif
#include <iostream>
diff --git a/math/mathmore/inc/Math/GSLMinimizer.h b/math/mathmore/inc/Math/GSLMinimizer.h
index cac104ae61353c5848fa440c7554f1bacbd46667..3f55c46dd230d784fbe3ceeefb37b668241077c4 100644
--- a/math/mathmore/inc/Math/GSLMinimizer.h
+++ b/math/mathmore/inc/Math/GSLMinimizer.h
@@ -28,22 +28,14 @@
#ifndef ROOT_Math_GSLMinimizer
#define ROOT_Math_GSLMinimizer
-#ifndef ROOT_Math_Minimizer
#include "Math/Minimizer.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_BasicMinimizer
#include "Math/BasicMinimizer.h"
-#endif
#include <vector>
diff --git a/math/mathmore/inc/Math/GSLMultiRootFinder.h b/math/mathmore/inc/Math/GSLMultiRootFinder.h
index 076133cc7e119815280678c3e59c3aa3417dfdc1..77dcba408c06adfd2e1642219f0c3a263a7077a7 100644
--- a/math/mathmore/inc/Math/GSLMultiRootFinder.h
+++ b/math/mathmore/inc/Math/GSLMultiRootFinder.h
@@ -30,13 +30,9 @@
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
-#ifndef ROOT_Math_WrappedFunction
#include "Math/WrappedFunction.h"
-#endif
#include <vector>
diff --git a/math/mathmore/inc/Math/GSLNLSMinimizer.h b/math/mathmore/inc/Math/GSLNLSMinimizer.h
index 5296f1942bf929d782277d847bcdd803b57808de..429c9f27eb1db0707b4c1fc2c9d34a1aad3cb8ed 100644
--- a/math/mathmore/inc/Math/GSLNLSMinimizer.h
+++ b/math/mathmore/inc/Math/GSLNLSMinimizer.h
@@ -29,22 +29,14 @@
-#ifndef ROOT_Math_BasicMinimizer
#include "Math/BasicMinimizer.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_FitMethodFunction
#include "Math/FitMethodFunction.h"
-#endif
#ifndef ROOT_Math_MinimTransformVariable
#include "Math/MinimTransformVariable.h"
diff --git a/math/mathmore/inc/Math/GSLRootFinder.h b/math/mathmore/inc/Math/GSLRootFinder.h
index eb8cda9e022d2923abee109d2aa67a06d8751834..8470963756351e3879ace86bbfa0922537c193ef 100644
--- a/math/mathmore/inc/Math/GSLRootFinder.h
+++ b/math/mathmore/inc/Math/GSLRootFinder.h
@@ -32,17 +32,11 @@
#define ROOT_Math_GSLRootFinder
-#ifndef ROOT_Math_GSLFunctionAdapter
#include "Math/GSLFunctionAdapter.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_IRootFinderMethod
#include "Math/IRootFinderMethod.h"
-#endif
#include <iostream>
diff --git a/math/mathmore/inc/Math/GSLRootFinderDeriv.h b/math/mathmore/inc/Math/GSLRootFinderDeriv.h
index 1b04af9fae5c40b854d5e5dcf3ecb47ae5dddd23..1102fe837caac4de9ed7670d9a1a713f4cfcb3b2 100644
--- a/math/mathmore/inc/Math/GSLRootFinderDeriv.h
+++ b/math/mathmore/inc/Math/GSLRootFinderDeriv.h
@@ -32,20 +32,12 @@
#define ROOT_Math_GSL_RootFinderDeriv
-#ifndef ROOT_Math_GSLFunctionAdapter
#include "Math/GSLFunctionAdapter.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
-#ifndef ROOT_Math_IRootFinderMethod
#include "Math/IRootFinderMethod.h"
-#endif
#include <iostream>
diff --git a/math/mathmore/inc/Math/GSLSimAnMinimizer.h b/math/mathmore/inc/Math/GSLSimAnMinimizer.h
index df38a07ff757dedae2c7f05e5869a74888be1878..ebd384c8e9dfce2e8f881d0a4056e63c18f3cecd 100644
--- a/math/mathmore/inc/Math/GSLSimAnMinimizer.h
+++ b/math/mathmore/inc/Math/GSLSimAnMinimizer.h
@@ -29,24 +29,16 @@
-#ifndef ROOT_Math_BasicMinimizer
#include "Math/BasicMinimizer.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_GSLSimAnnealing
#include "Math/GSLSimAnnealing.h"
-#endif
diff --git a/math/mathmore/inc/Math/IntegrationTypes.h b/math/mathmore/inc/Math/IntegrationTypes.h
index 90a451f3bdc66659133014d9cf4a41fe6056c493..d80cff747b6c10779539709868232a7ceb85358f 100644
--- a/math/mathmore/inc/Math/IntegrationTypes.h
+++ b/math/mathmore/inc/Math/IntegrationTypes.h
@@ -32,9 +32,7 @@
#define ROOT_Math_IntegrationTypes
-#ifndef ROOT_Math_AllIntegrationTypes
#include "Math/AllIntegrationTypes.h"
-#endif
namespace ROOT {
namespace Math {
diff --git a/math/mathmore/inc/Math/MCIntegrationTypes.h b/math/mathmore/inc/Math/MCIntegrationTypes.h
index 858ddacb95f1680f4b51eabe92d4e65565aa104a..3ead638d73e066df270e78c1cdff053692db4f28 100644
--- a/math/mathmore/inc/Math/MCIntegrationTypes.h
+++ b/math/mathmore/inc/Math/MCIntegrationTypes.h
@@ -28,9 +28,7 @@
#ifndef ROOT_Math_MCIntegrationTypes
#define ROOT_Math_MCIntegrationTypes
-#ifndef ROOT_Math_AllIntegrationTypes
#include "Math/AllIntegrationTypes.h"
-#endif
namespace ROOT {
diff --git a/math/mathmore/inc/Math/MultiNumGradFunction.h b/math/mathmore/inc/Math/MultiNumGradFunction.h
index d5774657527b46a19f4bd6f75a440fa261dc2e9c..2bec5401792226e84e90c91a2ce4def431ccd94e 100644
--- a/math/mathmore/inc/Math/MultiNumGradFunction.h
+++ b/math/mathmore/inc/Math/MultiNumGradFunction.h
@@ -28,13 +28,9 @@
#define ROOT_Math_MultiNumGradFunction
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
-#ifndef ROOT_Math_WrappedFunction
#include "Math/WrappedFunction.h"
-#endif
namespace ROOT {
diff --git a/math/mathmore/inc/Math/MultiRootFinder.h b/math/mathmore/inc/Math/MultiRootFinder.h
index 418f7f8fc5c17287a9802d43cd4c0c4d3cc9798a..fa00e11a21d7dfb0711d532dcf9b8f8cbeef89f0 100644
--- a/math/mathmore/inc/Math/MultiRootFinder.h
+++ b/math/mathmore/inc/Math/MultiRootFinder.h
@@ -29,9 +29,7 @@
-#ifndef ROOT_Math_GSLMultiRootFinder
#include "Math/GSLMultiRootFinder.h"
-#endif
namespace ROOT {
namespace Math {
diff --git a/math/mathmore/inc/Math/ParamFunction.h b/math/mathmore/inc/Math/ParamFunction.h
index 576ba41fe42a774089bbce6491d012eecac4d373..59e7210baa89950c9730cfe5216e93cea17f2271 100644
--- a/math/mathmore/inc/Math/ParamFunction.h
+++ b/math/mathmore/inc/Math/ParamFunction.h
@@ -34,9 +34,7 @@
#define ROOT_Math_ParamFunction
-#ifndef ROOT_Math_IParamFunction
#include "Math/IParamFunction.h"
-#endif
#include <vector>
diff --git a/math/mathmore/inc/Math/QuasiRandom.h b/math/mathmore/inc/Math/QuasiRandom.h
index 4edf1128878d4695eafe1d14dc4902c7e06a3d68..9231f4d481736ea74329471d45dcd8945512fd04 100644
--- a/math/mathmore/inc/Math/QuasiRandom.h
+++ b/math/mathmore/inc/Math/QuasiRandom.h
@@ -166,9 +166,7 @@ private:
} // namespace Math
} // namespace ROOT
-#ifndef ROOT_Math_GSLQuasiRandom
#include "Math/GSLQuasiRandom.h"
-#endif
diff --git a/math/mathmore/inc/Math/RootFinderAlgorithms.h b/math/mathmore/inc/Math/RootFinderAlgorithms.h
index a98e8282489d072308a304f54c20b77d5c432f47..c71d21ab76e103a84dc05ba881f42c828153dafd 100644
--- a/math/mathmore/inc/Math/RootFinderAlgorithms.h
+++ b/math/mathmore/inc/Math/RootFinderAlgorithms.h
@@ -32,13 +32,9 @@
#define ROOT_Math_GSLRootFinderAlgorithms
-#ifndef ROOT_Math_GSLRootFinder
#include "Math/GSLRootFinder.h"
-#endif
-#ifndef ROOT_Math_GSLRootFinderDeriv
#include "Math/GSLRootFinderDeriv.h"
-#endif
namespace ROOT {
namespace Math {
diff --git a/math/mathmore/src/MultiNumGradFunction.cxx b/math/mathmore/src/MultiNumGradFunction.cxx
index e0e665f256ff8d0a381ea03190ec187619b30d1e..3c022596151c2716a4141fc2928bc095a4323719 100644
--- a/math/mathmore/src/MultiNumGradFunction.cxx
+++ b/math/mathmore/src/MultiNumGradFunction.cxx
@@ -29,9 +29,7 @@
#include <cmath>
#include <algorithm> // needed for std::max on Solaris
-#ifndef ROOT_Math_Derivator
#include "Math/Derivator.h"
-#endif
namespace ROOT {
diff --git a/math/matrix/inc/TDecompBK.h b/math/matrix/inc/TDecompBK.h
index 1eddafcff0e92af46fc68246949c2c2680c8fb83..c074be932f80381493e4915e7468db25745e28d5 100644
--- a/math/matrix/inc/TDecompBK.h
+++ b/math/matrix/inc/TDecompBK.h
@@ -19,15 +19,9 @@
///////////////////////////////////////////////////////////////////////////
#include "Rtypes.h"
-#ifndef ROOT_TDecompBase
#include "TDecompBase.h"
-#endif
-#ifndef ROOT_TMatrixDSym
#include "TMatrixDSym.h"
-#endif
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
class TDecompBK : public TDecompBase
{
diff --git a/math/matrix/inc/TDecompBase.h b/math/matrix/inc/TDecompBase.h
index 3b1d01afd32c1e439791365ce027e4ebeeca8796..655d0a85051cc327b71910cbc47831380917c7ad 100644
--- a/math/matrix/inc/TDecompBase.h
+++ b/math/matrix/inc/TDecompBase.h
@@ -23,16 +23,10 @@
#include "Rtypes.h"
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TMatrixDUtils
#include "TMatrixDUtils.h"
-#endif
#include "TObject.h"
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
#include <limits>
diff --git a/math/matrix/inc/TDecompChol.h b/math/matrix/inc/TDecompChol.h
index 902a24ff124f66a7497afcc31d6df9f02f76ae41..576bce492f041029d3453374a9d5c0bf9f44d555 100644
--- a/math/matrix/inc/TDecompChol.h
+++ b/math/matrix/inc/TDecompChol.h
@@ -18,12 +18,8 @@
// //
///////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDecompBase
#include "TDecompBase.h"
-#endif
-#ifndef ROOT_TMatrixDSym
#include "TMatrixDSym.h"
-#endif
class TDecompChol : public TDecompBase
{
diff --git a/math/matrix/inc/TDecompLU.h b/math/matrix/inc/TDecompLU.h
index cee1e8c9051a48fd8b8d5aeeb01dffd8200f4d57..206a773366c7ff3d037608bd5584e86c25a3527f 100644
--- a/math/matrix/inc/TDecompLU.h
+++ b/math/matrix/inc/TDecompLU.h
@@ -18,9 +18,7 @@
// //
///////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDecompBase
#include "TDecompBase.h"
-#endif
class TDecompLU : public TDecompBase
{
diff --git a/math/matrix/inc/TDecompQRH.h b/math/matrix/inc/TDecompQRH.h
index 5ae1916217ae97650253eaeaa7a68620574eded7..a5659b841a064f04e6e7b94d24ccdd9468740720 100644
--- a/math/matrix/inc/TDecompQRH.h
+++ b/math/matrix/inc/TDecompQRH.h
@@ -18,9 +18,7 @@
// //
///////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDecompBase
#include "TDecompBase.h"
-#endif
#include "Rtypes.h"
diff --git a/math/matrix/inc/TDecompSVD.h b/math/matrix/inc/TDecompSVD.h
index 181bfbab3faaf8e24f7d018eeba8a054b5da19ab..196a5bfe07e6709285dc3a36c2c6f132e527533d 100644
--- a/math/matrix/inc/TDecompSVD.h
+++ b/math/matrix/inc/TDecompSVD.h
@@ -18,9 +18,7 @@
// //
///////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDecompBase
#include "TDecompBase.h"
-#endif
class TDecompSVD : public TDecompBase
{
diff --git a/math/matrix/inc/TDecompSparse.h b/math/matrix/inc/TDecompSparse.h
index bd01db7a0623b4d2c1931fed4a44b13d5370c51f..955d532beef54eaf59ef1b743118e85558c0e5e2 100644
--- a/math/matrix/inc/TDecompSparse.h
+++ b/math/matrix/inc/TDecompSparse.h
@@ -18,18 +18,10 @@
// //
///////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDecompBase
#include "TDecompBase.h"
-#endif
-#ifndef ROOT_TMatrixDSparse
#include "TMatrixDSparse.h"
-#endif
-#ifndef ROOT_TArrayD
#include "TArrayD.h"
-#endif
-#ifndef ROOT_TArrayI
#include "TArrayI.h"
-#endif
// globals
const Double_t kInitTreatAsZero = 1.0e-12;
diff --git a/math/matrix/inc/TMatrix.h b/math/matrix/inc/TMatrix.h
index be32a5c01aff483efaab30fed4485f5ac001aff3..9954870dc5e0e008411d0e83a8fa0975a81c4df1 100644
--- a/math/matrix/inc/TMatrix.h
+++ b/math/matrix/inc/TMatrix.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixF
#include "TMatrixF.h"
-#endif
typedef TMatrixT<Float_t> TMatrix;
#endif
diff --git a/math/matrix/inc/TMatrixD.h b/math/matrix/inc/TMatrixD.h
index 8474b96c549d00e025abf3590a4e31ab0d2be655..c3a816fce1b6f4535d2ae0b296203b487f980f42 100644
--- a/math/matrix/inc/TMatrixD.h
+++ b/math/matrix/inc/TMatrixD.h
@@ -17,14 +17,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixT
#include "TMatrixT.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TMatrixDUtils
#include "TMatrixDUtils.h"
-#endif
#endif
diff --git a/math/matrix/inc/TMatrixDBase.h b/math/matrix/inc/TMatrixDBase.h
index 247d0ee057a2c5a88eeb63e027ae7e54f6992bd6..570d6d4ad92694af9310aa28b31bf78768d9170b 100644
--- a/math/matrix/inc/TMatrixDBase.h
+++ b/math/matrix/inc/TMatrixDBase.h
@@ -20,11 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTBase
#include "TMatrixTBase.h"
-#endif
-#ifndef ROOT_TMatrixDBasefwd
#include "TMatrixDBasefwd.h"
-#endif
#endif
diff --git a/math/matrix/inc/TMatrixDBasefwd.h b/math/matrix/inc/TMatrixDBasefwd.h
index 529d6ec60c38bcbacf312f6071272bd830508a8b..1ec623ae1bf9945c75853e5e9c0922d19f98330d 100644
--- a/math/matrix/inc/TMatrixDBasefwd.h
+++ b/math/matrix/inc/TMatrixDBasefwd.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TMatrixTBase;
typedef TMatrixTBase<Double_t> TMatrixDBase;
diff --git a/math/matrix/inc/TMatrixDEigen.h b/math/matrix/inc/TMatrixDEigen.h
index 803b03091bb51259ee7ca865925e9323a146cfd5..619edd5916ac3f0b8d97d44b9a3b016ec2cd8097 100644
--- a/math/matrix/inc/TMatrixDEigen.h
+++ b/math/matrix/inc/TMatrixDEigen.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
class TMatrixDEigen
{
diff --git a/math/matrix/inc/TMatrixDLazy.h b/math/matrix/inc/TMatrixDLazy.h
index 20a15eea6e43c35e69259dfb186528c8733cf503..f1f2ca3a8523dd22ede854c112cbf5492a8373f2 100644
--- a/math/matrix/inc/TMatrixDLazy.h
+++ b/math/matrix/inc/TMatrixDLazy.h
@@ -25,15 +25,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTLazy
#include "TMatrixTLazy.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TMatrixDSymfwd
#include "TMatrixDSymfwd.h"
-#endif
typedef TMatrixTLazy <Double_t> TMatrixDLazy;
typedef TMatrixTSymLazy <Double_t> TMatrixDSymLazy;
diff --git a/math/matrix/inc/TMatrixDSparse.h b/math/matrix/inc/TMatrixDSparse.h
index dd62b9213c331437c3b59fefaf540b2d2c95b250..836a55a7f15a53b35b9734b5998b8c9591d7d663 100644
--- a/math/matrix/inc/TMatrixDSparse.h
+++ b/math/matrix/inc/TMatrixDSparse.h
@@ -20,14 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTSparse
#include "TMatrixTSparse.h"
-#endif
-#ifndef ROOT_TMatrixDSparsefwd
#include "TMatrixDSparsefwd.h"
-#endif
-#ifndef ROOT_TMatrixDUtils
#include "TMatrixDUtils.h"
-#endif
#endif
diff --git a/math/matrix/inc/TMatrixDSparsefwd.h b/math/matrix/inc/TMatrixDSparsefwd.h
index f8d55d9dcf56f894ac3fb84585a778ebf5e254e6..50ab144e1dd6968cbb8f7efbd0813e620f8cffe7 100644
--- a/math/matrix/inc/TMatrixDSparsefwd.h
+++ b/math/matrix/inc/TMatrixDSparsefwd.h
@@ -17,9 +17,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TMatrixTSparse;
typedef TMatrixTSparse<Double_t> TMatrixDSparse;
diff --git a/math/matrix/inc/TMatrixDSym.h b/math/matrix/inc/TMatrixDSym.h
index 85d3b3370fc8e3d3f9dff07691b8ef1decb69145..55b4cdea72fd819e773013c2d5aa0a4b7c4ad6f8 100644
--- a/math/matrix/inc/TMatrixDSym.h
+++ b/math/matrix/inc/TMatrixDSym.h
@@ -20,14 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTSym
#include "TMatrixTSym.h"
-#endif
-#ifndef ROOT_TMatrixDSymfwd
#include "TMatrixDSymfwd.h"
-#endif
-#ifndef ROOT_TMatrixDUtils
#include "TMatrixDUtils.h"
-#endif
#endif
diff --git a/math/matrix/inc/TMatrixDSymEigen.h b/math/matrix/inc/TMatrixDSymEigen.h
index f2e2b88a99761a31e80310aa68f0c117ff02b9e0..be7784625206710509a1ed44cc9627f9f27ba63c 100644
--- a/math/matrix/inc/TMatrixDSymEigen.h
+++ b/math/matrix/inc/TMatrixDSymEigen.h
@@ -20,15 +20,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TMatrixDSym
#include "TMatrixDSym.h"
-#endif
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
class TMatrixDSymEigen
{
diff --git a/math/matrix/inc/TMatrixDSymfwd.h b/math/matrix/inc/TMatrixDSymfwd.h
index b5ffc669ca867f8a181f794551f0879e8c8b5e2b..f56f87fa4a686828a974734f1b9c3808ed5394b7 100644
--- a/math/matrix/inc/TMatrixDSymfwd.h
+++ b/math/matrix/inc/TMatrixDSymfwd.h
@@ -17,9 +17,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TMatrixTSym;
typedef TMatrixTSym<Double_t> TMatrixDSym;
diff --git a/math/matrix/inc/TMatrixDUtils.h b/math/matrix/inc/TMatrixDUtils.h
index b1126d472fe2c452b6d936356266fde9378064ca..25426d293ff42dae8b4cec63783c4bed6e40743d 100644
--- a/math/matrix/inc/TMatrixDUtils.h
+++ b/math/matrix/inc/TMatrixDUtils.h
@@ -30,11 +30,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTUtils
#include "TMatrixTUtils.h"
-#endif
-#ifndef ROOT_TMatrixDUtilsfwd
#include "TMatrixDUtilsfwd.h"
-#endif
#endif
diff --git a/math/matrix/inc/TMatrixDUtilsfwd.h b/math/matrix/inc/TMatrixDUtilsfwd.h
index 709b3b1bd04fcea162fa7c24f836a826f0162663..7069ade295b2792c9c6a946118ee20478714b2e2 100644
--- a/math/matrix/inc/TMatrixDUtilsfwd.h
+++ b/math/matrix/inc/TMatrixDUtilsfwd.h
@@ -30,9 +30,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TMatrixTRow_const;
template<class Element> class TMatrixTColumn_const;
diff --git a/math/matrix/inc/TMatrixDfwd.h b/math/matrix/inc/TMatrixDfwd.h
index b9fb9f829dcfbe812799c74adfd68f19997b7d67..9e7143fd450141b54cd39cf78b7a6d4b861c79ab 100644
--- a/math/matrix/inc/TMatrixDfwd.h
+++ b/math/matrix/inc/TMatrixDfwd.h
@@ -17,9 +17,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TMatrixT;
typedef TMatrixT<Double_t> TMatrixD;
diff --git a/math/matrix/inc/TMatrixF.h b/math/matrix/inc/TMatrixF.h
index 4c31de33dc759e22a032ac1b13ad1bdec28dcfd4..e47b10da3e4cd35d15020644a44480defb3cc283 100644
--- a/math/matrix/inc/TMatrixF.h
+++ b/math/matrix/inc/TMatrixF.h
@@ -17,14 +17,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixT
#include "TMatrixT.h"
-#endif
-#ifndef ROOT_TMatrixFfwd
#include "TMatrixFfwd.h"
-#endif
-#ifndef ROOT_TMatrixFUtils
#include "TMatrixFUtils.h"
-#endif
#endif
diff --git a/math/matrix/inc/TMatrixFBase.h b/math/matrix/inc/TMatrixFBase.h
index a2fcedb6d99ca2101911f7bff7824a7a197a74d6..50f7ffaced2c288afadf9a9677221ba314644bc5 100644
--- a/math/matrix/inc/TMatrixFBase.h
+++ b/math/matrix/inc/TMatrixFBase.h
@@ -20,11 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTBase
#include "TMatrixTBase.h"
-#endif
-#ifndef ROOT_TMatrixFBase
#include "TMatrixFBase.h"
-#endif
#endif
diff --git a/math/matrix/inc/TMatrixFBasefwd.h b/math/matrix/inc/TMatrixFBasefwd.h
index e77d4a6ef68813d897c160a1499c32792469589a..ecd502dcd29bf4de4793583c37295112d98cbe09 100644
--- a/math/matrix/inc/TMatrixFBasefwd.h
+++ b/math/matrix/inc/TMatrixFBasefwd.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TMatrixTBase;
typedef TMatrixTBase<Float_t> TMatrixFBase;
diff --git a/math/matrix/inc/TMatrixFLazy.h b/math/matrix/inc/TMatrixFLazy.h
index ba7331f179192b6b8f9cba305e2c401932d41f19..fd5cd34c5cd8d8b2df54e64e93fab432fae1fcc1 100644
--- a/math/matrix/inc/TMatrixFLazy.h
+++ b/math/matrix/inc/TMatrixFLazy.h
@@ -25,15 +25,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTLazy
#include "TMatrixTLazy.h"
-#endif
-#ifndef ROOT_TMatrixFfwd
#include "TMatrixFfwd.h"
-#endif
-#ifndef ROOT_TMatrixFSymfwd
#include "TMatrixFSymfwd.h"
-#endif
typedef TMatrixTLazy <Float_t> TMatrixFLazy;
typedef TMatrixTSymLazy <Float_t> TMatrixFSymLazy;
diff --git a/math/matrix/inc/TMatrixFSparse.h b/math/matrix/inc/TMatrixFSparse.h
index 219e0c716971642205af86d26bc67b0418d0485f..3727f32c60dc022b013ac9b0a0b44ffce140623d 100644
--- a/math/matrix/inc/TMatrixFSparse.h
+++ b/math/matrix/inc/TMatrixFSparse.h
@@ -20,14 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTSparse
#include "TMatrixTSparse.h"
-#endif
-#ifndef ROOT_TMatrixFSparsefwd
#include "TMatrixFSparsefwd.h"
-#endif
-#ifndef ROOT_TMatrixFUtils
#include "TMatrixFUtils.h"
-#endif
#endif
diff --git a/math/matrix/inc/TMatrixFSparsefwd.h b/math/matrix/inc/TMatrixFSparsefwd.h
index 93158973f47d567f9fb5d69b1569f4992b4c3f50..2a60414fe8b2bbf0dfb6684851e5845aa882ca66 100644
--- a/math/matrix/inc/TMatrixFSparsefwd.h
+++ b/math/matrix/inc/TMatrixFSparsefwd.h
@@ -17,9 +17,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TMatrixTSparse;
typedef TMatrixTSparse<Float_t> TMatrixFSparse;
diff --git a/math/matrix/inc/TMatrixFSym.h b/math/matrix/inc/TMatrixFSym.h
index 6411f09904a4a6e8dfdbc47ec4795860fef904a4..1dba61025481ffd8244ced4333e8e00e693c08f9 100644
--- a/math/matrix/inc/TMatrixFSym.h
+++ b/math/matrix/inc/TMatrixFSym.h
@@ -20,14 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTSym
#include "TMatrixTSym.h"
-#endif
-#ifndef ROOT_TMatrixFSymfwd
#include "TMatrixFSymfwd.h"
-#endif
-#ifndef ROOT_TMatrixFUtils
#include "TMatrixFUtils.h"
-#endif
#endif
diff --git a/math/matrix/inc/TMatrixFSymfwd.h b/math/matrix/inc/TMatrixFSymfwd.h
index aa81e34bfe52c822cceee79d990cf61de457c078..ff7bfafa72af8b9ff07b96df4ac514506ace6100 100644
--- a/math/matrix/inc/TMatrixFSymfwd.h
+++ b/math/matrix/inc/TMatrixFSymfwd.h
@@ -17,9 +17,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TMatrixTSym;
typedef TMatrixTSym<Float_t> TMatrixFSym;
diff --git a/math/matrix/inc/TMatrixFUtils.h b/math/matrix/inc/TMatrixFUtils.h
index 9516d08d2705e592b9e56bf7603192aefddf96c6..ed68bb85327a0ffdd26de91196ad696e4b9ff6ff 100644
--- a/math/matrix/inc/TMatrixFUtils.h
+++ b/math/matrix/inc/TMatrixFUtils.h
@@ -30,11 +30,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTUtils
#include "TMatrixTUtils.h"
-#endif
-#ifndef ROOT_TMatrixFUtilsfwd
#include "TMatrixFUtilsfwd.h"
-#endif
#endif
diff --git a/math/matrix/inc/TMatrixFUtilsfwd.h b/math/matrix/inc/TMatrixFUtilsfwd.h
index 5a328414a65e9e56c34bddde740e024e2693592b..47309c4f9973d89c7580562e25463a3e3c651b87 100644
--- a/math/matrix/inc/TMatrixFUtilsfwd.h
+++ b/math/matrix/inc/TMatrixFUtilsfwd.h
@@ -30,9 +30,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TMatrixTRow_const;
template<class Element> class TMatrixTColumn_const;
diff --git a/math/matrix/inc/TMatrixFfwd.h b/math/matrix/inc/TMatrixFfwd.h
index f8c7a654b2721b085b917711f4666c8f3d248db5..25f2ed5d5ba16d0de821aa75f9d7c62b7e968279 100644
--- a/math/matrix/inc/TMatrixFfwd.h
+++ b/math/matrix/inc/TMatrixFfwd.h
@@ -17,9 +17,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TMatrixT;
typedef TMatrixT<Float_t> TMatrixF;
diff --git a/math/matrix/inc/TMatrixT.h b/math/matrix/inc/TMatrixT.h
index 0aec2e623ce5b3f176cf33ddd1223db8760242dd..ead09f67e609f9b898f3aa7cecc76be0be10024b 100644
--- a/math/matrix/inc/TMatrixT.h
+++ b/math/matrix/inc/TMatrixT.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTBase
#include "TMatrixTBase.h"
-#endif
-#ifndef ROOT_TMatrixTUtils
#include "TMatrixTUtils.h"
-#endif
#ifdef CBLAS
#include <vecLib/vBLAS.h>
diff --git a/math/matrix/inc/TMatrixTBase.h b/math/matrix/inc/TMatrixTBase.h
index f37736d4f2322e06950101f747f91316ed14b298..11c1f1bdefd2d19552c3d09571c78e51d3c0b3f6 100644
--- a/math/matrix/inc/TMatrixTBase.h
+++ b/math/matrix/inc/TMatrixTBase.h
@@ -67,24 +67,12 @@
#include <limits>
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TMatrixFBasefwd
#include "TMatrixFBasefwd.h"
-#endif
-#ifndef ROOT_TMatrixDBasefwd
#include "TMatrixDBasefwd.h"
-#endif
-#ifndef ROOT_TVectorFfwd
#include "TVectorFfwd.h"
-#endif
-#ifndef ROOT_TVectorDfwd
#include "TVectorDfwd.h"
-#endif
-#ifndef ROOT_TError
#include "TError.h"
-#endif
template<class Element> class TVectorT;
template<class Element> class TElementActionT;
diff --git a/math/matrix/inc/TMatrixTCramerInv.h b/math/matrix/inc/TMatrixTCramerInv.h
index f8b5fd7643b5c5fd63b60035fc8d6d290d7f624e..68d53c5dfade35e7907527d7ba4f0a6b41822e78 100644
--- a/math/matrix/inc/TMatrixTCramerInv.h
+++ b/math/matrix/inc/TMatrixTCramerInv.h
@@ -23,13 +23,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TMatrixT
#include "TMatrixT.h"
-#endif
namespace TMatrixTCramerInv {
diff --git a/math/matrix/inc/TMatrixTLazy.h b/math/matrix/inc/TMatrixTLazy.h
index b62e6a147c466e2409eeac82b3c25bcf3b91131c..f293e6467fb94ea5694cef91bee5b39c982db02c 100644
--- a/math/matrix/inc/TMatrixTLazy.h
+++ b/math/matrix/inc/TMatrixTLazy.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTBase
#include "TMatrixTBase.h"
-#endif
template<class Element> class TVectorT;
template<class Element> class TMatrixTBase;
diff --git a/math/matrix/inc/TMatrixTSparse.h b/math/matrix/inc/TMatrixTSparse.h
index fe80d7da19cb346f218e6f7f53db263f52122065..96dab7ddc611f497094f268ce56cd4a66aaac765 100644
--- a/math/matrix/inc/TMatrixTSparse.h
+++ b/math/matrix/inc/TMatrixTSparse.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TMatrixTSparse
#define ROOT_TMatrixTSparse
-#ifndef ROOT_TMatrixTBase
#include "TMatrixTBase.h"
-#endif
-#ifndef ROOT_TMatrixTUtils
#include "TMatrixTUtils.h"
-#endif
#ifdef CBLAS
diff --git a/math/matrix/inc/TMatrixTSym.h b/math/matrix/inc/TMatrixTSym.h
index 37f76e51ef17961e3368c4f5b33f61a6f766e6e5..218ba1c8f98ec0180303c9f4025c5bea8d9279ac 100644
--- a/math/matrix/inc/TMatrixTSym.h
+++ b/math/matrix/inc/TMatrixTSym.h
@@ -24,12 +24,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTBase
#include "TMatrixTBase.h"
-#endif
-#ifndef ROOT_TMatrixTUtils
#include "TMatrixTUtils.h"
-#endif
template<class Element>class TMatrixT;
template<class Element>class TMatrixTSymLazy;
diff --git a/math/matrix/inc/TMatrixTSymCramerInv.h b/math/matrix/inc/TMatrixTSymCramerInv.h
index 4e62a506e09867d624512f1dc28d41f66a7e164d..f3618a7d6eecffe450d7ec67509b808f4622f0fc 100644
--- a/math/matrix/inc/TMatrixTSymCramerInv.h
+++ b/math/matrix/inc/TMatrixTSymCramerInv.h
@@ -23,13 +23,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TMatrixTSym
#include "TMatrixTSym.h"
-#endif
namespace TMatrixTSymCramerInv {
diff --git a/math/matrix/inc/TMatrixTUtils.h b/math/matrix/inc/TMatrixTUtils.h
index f78d5e76c33c01d737324f51eb20926ffa104dee..96ab15ca2cc117fbf2fa4dfa2b19f50215de9010 100644
--- a/math/matrix/inc/TMatrixTUtils.h
+++ b/math/matrix/inc/TMatrixTUtils.h
@@ -33,9 +33,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixTBase
#include "TMatrixTBase.h"
-#endif
template<class Element> class TVectorT;
template<class Element> class TMatrixT;
diff --git a/math/matrix/inc/TVector.h b/math/matrix/inc/TVector.h
index 946762c57ccd1af95fae7bb347642a44e9be7752..2bc37de5e02b2db74f73fc8522eb1df845e2b81f 100644
--- a/math/matrix/inc/TVector.h
+++ b/math/matrix/inc/TVector.h
@@ -20,11 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVectorT
#include "TVectorT.h"
-#endif
-#ifndef ROOT_TVectorfwd
#include "TVectorfwd.h"
-#endif
#endif
diff --git a/math/matrix/inc/TVectorD.h b/math/matrix/inc/TVectorD.h
index c8634d320ec873675619dda1c092b6d1330dce2f..81a9fc6aaf9901b8f08a1faaf756459980ad814f 100644
--- a/math/matrix/inc/TVectorD.h
+++ b/math/matrix/inc/TVectorD.h
@@ -17,20 +17,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVectorT
#include "TVectorT.h"
-#endif
-#ifndef ROOT_TVectorDfwd
#include "TVectorDfwd.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TMatrixDSym
#include "TMatrixDSym.h"
-#endif
-#ifndef ROOT_TMatrixDSparse
#include "TMatrixDSparse.h"
-#endif
#endif
diff --git a/math/matrix/inc/TVectorDfwd.h b/math/matrix/inc/TVectorDfwd.h
index 6ef42765e572136e0271f66b742a9f1bce563b56..1ca7ab8bf2bf46a8140a7413bde888e53430864d 100644
--- a/math/matrix/inc/TVectorDfwd.h
+++ b/math/matrix/inc/TVectorDfwd.h
@@ -17,9 +17,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TVectorT;
typedef TVectorT<Double_t> TVectorD;
diff --git a/math/matrix/inc/TVectorF.h b/math/matrix/inc/TVectorF.h
index f5588360e6c1cf11db9be70fe01b7d327c7693ce..ecebf4ea988edd76369e9d5ae20fc824d82e0a25 100644
--- a/math/matrix/inc/TVectorF.h
+++ b/math/matrix/inc/TVectorF.h
@@ -17,20 +17,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVectorT
#include "TVectorT.h"
-#endif
-#ifndef ROOT_TVectorFfwd
#include "TVectorFfwd.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TMatrixDSym
#include "TMatrixDSym.h"
-#endif
-#ifndef ROOT_TMatrixDSparse
#include "TMatrixDSparse.h"
-#endif
#endif
diff --git a/math/matrix/inc/TVectorFfwd.h b/math/matrix/inc/TVectorFfwd.h
index d95975080d20d959d70c41bf1b8b3ccf91b6ff92..0b86d65b43594041a959ce143ad7559bd3b8fb4c 100644
--- a/math/matrix/inc/TVectorFfwd.h
+++ b/math/matrix/inc/TVectorFfwd.h
@@ -17,9 +17,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TVectorT;
typedef TVectorT<Float_t> TVectorF;
diff --git a/math/matrix/inc/TVectorT.h b/math/matrix/inc/TVectorT.h
index 7f3d482725343a9a13b818884ff6e46a9f94f130..3fb5646ecd93be2be5e2835d84a63169212fa798 100644
--- a/math/matrix/inc/TVectorT.h
+++ b/math/matrix/inc/TVectorT.h
@@ -20,15 +20,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixT
#include "TMatrixT.h"
-#endif
-#ifndef ROOT_TMatrixTSym
#include "TMatrixTSym.h"
-#endif
-#ifndef ROOT_TMatrixTSparse
#include "TMatrixTSparse.h"
-#endif
template<class Element> class TVectorT : public TObject {
diff --git a/math/matrix/inc/TVectorfwd.h b/math/matrix/inc/TVectorfwd.h
index 52741b7a9e7b9ae336e2d971891b992208eb21f5..5413d02effe50462698b64232f372fcbc18d21b4 100644
--- a/math/matrix/inc/TVectorfwd.h
+++ b/math/matrix/inc/TVectorfwd.h
@@ -17,9 +17,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
template<class Element> class TVectorT;
typedef TVectorT<Float_t> TVector;
diff --git a/math/matrix/src/TMatrixT.cxx b/math/matrix/src/TMatrixT.cxx
index 1d85385d052d6fda1e740f4b121d496f317750d1..ab9ca7a62c933012526f418d5880576792cf0d6e 100644
--- a/math/matrix/src/TMatrixT.cxx
+++ b/math/matrix/src/TMatrixT.cxx
@@ -3209,12 +3209,8 @@ void TMatrixT<Element>::Streamer(TBuffer &R__b)
template class TMatrixT<Float_t>;
-#ifndef ROOT_TMatrixFfwd
#include "TMatrixFfwd.h"
-#endif
-#ifndef ROOT_TMatrixFSymfwd
#include "TMatrixFSymfwd.h"
-#endif
template TMatrixF operator+ <Float_t>(const TMatrixF &source1,const TMatrixF &source2);
template TMatrixF operator+ <Float_t>(const TMatrixF &source1,const TMatrixFSym &source2);
@@ -3268,12 +3264,8 @@ template void AtMultB<Float_t>(const Float_t * const ap,Int_t ncolsa,
template void AMultBt<Float_t>(const Float_t * const ap,Int_t na,Int_t ncolsa,
const Float_t * const bp,Int_t nb,Int_t ncolsb,Float_t *cp);
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TMatrixDSymfwd
#include "TMatrixDSymfwd.h"
-#endif
template class TMatrixT<Double_t>;
diff --git a/math/matrix/src/TMatrixTCramerInv.cxx b/math/matrix/src/TMatrixTCramerInv.cxx
index 0c219c1ca68dc6de199fea7e55755fd0fdc197e8..39ad1f8b252e013b6361758668e317c94848c077 100644
--- a/math/matrix/src/TMatrixTCramerInv.cxx
+++ b/math/matrix/src/TMatrixTCramerInv.cxx
@@ -963,9 +963,7 @@ Bool_t TMatrixTCramerInv::Inv6x6(TMatrixT<Element> &m,Double_t *determ)
return kTRUE;
}
-#ifndef ROOT_TMatrixFfwd
#include "TMatrixFfwd.h"
-#endif
template Bool_t TMatrixTCramerInv::Inv2x2<Float_t>(TMatrixF&,Double_t*);
template Bool_t TMatrixTCramerInv::Inv3x3<Float_t>(TMatrixF&,Double_t*);
@@ -973,9 +971,7 @@ template Bool_t TMatrixTCramerInv::Inv4x4<Float_t>(TMatrixF&,Double_t*);
template Bool_t TMatrixTCramerInv::Inv5x5<Float_t>(TMatrixF&,Double_t*);
template Bool_t TMatrixTCramerInv::Inv6x6<Float_t>(TMatrixF&,Double_t*);
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
template Bool_t TMatrixTCramerInv::Inv2x2<Double_t>(TMatrixD&,Double_t*);
template Bool_t TMatrixTCramerInv::Inv3x3<Double_t>(TMatrixD&,Double_t*);
diff --git a/math/matrix/src/TMatrixTSparse.cxx b/math/matrix/src/TMatrixTSparse.cxx
index 8ed23ed3df9ffdcbab95ef1e87f0504b844bbac1..c08f54881d94f95f40ac81308afd03c1a421bc6b 100644
--- a/math/matrix/src/TMatrixTSparse.cxx
+++ b/math/matrix/src/TMatrixTSparse.cxx
@@ -2790,12 +2790,8 @@ void TMatrixTSparse<Element>::Streamer(TBuffer &R__b)
template class TMatrixTSparse<Float_t>;
-#ifndef ROOT_TMatrixFSparsefwd
#include "TMatrixFSparsefwd.h"
-#endif
-#ifndef ROOT_TMatrixFfwd
#include "TMatrixFfwd.h"
-#endif
template TMatrixFSparse operator+ <Float_t>(const TMatrixFSparse &source1,const TMatrixFSparse &source2);
template TMatrixFSparse operator+ <Float_t>(const TMatrixFSparse &source1,const TMatrixF &source2);
@@ -2819,12 +2815,8 @@ template TMatrixFSparse &ElementDiv <Float_t>(TMatrixFSparse &target,const TMa
template Bool_t AreCompatible<Float_t>(const TMatrixFSparse &m1,const TMatrixFSparse &m2,Int_t verbose);
-#ifndef ROOT_TMatrixDSparsefwd
#include "TMatrixDSparsefwd.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
template class TMatrixTSparse<Double_t>;
diff --git a/math/matrix/src/TMatrixTSym.cxx b/math/matrix/src/TMatrixTSym.cxx
index 413d1bb978c3c3817e0140fdb35c3c3c10d5b985..43c673f6df6c3ef85043ca302c546d0b06e4854e 100644
--- a/math/matrix/src/TMatrixTSym.cxx
+++ b/math/matrix/src/TMatrixTSym.cxx
@@ -2065,9 +2065,7 @@ void TMatrixTSym<Element>::Streamer(TBuffer &R__b)
}
}
-#ifndef ROOT_TMatrixFSymfwd
#include "TMatrixFSymfwd.h"
-#endif
template class TMatrixTSym<Float_t>;
@@ -2091,9 +2089,7 @@ template TMatrixFSym &Add <Float_t>(TMatrixFSym &target, Float_t
template TMatrixFSym &ElementMult<Float_t>(TMatrixFSym &target,const TMatrixFSym &source);
template TMatrixFSym &ElementDiv <Float_t>(TMatrixFSym &target,const TMatrixFSym &source);
-#ifndef ROOT_TMatrixDSymfwd
#include "TMatrixDSymfwd.h"
-#endif
template class TMatrixTSym<Double_t>;
diff --git a/math/matrix/src/TMatrixTSymCramerInv.cxx b/math/matrix/src/TMatrixTSymCramerInv.cxx
index 8cdb458f4a45c9d3de3e33f2c1c33b791afdf066..5b3640b37910cf9c6777c48e3b5e3b03f1e3616c 100644
--- a/math/matrix/src/TMatrixTSymCramerInv.cxx
+++ b/math/matrix/src/TMatrixTSymCramerInv.cxx
@@ -814,9 +814,7 @@ Bool_t TMatrixTSymCramerInv::Inv6x6(TMatrixTSym<Element> &m,Double_t *determ)
return kTRUE;
}
-#ifndef ROOT_TMatrixFSymfwd
#include "TMatrixFSymfwd.h"
-#endif
template Bool_t TMatrixTSymCramerInv::Inv2x2<Float_t>(TMatrixFSym&,Double_t*);
template Bool_t TMatrixTSymCramerInv::Inv3x3<Float_t>(TMatrixFSym&,Double_t*);
@@ -824,9 +822,7 @@ template Bool_t TMatrixTSymCramerInv::Inv4x4<Float_t>(TMatrixFSym&,Double_t*);
template Bool_t TMatrixTSymCramerInv::Inv5x5<Float_t>(TMatrixFSym&,Double_t*);
template Bool_t TMatrixTSymCramerInv::Inv6x6<Float_t>(TMatrixFSym&,Double_t*);
-#ifndef ROOT_TMatrixDSymfwd
#include "TMatrixDSymfwd.h"
-#endif
template Bool_t TMatrixTSymCramerInv::Inv2x2<Double_t>(TMatrixDSym&,Double_t*);
template Bool_t TMatrixTSymCramerInv::Inv3x3<Double_t>(TMatrixDSym&,Double_t*);
diff --git a/math/matrix/src/TVectorT.cxx b/math/matrix/src/TVectorT.cxx
index f6868c619feca79cf6422c223fb3bd77b1dea4d8..00da2f055f7a4272ff0d84f03a08278b5e062203 100644
--- a/math/matrix/src/TVectorT.cxx
+++ b/math/matrix/src/TVectorT.cxx
@@ -2359,15 +2359,9 @@ void TVectorT<Element>::Streamer(TBuffer &R__b)
}
}
-#ifndef ROOT_TMatrixFfwd
#include "TMatrixFfwd.h"
-#endif
-#ifndef ROOT_TMatrixFSymfwd
#include "TMatrixFSymfwd.h"
-#endif
-#ifndef ROOT_TMatrixFSparsefwd
#include "TMatrixFSparsefwd.h"
-#endif
template class TVectorT<Float_t>;
@@ -2417,15 +2411,9 @@ template void Compare <Float_t> (const TVectorF &v1,con
template Bool_t VerifyVectorValue <Float_t> (const TVectorF &m, Float_t val,Int_t verbose,Float_t maxDevAllow);
template Bool_t VerifyVectorIdentity<Float_t> (const TVectorF &m1,const TVectorF &m2, Int_t verbose,Float_t maxDevAllow);
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TMatrixDSymfwd
#include "TMatrixDSymfwd.h"
-#endif
-#ifndef ROOT_TMatrixDSparsefwd
#include "TMatrixDSparsefwd.h"
-#endif
template class TVectorT<Double_t>;
diff --git a/math/minuit/inc/TFitter.h b/math/minuit/inc/TFitter.h
index ea24a33d9d4706b403c795f39107e53cd3ca9644..217df256c9bbb1a160cee1d2757a97ffd69e5f81 100644
--- a/math/minuit/inc/TFitter.h
+++ b/math/minuit/inc/TFitter.h
@@ -21,9 +21,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualFitter
#include "TVirtualFitter.h"
-#endif
class TMinuit;
diff --git a/math/minuit/inc/TLinearFitter.h b/math/minuit/inc/TLinearFitter.h
index c1b6d5f1fb6680a8e112d1c5fb2929b7657382e2..9a37012a562924c240432e547324cac3d3c160a3 100644
--- a/math/minuit/inc/TLinearFitter.h
+++ b/math/minuit/inc/TLinearFitter.h
@@ -142,18 +142,10 @@
//
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TFormula
#include "TFormula.h"
-#endif
-#ifndef ROOT_TVirtualFitter
#include "TVirtualFitter.h"
-#endif
class TLinearFitter: public TVirtualFitter {
diff --git a/math/minuit/inc/TLinearMinimizer.h b/math/minuit/inc/TLinearMinimizer.h
index 43977cba218877da602dab0f534605252712e70d..04e925165145dfc959bb8b1d149125da30683b69 100644
--- a/math/minuit/inc/TLinearMinimizer.h
+++ b/math/minuit/inc/TLinearMinimizer.h
@@ -13,13 +13,9 @@
#ifndef ROOT_TLinearMinimizer
#define ROOT_TLinearMinimizer
-#ifndef ROOT_Math_Minimizer
#include "Math/Minimizer.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <vector>
diff --git a/math/minuit/inc/TMinuit.h b/math/minuit/inc/TMinuit.h
index 3b10a1eedc74d7c9face9e96220d13db11aba953..e4c2c0e994c5e3f20faabf35c58675b648cc8e1b 100644
--- a/math/minuit/inc/TMinuit.h
+++ b/math/minuit/inc/TMinuit.h
@@ -20,13 +20,9 @@
#ifndef ROOT_TMinuit
#define ROOT_TMinuit
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TMethodCall
#include "TMethodCall.h"
-#endif
class TMinuit : public TNamed {
diff --git a/math/minuit/inc/TMinuitMinimizer.h b/math/minuit/inc/TMinuitMinimizer.h
index 57027fb240c5d9465523c435980dd8a1b9962e52..8cd054e999bd793da6ccd708deec47e6c48cbbfc 100644
--- a/math/minuit/inc/TMinuitMinimizer.h
+++ b/math/minuit/inc/TMinuitMinimizer.h
@@ -13,13 +13,9 @@
#ifndef ROOT_TMinuitMinimizer
#define ROOT_TMinuitMinimizer
-#ifndef ROOT_Math_Minimizer
#include "Math/Minimizer.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TMinuit;
diff --git a/math/minuit2/inc/Minuit2/BasicMinimumError.h b/math/minuit2/inc/Minuit2/BasicMinimumError.h
index e545ef2045f30f0f7a7154832b255523c438489f..f24712a57078ae19449b9df4bf8d03c2e248bcaa 100644
--- a/math/minuit2/inc/Minuit2/BasicMinimumError.h
+++ b/math/minuit2/inc/Minuit2/BasicMinimumError.h
@@ -10,18 +10,10 @@
#ifndef ROOT_Minuit2_BasicMinimumError
#define ROOT_Minuit2_BasicMinimumError
-#ifndef ROOT_Minuit2_MnConfig
#include "Minuit2/MnConfig.h"
-#endif
-#ifndef ROOT_Minuit2_MnMatrix
#include "Minuit2/MnMatrix.h"
-#endif
-#ifndef ROOT_Minuit2_LaSum
#include "Minuit2/LaSum.h"
-#endif
-#ifndef ROOT_Minuit2_StackAllocator
#include "Minuit2/StackAllocator.h"
-#endif
namespace ROOT {
diff --git a/math/minuit2/inc/Minuit2/DavidonErrorUpdator.h b/math/minuit2/inc/Minuit2/DavidonErrorUpdator.h
index b46a6f8c6d0d7dc7cfbb4fdcaf147ff6cb21f82e..74e4db912b410a98b1b4b6592e9ac7f055b02ba3 100644
--- a/math/minuit2/inc/Minuit2/DavidonErrorUpdator.h
+++ b/math/minuit2/inc/Minuit2/DavidonErrorUpdator.h
@@ -10,9 +10,7 @@
#ifndef ROOT_Minuit2_DavidonErrorUpdator
#define ROOT_Minuit2_DavidonErrorUpdator
-#ifndef ROOT_Minuit2_MinimumErrorUpdator
#include "Minuit2/MinimumErrorUpdator.h"
-#endif
namespace ROOT {
diff --git a/math/minuit2/inc/Minuit2/FCNAdapter.h b/math/minuit2/inc/Minuit2/FCNAdapter.h
index b245595d7b449e6e483200f2cb192dbfedaebfc6..abfe1216755603a705e1373c5bf8b33292838f51 100644
--- a/math/minuit2/inc/Minuit2/FCNAdapter.h
+++ b/math/minuit2/inc/Minuit2/FCNAdapter.h
@@ -10,9 +10,7 @@
#ifndef ROOT_Minuit2_FCNAdapter
#define ROOT_Minuit2_FCNAdapter
-#ifndef ROOT_Minuit2_FCNBase
#include "Minuit2/FCNBase.h"
-#endif
namespace ROOT {
diff --git a/math/minuit2/inc/Minuit2/FCNGradAdapter.h b/math/minuit2/inc/Minuit2/FCNGradAdapter.h
index cc743a3f34c110c583014164d8f323189400545e..cc121d7496eea20fe71683b0fe5787a1c949b3d2 100644
--- a/math/minuit2/inc/Minuit2/FCNGradAdapter.h
+++ b/math/minuit2/inc/Minuit2/FCNGradAdapter.h
@@ -10,9 +10,7 @@
#ifndef ROOT_Minuit2_FCNGradAdapter
#define ROOT_Minuit2_FCNGradAdapter
-#ifndef ROOT_Minuit2_FCNGradientBase
#include "Minuit2/FCNGradientBase.h"
-#endif
//#define DEBUG
#ifdef DEBUG
diff --git a/math/minuit2/inc/Minuit2/FumiliFCNAdapter.h b/math/minuit2/inc/Minuit2/FumiliFCNAdapter.h
index 3c27dd4aeba065c8a42babfe8e19b692c3f4d3ce..010fd90fd54d80f9bb6268b9584618d793c32aa8 100644
--- a/math/minuit2/inc/Minuit2/FumiliFCNAdapter.h
+++ b/math/minuit2/inc/Minuit2/FumiliFCNAdapter.h
@@ -10,17 +10,11 @@
#ifndef ROOT_Minuit2_FumiliFCNAdapter
#define ROOT_Minuit2_FumiliFCNAdapter
-#ifndef ROOT_Minuit2_FumiliFCNBase
#include "Minuit2/FumiliFCNBase.h"
-#endif
-#ifndef ROOT_Math_FitMethodFunction
#include "Math/FitMethodFunction.h"
-#endif
-#ifndef ROOT_Minuit2_MnPrint
#include "Minuit2/MnPrint.h"
-#endif
// #ifndef ROOT_Math_Util
// #include "Math/Util.h"
diff --git a/math/minuit2/inc/Minuit2/MinimumBuilder.h b/math/minuit2/inc/Minuit2/MinimumBuilder.h
index 6c9b477ccb4dde4e510a7774d5724c5f376b8f09..d590841d839514355c30ad517452c50b201cf195 100644
--- a/math/minuit2/inc/Minuit2/MinimumBuilder.h
+++ b/math/minuit2/inc/Minuit2/MinimumBuilder.h
@@ -10,9 +10,7 @@
#ifndef ROOT_Minuit2_MinimumBuilder
#define ROOT_Minuit2_MinimumBuilder
-#ifndef ROOT_Minuit2_MnTraceObject
#include "Minuit2/MnTraceObject.h"
-#endif
namespace ROOT {
diff --git a/math/minuit2/inc/Minuit2/Minuit2Minimizer.h b/math/minuit2/inc/Minuit2/Minuit2Minimizer.h
index 61796bcc61d897ef147e1e2bf053f3df4b452e2f..3156dc544ca7031907175ad6ff910cfda000dfbc 100644
--- a/math/minuit2/inc/Minuit2/Minuit2Minimizer.h
+++ b/math/minuit2/inc/Minuit2/Minuit2Minimizer.h
@@ -13,17 +13,11 @@
#ifndef ROOT_Minuit2_Minuit2Minimizer
#define ROOT_Minuit2_Minuit2Minimizer
-#ifndef ROOT_Math_Minimizer
#include "Math/Minimizer.h"
-#endif
-#ifndef ROOT_Minuit2_MnUserParameterState
#include "Minuit2/MnUserParameterState.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
diff --git a/math/minuit2/inc/Minuit2/MnUserCovariance.h b/math/minuit2/inc/Minuit2/MnUserCovariance.h
index c513d90d3f74ce7ede9db966f5bd3d2398fa23ae..89ab612b4bf1e0b3af36344c1356a093c6192593 100644
--- a/math/minuit2/inc/Minuit2/MnUserCovariance.h
+++ b/math/minuit2/inc/Minuit2/MnUserCovariance.h
@@ -10,9 +10,7 @@
#ifndef ROOT_Minuit2_MnUserCovariance
#define ROOT_Minuit2_MnUserCovariance
-#ifndef ROOT_Minuit2_MnConfig
#include "Minuit2/MnConfig.h"
-#endif
#include <vector>
#include <cassert>
diff --git a/math/minuit2/inc/Minuit2/MnUserTransformation.h b/math/minuit2/inc/Minuit2/MnUserTransformation.h
index dfdc99820ae98e9321f1d4962fd398669d9c937a..b6d349bcb4d5503409693f87b3559cc0ef6a4948 100644
--- a/math/minuit2/inc/Minuit2/MnUserTransformation.h
+++ b/math/minuit2/inc/Minuit2/MnUserTransformation.h
@@ -10,27 +10,13 @@
#ifndef ROOT_Minuit2_MnUserTransformation
#define ROOT_Minuit2_MnUserTransformation
-#ifndef ROOT_Minuit2_MnConfig
#include "Minuit2/MnConfig.h"
-#endif
-#ifndef ROOT_Minuit2_MnMatrix
#include "Minuit2/MnMatrix.h"
-#endif
-#ifndef ROOT_Minuit2_MinuitParameter
#include "Minuit2/MinuitParameter.h"
-#endif
-#ifndef ROOT_Minuit2_MnMachinePrecision
#include "Minuit2/MnMachinePrecision.h"
-#endif
-#ifndef ROOT_Minuit2_SinParameterTransformation
#include "Minuit2/SinParameterTransformation.h"
-#endif
-#ifndef ROOT_Minuit2_SqrtLowParameterTransformation
#include "Minuit2/SqrtLowParameterTransformation.h"
-#endif
-#ifndef ROOT_Minuit2_SqrtUpParameterTransformation
#include "Minuit2/SqrtUpParameterTransformation.h"
-#endif
#include <vector>
#include <cassert>
diff --git a/math/minuit2/inc/Minuit2/ModularFunctionMinimizer.h b/math/minuit2/inc/Minuit2/ModularFunctionMinimizer.h
index 93c9c1357f9d1bd6f384614b59ef9673ec713899..308b70c80fc707d263bcf70040a1928536e1a1f2 100644
--- a/math/minuit2/inc/Minuit2/ModularFunctionMinimizer.h
+++ b/math/minuit2/inc/Minuit2/ModularFunctionMinimizer.h
@@ -11,13 +11,9 @@
#define ROOT_Minuit2_ModularFunctionMinimizer
-#ifndef ROOT_Minuit2_MnConfig
#include "Minuit2/MnConfig.h"
-#endif
-#ifndef ROOT_Minuit2_FunctionMinimizer
#include "Minuit2/FunctionMinimizer.h"
-#endif
#include <vector>
diff --git a/math/minuit2/inc/Minuit2/Numerical2PGradientCalculator.h b/math/minuit2/inc/Minuit2/Numerical2PGradientCalculator.h
index 357e5ca1017d076ef930ac27c626386e007bcb27..d3bf3efdb033f446c69d78dee2e0ce99627a7b4e 100644
--- a/math/minuit2/inc/Minuit2/Numerical2PGradientCalculator.h
+++ b/math/minuit2/inc/Minuit2/Numerical2PGradientCalculator.h
@@ -10,13 +10,9 @@
#ifndef ROOT_Minuit2_Numerical2PGradientCalculator
#define ROOT_Minuit2_Numerical2PGradientCalculator
-#ifndef ROOT_Minuit2_MnConfig
#include "Minuit2/MnConfig.h"
-#endif
-#ifndef ROOT_Minuit2_GradientCalculator
#include "Minuit2/GradientCalculator.h"
-#endif
#include <vector>
diff --git a/math/minuit2/inc/Minuit2/SimplexBuilder.h b/math/minuit2/inc/Minuit2/SimplexBuilder.h
index e788aa29b992c929bd9faf61fdd1f6fb3bd75a79..120c4f30f6f369c0080daf63eb4f56305cfa2d34 100644
--- a/math/minuit2/inc/Minuit2/SimplexBuilder.h
+++ b/math/minuit2/inc/Minuit2/SimplexBuilder.h
@@ -10,9 +10,7 @@
#ifndef ROOT_Minuit2_SimplexBuilder
#define ROOT_Minuit2_SimplexBuilder
-#ifndef ROOT_Minuit2_MinimumBuilder
#include "Minuit2/MinimumBuilder.h"
-#endif
namespace ROOT {
diff --git a/math/mlp/inc/TMLPAnalyzer.h b/math/mlp/inc/TMLPAnalyzer.h
index 5c66243add779c0ed2e205232a381502ec7e983c..58d37b45f412dd5876ba402c9b44357bd3a5daa9 100644
--- a/math/mlp/inc/TMLPAnalyzer.h
+++ b/math/mlp/inc/TMLPAnalyzer.h
@@ -13,9 +13,7 @@
#define ROOT_TMLPAnalyzer
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TTree;
class TNeuron;
diff --git a/math/mlp/inc/TMultiLayerPerceptron.h b/math/mlp/inc/TMultiLayerPerceptron.h
index 1e0f6e0b2899e73c9278f6e9f25dc299f313820d..719374312e7792df5165d6f06e437b9f0dbe665d 100644
--- a/math/mlp/inc/TMultiLayerPerceptron.h
+++ b/math/mlp/inc/TMultiLayerPerceptron.h
@@ -12,21 +12,11 @@
#ifndef ROOT_TMultiLayerPerceptron
#define ROOT_TMultiLayerPerceptron
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TNeuron
#include "TNeuron.h"
-#endif
class TTree;
class TEventList;
diff --git a/math/mlp/inc/TNeuron.h b/math/mlp/inc/TNeuron.h
index 358c738475ffbe4bf4882a66cead725c891f96a6..e22156d2ff319d204c5abd68b7707e9bdadbcbb0 100644
--- a/math/mlp/inc/TNeuron.h
+++ b/math/mlp/inc/TNeuron.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TNeuron
#define ROOT_TNeuron
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
class TTreeFormula;
class TSynapse;
diff --git a/math/mlp/inc/TSynapse.h b/math/mlp/inc/TSynapse.h
index 8a2972448f18296090aadb9dc9bf494a564b0863..610a95596ebfb87663c376cbfc8f343eea48fc0b 100644
--- a/math/mlp/inc/TSynapse.h
+++ b/math/mlp/inc/TSynapse.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSynapse
#define ROOT_TSynapse
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TNeuron;
diff --git a/math/physics/inc/TLorentzRotation.h b/math/physics/inc/TLorentzRotation.h
index 61dc9de77710e6638ecf68fe15c4b7734dff6838..8fbeb363729b9c3c74802e750fab1026287d7789 100644
--- a/math/physics/inc/TLorentzRotation.h
+++ b/math/physics/inc/TLorentzRotation.h
@@ -13,12 +13,8 @@
#define ROOT_TLorentzRotation
-#ifndef ROOT_TRotation
#include "TRotation.h"
-#endif
-#ifndef ROOT_TLorentzVector
#include "TLorentzVector.h"
-#endif
class TLorentzRotation : public TObject {
diff --git a/math/physics/inc/TLorentzVector.h b/math/physics/inc/TLorentzVector.h
index fe1c0646cc0fd51cf0d2779ca4386e128e6e7258..da9e802b66c9135a2cf7a5b3a0c500474cd255e8 100644
--- a/math/physics/inc/TLorentzVector.h
+++ b/math/physics/inc/TLorentzVector.h
@@ -21,15 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
-#ifndef ROOT_TVector3
#include "TVector3.h"
-#endif
-#ifndef ROOT_TRotation
#include "TRotation.h"
-#endif
class TLorentzRotation;
diff --git a/math/physics/inc/TQuaternion.h b/math/physics/inc/TQuaternion.h
index 0bd50779ce0aedaba78dbbbcc18dabe96e5048f0..5c42be2e33013fdb3d386ff5d2029386d24ca129 100644
--- a/math/physics/inc/TQuaternion.h
+++ b/math/physics/inc/TQuaternion.h
@@ -4,12 +4,8 @@
#ifndef ROOT_TQuaternion
#define ROOT_TQuaternion
-#ifndef ROOT_TVector3
#include "TVector3.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
class TQuaternion : public TObject {
diff --git a/math/physics/inc/TRotation.h b/math/physics/inc/TRotation.h
index 8f22cc233055e41277e0f672e8d9e3483c746468..69af6c2a2861b8b9f36422e10a07874ccb34da79 100644
--- a/math/physics/inc/TRotation.h
+++ b/math/physics/inc/TRotation.h
@@ -13,9 +13,7 @@
#include "TObject.h"
-#ifndef ROOT_TVector3
#include "TVector3.h"
-#endif
class TQuaternion;
diff --git a/math/physics/inc/TVector3.h b/math/physics/inc/TVector3.h
index 27dd6a16ccf9d5067db7d75ca5af6a4eb18d7064..bad8dce8d4f4a0a3f7541182f70371e42b1a8529 100644
--- a/math/physics/inc/TVector3.h
+++ b/math/physics/inc/TVector3.h
@@ -11,18 +11,10 @@
#ifndef ROOT_TVector3
#define ROOT_TVector3
-#ifndef ROOT_TError
#include "TError.h"
-#endif
-#ifndef ROOT_TVector2
#include "TVector2.h"
-#endif
-#ifndef ROOT_TMatrix
#include "TMatrix.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
class TRotation;
diff --git a/math/quadp/inc/TQpDataBase.h b/math/quadp/inc/TQpDataBase.h
index ee8d6b1dc79fbc81608fabfdba422082bd0c49ca..e360981b6945438a7e226db385b6a5abd81b32f9 100644
--- a/math/quadp/inc/TQpDataBase.h
+++ b/math/quadp/inc/TQpDataBase.h
@@ -43,17 +43,11 @@
#ifndef ROOT_TQpDataBase
#define ROOT_TQpDataBase
-#ifndef ROOT_TError
#include "TError.h"
-#endif
-#ifndef ROOT_TQpVar
#include "TQpVar.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/math/quadp/inc/TQpDataDens.h b/math/quadp/inc/TQpDataDens.h
index c825cee609213d41302c6b6b22830000c06e157b..efd8150b1349532ba4da7a24aebc1eb4edca0d75 100644
--- a/math/quadp/inc/TQpDataDens.h
+++ b/math/quadp/inc/TQpDataDens.h
@@ -43,23 +43,13 @@
#ifndef ROOT_TQpDataDens
#define ROOT_TQpDataDens
-#ifndef ROOT_TError
#include "TError.h"
-#endif
-#ifndef ROOT_TQpDataBase
#include "TQpDataBase.h"
-#endif
-#ifndef ROOT_TQpVar
#include "TQpVar.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TMatrixDSym
#include "TMatrixDSym.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/math/quadp/inc/TQpDataSparse.h b/math/quadp/inc/TQpDataSparse.h
index c9d09910b129c7d2c31c2d9d0d6348106b64c105..1c56a9bded2a5a4976e592e1e9aad703818ade3d 100644
--- a/math/quadp/inc/TQpDataSparse.h
+++ b/math/quadp/inc/TQpDataSparse.h
@@ -43,16 +43,10 @@
#ifndef ROOT_TQpDataSparse
#define ROOT_TQpDataSparse
-#ifndef ROOT_TQpDataBase
#include "TQpDataBase.h"
-#endif
-#ifndef ROOT_TQpVar
#include "TQpVar.h"
-#endif
-#ifndef ROOT_TMatrixDSparse
#include "TMatrixDSparse.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/math/quadp/inc/TQpLinSolverBase.h b/math/quadp/inc/TQpLinSolverBase.h
index e66b794200bbdd66598018d5fae244a45cc24423..891fdc0fcafaef89ce938ab8fe31cf12fa488670 100644
--- a/math/quadp/inc/TQpLinSolverBase.h
+++ b/math/quadp/inc/TQpLinSolverBase.h
@@ -43,26 +43,14 @@
#ifndef ROOT_TQpLinSolverBase
#define ROOT_TQpLinSolverBase
-#ifndef ROOT_TError
#include "TError.h"
-#endif
-#ifndef ROOT_TQpVar
#include "TQpVar.h"
-#endif
-#ifndef ROOT_TQpDataBase
#include "TQpDataBase.h"
-#endif
-#ifndef ROOT_TQpResidual
#include "TQpResidual.h"
-#endif
-#ifndef ROOT_TQpProbBase
#include "TQpProbBase.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
///////////////////////////////////////////////////////////////////////////
// //
diff --git a/math/quadp/inc/TQpLinSolverDens.h b/math/quadp/inc/TQpLinSolverDens.h
index 55db636eba404f5d584f6d25375b6592d5f6962e..072ac148ea05ceb8bfc92ace0b8578a17f484349 100644
--- a/math/quadp/inc/TQpLinSolverDens.h
+++ b/math/quadp/inc/TQpLinSolverDens.h
@@ -44,12 +44,8 @@
#define ROOT_TQpLinSolverDens
#include "TQpLinSolverBase.h"
-#ifndef ROOT_TQpProbDens
#include "TQpProbDens.h"
-#endif
-#ifndef ROOT_TQpDataDens
#include "TQpDataDens.h"
-#endif
#include "TDecompLU.h"
diff --git a/math/quadp/inc/TQpLinSolverSparse.h b/math/quadp/inc/TQpLinSolverSparse.h
index 53211e6db148b757bc5ad6a89510bdd717881ba7..0d33a157b4d5a0207486aeab8aa6984ab1a69cbb 100644
--- a/math/quadp/inc/TQpLinSolverSparse.h
+++ b/math/quadp/inc/TQpLinSolverSparse.h
@@ -44,12 +44,8 @@
#define ROOT_TQpLinSolverSparse
#include "TQpLinSolverBase.h"
-#ifndef ROOT_TQpProbSparse
#include "TQpProbSparse.h"
-#endif
-#ifndef ROOT_TQpDataSparse
#include "TQpDataSparse.h"
-#endif
#include "TDecompSparse.h"
diff --git a/math/quadp/inc/TQpProbBase.h b/math/quadp/inc/TQpProbBase.h
index eecbac8ba5fd623d57b8bfc761ad53c3bcc6e4d6..79ffb9ef57cc7e207e307ba0b1d0f052996abd31 100644
--- a/math/quadp/inc/TQpProbBase.h
+++ b/math/quadp/inc/TQpProbBase.h
@@ -43,23 +43,13 @@
#ifndef ROOT_TQpProbBase
#define ROOT_TQpProbBase
-#ifndef ROOT_TError
#include "TError.h"
-#endif
-#ifndef ROOT_TQpVar
#include "TQpVar.h"
-#endif
-#ifndef ROOT_TQpDataBase
#include "TQpDataBase.h"
-#endif
-#ifndef ROOT_TQpResidual
#include "TQpResidual.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
///////////////////////////////////////////////////////////////////////////
// //
diff --git a/math/quadp/inc/TQpProbDens.h b/math/quadp/inc/TQpProbDens.h
index 8f52e1c581a8d8e2d15d3213be1ac355f4cca6cd..1c74ca46363df5ffdc902206005a986c7510ca94 100644
--- a/math/quadp/inc/TQpProbDens.h
+++ b/math/quadp/inc/TQpProbDens.h
@@ -44,12 +44,8 @@
#define ROOT_TQpProbDens
#include "TQpProbBase.h"
-#ifndef ROOT_TQpDataDens
#include "TQpDataDens.h"
-#endif
-#ifndef ROOT_TQpVars
#include "TQpVar.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/math/quadp/inc/TQpProbSparse.h b/math/quadp/inc/TQpProbSparse.h
index 77aa83354bfad12717f8ec92f80f3b047b6d5bc6..580bff16094fac3a3b4eada47573ebb908612e1f 100644
--- a/math/quadp/inc/TQpProbSparse.h
+++ b/math/quadp/inc/TQpProbSparse.h
@@ -44,12 +44,8 @@
#define ROOT_TQpProbSparse
#include "TQpProbBase.h"
-#ifndef ROOT_TQpDataSparse
#include "TQpDataSparse.h"
-#endif
-#ifndef ROOT_TQpVars
#include "TQpVar.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/math/quadp/inc/TQpResidual.h b/math/quadp/inc/TQpResidual.h
index 81f259b3a7e1a54601e8d369218a7c1ae80a4810..a06a91697e7dbb0c671455c790dfa07b995d69cf 100644
--- a/math/quadp/inc/TQpResidual.h
+++ b/math/quadp/inc/TQpResidual.h
@@ -43,20 +43,12 @@
#ifndef ROOT_TQpResidual
#define ROOT_TQpResidual
-#ifndef ROOT_TError
#include "TError.h"
-#endif
-#ifndef ROOT_TQpVar
#include "TQpVar.h"
-#endif
-#ifndef ROOT_TQpDataDens
#include "TQpDataDens.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
///////////////////////////////////////////////////////////////////////////
// //
diff --git a/math/quadp/inc/TQpSolverBase.h b/math/quadp/inc/TQpSolverBase.h
index af448ee8df68a78ba237f208b474360b2ec9e9ab..99e9ca6f7a3a5ed0c2177db510a0699518d0e11e 100644
--- a/math/quadp/inc/TQpSolverBase.h
+++ b/math/quadp/inc/TQpSolverBase.h
@@ -43,30 +43,16 @@
#ifndef ROOT_TQpSolverBase
#define ROOT_TQpSolverBase
-#ifndef ROOT_TError
#include "TError.h"
-#endif
#include "TObject.h"
-#ifndef ROOT_TQpVar
#include "TQpVar.h"
-#endif
-#ifndef ROOT_TQpDataBase
#include "TQpDataBase.h"
-#endif
-#ifndef ROOT_TQpResidual
#include "TQpResidual.h"
-#endif
-#ifndef ROOT_TQpProbBase
#include "TQpProbBase.h"
-#endif
-#ifndef ROOT_TQpLinSolverBase
#include "TQpLinSolverBase.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
///////////////////////////////////////////////////////////////////////////
// //
diff --git a/math/quadp/inc/TQpVar.h b/math/quadp/inc/TQpVar.h
index 56819b29121e6a86eed140733c1bdcd91abde882..8c0cd5ceac2b57c1ebbc5a6627283b940faed66b 100644
--- a/math/quadp/inc/TQpVar.h
+++ b/math/quadp/inc/TQpVar.h
@@ -43,16 +43,10 @@
#ifndef ROOT_TQpVar
#define ROOT_TQpVar
-#ifndef ROOT_TError
#include "TError.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
///////////////////////////////////////////////////////////////////////////
// //
diff --git a/math/rtools/inc/Math/RMinimizer.h b/math/rtools/inc/Math/RMinimizer.h
index b2dce65918b546273c7fa2210eb73e0c6c139ae6..32d32985df89cee5a5e1c4a0d9ea792ac75b2fd4 100644
--- a/math/rtools/inc/Math/RMinimizer.h
+++ b/math/rtools/inc/Math/RMinimizer.h
@@ -6,21 +6,13 @@
#define ROOT_Math_RMinimizer
-#ifndef ROOT_Math_Functor
#include "Math/Functor.h"
-#endif
-#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
-#endif
-#ifndef ROOT_Math_BasicMinimizer
#include "Math/BasicMinimizer.h"
-#endif
-#ifndef ROOT_TMatrixD
#include "TMatrixD.h"
-#endif
namespace ROOT {
namespace Math{
diff --git a/math/smatrix/inc/Math/BinaryOpPolicy.h b/math/smatrix/inc/Math/BinaryOpPolicy.h
index d601e6e516f3cbf84e8602961d1781edcc75a4e3..51f21db97f3219b1fd5d52b246e75467f93d7cc3 100644
--- a/math/smatrix/inc/Math/BinaryOpPolicy.h
+++ b/math/smatrix/inc/Math/BinaryOpPolicy.h
@@ -18,9 +18,7 @@
*/
-#ifndef ROOT_Math_MatrixRepresentationsStatic
#include "Math/MatrixRepresentationsStatic.h"
-#endif
namespace ROOT {
diff --git a/math/smatrix/inc/Math/BinaryOperators.h b/math/smatrix/inc/Math/BinaryOperators.h
index e31da9cc457043c45b24f26ab1976bf86644d5aa..95c57ce5b63ae7dcfb490c34702226f2bb79d572 100644
--- a/math/smatrix/inc/Math/BinaryOperators.h
+++ b/math/smatrix/inc/Math/BinaryOperators.h
@@ -18,9 +18,7 @@
//
//======================================================
-#ifndef ROOT_Math_BinaryOpPolicy
#include "Math/BinaryOpPolicy.h"
-#endif
#include "Math/Expression.h"
namespace ROOT {
diff --git a/math/smatrix/inc/Math/Dfact.h b/math/smatrix/inc/Math/Dfact.h
index 5b8bdcd15946ca50609f7a07ed8ac76856fff8b0..2cded5ebc43d0f35cf652d955244d80c274b776c 100644
--- a/math/smatrix/inc/Math/Dfact.h
+++ b/math/smatrix/inc/Math/Dfact.h
@@ -30,9 +30,7 @@
#include <cmath>
-#ifndef ROOT_Math_MatrixRepresentationsStatic
#include "Math/MatrixRepresentationsStatic.h"
-#endif
namespace ROOT {
diff --git a/math/smatrix/inc/Math/Dinv.h b/math/smatrix/inc/Math/Dinv.h
index 8e29aa91e389721d0adef6596744a75af9d6ea97..04350058f42122bcc2f0c3a5d899c686bb0e88e3 100644
--- a/math/smatrix/inc/Math/Dinv.h
+++ b/math/smatrix/inc/Math/Dinv.h
@@ -35,13 +35,9 @@
#include "Math/Dsinv.h"
#endif
-#ifndef ROOT_Math_CholeskyDecomp
#include "Math/CholeskyDecomp.h"
-#endif
-#ifndef ROOT_Math_MatrixRepresentationsStatic
#include "Math/MatrixRepresentationsStatic.h"
-#endif
// #ifndef ROOT_Math_QRDecomposition
// #include "Math/QRDecomposition.h"
@@ -334,14 +330,8 @@ public:
} // namespace ROOT
-#ifndef ROOT_Math_CramerInversion_icc
#include "CramerInversion.icc"
-#endif
-#ifndef ROOT_Math_CramerInversionSym_icc
#include "CramerInversionSym.icc"
-#endif
-#ifndef ROOT_Math_MatrixInversion_icc
#include "MatrixInversion.icc"
-#endif
#endif /* ROOT_Math_Dinv */
diff --git a/math/smatrix/inc/Math/Dsfact.h b/math/smatrix/inc/Math/Dsfact.h
index fad670ce3af6e54d9f6f2be815f0084c1aba0e99..c055e16b2509703e944d4f7e60b04c5cfca051bc 100644
--- a/math/smatrix/inc/Math/Dsfact.h
+++ b/math/smatrix/inc/Math/Dsfact.h
@@ -29,9 +29,7 @@
//
// ********************************************************************
-#ifndef ROOT_Math_MatrixRepresentationsStatic
#include "Math/MatrixRepresentationsStatic.h"
-#endif
namespace ROOT {
diff --git a/math/smatrix/inc/Math/Dsinv.h b/math/smatrix/inc/Math/Dsinv.h
index e03b49f84231d6e8fa911a00ad7afdbc914ba9d1..d3531c58c3a4beb9b6e4ede4c043d50348cc9b86 100644
--- a/math/smatrix/inc/Math/Dsinv.h
+++ b/math/smatrix/inc/Math/Dsinv.h
@@ -28,9 +28,7 @@
//
// ********************************************************************
-#ifndef ROOT_Math_SMatrixDfwd
#include "Math/SMatrixDfwd.h"
-#endif
namespace ROOT {
diff --git a/math/smatrix/inc/Math/Functions.h b/math/smatrix/inc/Math/Functions.h
index 54ad2f69169b9481beb9b2cdf2665c21fddb8bdd..38db5282e0d3cb02f80c804d4fae5ed5980c96da 100644
--- a/math/smatrix/inc/Math/Functions.h
+++ b/math/smatrix/inc/Math/Functions.h
@@ -33,9 +33,7 @@
// ********************************************************************
#include <cmath>
-#ifndef ROOT_Math_Expression
#include "Math/Expression.h"
-#endif
/**
@defgroup TempFunction Generic Template Functions
diff --git a/math/smatrix/inc/Math/MatrixFunctions.h b/math/smatrix/inc/Math/MatrixFunctions.h
index 2ce76cfbdb479bd8c8b087967509872c3428da47..ee4a297a749ba0c9258fcf0f86fa71cfbd16237c 100644
--- a/math/smatrix/inc/Math/MatrixFunctions.h
+++ b/math/smatrix/inc/Math/MatrixFunctions.h
@@ -40,18 +40,10 @@
a vector, like in the matrix-vector product or a scalar like in the Similarity vector-matrix product.
*/
-#ifndef ROOT_Math_BinaryOpPolicy
#include "Math/BinaryOpPolicy.h"
-#endif
-#ifndef ROOT_Math_Expression
#include "Math/Expression.h"
-#endif
-#ifndef ROOT_Math_HelperOps
#include "Math/HelperOps.h"
-#endif
-#ifndef ROOT_Math_CholeskyDecomp
#include "Math/CholeskyDecomp.h"
-#endif
namespace ROOT {
diff --git a/math/smatrix/inc/Math/MatrixRepresentationsStatic.h b/math/smatrix/inc/Math/MatrixRepresentationsStatic.h
index b84fcf405d581e683da3d8ff65ca5c4663e6414c..56e315d2ac1d0cb951edcfa25b058c970ec05bdd 100644
--- a/math/smatrix/inc/Math/MatrixRepresentationsStatic.h
+++ b/math/smatrix/inc/Math/MatrixRepresentationsStatic.h
@@ -19,9 +19,7 @@
*/
-#ifndef ROOT_Math_StaticCheck
#include "Math/StaticCheck.h"
-#endif
#include <cstddef>
#include <utility>
diff --git a/math/smatrix/inc/Math/SMatrix.h b/math/smatrix/inc/Math/SMatrix.h
index 7adf4c988bfd32f4d35a64c252d8ff35168746c9..7755eec92411f53d9c4921cd435938f5df0e1d36 100644
--- a/math/smatrix/inc/Math/SMatrix.h
+++ b/math/smatrix/inc/Math/SMatrix.h
@@ -39,9 +39,7 @@
***************************************************************************/
// for platform specific configurations
-#ifndef ROOT_Math_MnConfig
#include "Math/MConfig.h"
-#endif
#include <iosfwd>
@@ -83,12 +81,8 @@
*/
-#ifndef ROOT_Math_Expression
#include "Math/Expression.h"
-#endif
-#ifndef ROOT_Math_MatrixRepresentationsStatic
#include "Math/MatrixRepresentationsStatic.h"
-#endif
namespace ROOT {
@@ -737,13 +731,9 @@ inline std::ostream& operator<<(std::ostream& os, const ROOT::Math::SMatrix<T,D1
#ifndef __CINT__
-#ifndef ROOT_Math_SMatrix_icc
#include "Math/SMatrix.icc"
-#endif
-#ifndef ROOT_Math_MatrixFunctions
#include "Math/MatrixFunctions.h"
-#endif
#endif //__CINT__
diff --git a/math/smatrix/inc/Math/SMatrix.icc b/math/smatrix/inc/Math/SMatrix.icc
index cf0386258a9c9bc3cf90efe463177c70d2942fda..0029e0292d8eaf9e9b951ec0937c51f726f71679 100644
--- a/math/smatrix/inc/Math/SMatrix.icc
+++ b/math/smatrix/inc/Math/SMatrix.icc
@@ -47,21 +47,11 @@
//#include "Math/Dsinv_array.h"
//#include "Math/Dsfact.h"
-#ifndef ROOT_Math_Dfact
#include "Math/Dfact.h"
-#endif
-#ifndef ROOT_Math_Dinv
#include "Math/Dinv.h"
-#endif
-#ifndef ROOT_Math_Functions
#include "Math/Functions.h"
-#endif
-#ifndef ROOT_Math_HelperOps
#include "Math/HelperOps.h"
-#endif
-#ifndef ROOT_Math_StaticCheck
#include "Math/StaticCheck.h"
-#endif
diff --git a/math/smatrix/inc/Math/SVector.h b/math/smatrix/inc/Math/SVector.h
index 638e602bd7fd88f841e156157834c3257707b5b3..5d64b49eff2ea85a86a568fd775230cce09bb25a 100644
--- a/math/smatrix/inc/Math/SVector.h
+++ b/math/smatrix/inc/Math/SVector.h
@@ -35,17 +35,13 @@
//
********************************************************************/
-#ifndef ROOT_Math_MnConfig
#include "Math/MConfig.h"
-#endif
#include <iosfwd>
// expression engine
-#ifndef ROOT_Math_Expression
#include "Math/Expression.h"
-#endif
@@ -355,17 +351,11 @@ std::ostream& operator<<(std::ostream& os, const ROOT::Math::SVector<T,D>& rhs);
#ifndef __CINT__
// include implementation file
-#ifndef ROOT_Math_SVector_icc
#include "Math/SVector.icc"
-#endif
// include operators and functions
-#ifndef ROOT_Math_UnaryOperators
#include "Math/UnaryOperators.h"
-#endif
-#ifndef ROOT_Math_BinaryOperators
#include "Math/BinaryOperators.h"
-#endif
#ifndef ROOT_Math_MatrixFunctions
#include "Math/Functions.h"
#endif
diff --git a/math/smatrix/inc/Math/SVector.icc b/math/smatrix/inc/Math/SVector.icc
index d8db32a604bf7fc1b3b26a54eaba13d45665cda1..2bab9f525a37cd907d5c720a9f00c1dd2c655973 100644
--- a/math/smatrix/inc/Math/SVector.icc
+++ b/math/smatrix/inc/Math/SVector.icc
@@ -39,9 +39,7 @@
#include <assert.h>
#include <algorithm>
-#ifndef ROOT_Math_StaticCheck
#include "Math/StaticCheck.h"
-#endif
namespace ROOT {
diff --git a/math/smatrix/inc/Math/UnaryOperators.h b/math/smatrix/inc/Math/UnaryOperators.h
index 5eea8d5577a69196b83aa1bec011f68f7757d6a4..cf386b37ead4624477fe653b040f73fd1a5d75a9 100644
--- a/math/smatrix/inc/Math/UnaryOperators.h
+++ b/math/smatrix/inc/Math/UnaryOperators.h
@@ -20,9 +20,7 @@
#include <cmath>
-#ifndef ROOT_Math_Expression
#include "Math/Expression.h"
-#endif
namespace ROOT {
diff --git a/math/unuran/inc/TUnuran.h b/math/unuran/inc/TUnuran.h
index 59abfffaaeedb7d545d0a870487dd82155121b2a..7cda972659ca2c981391cbe1267635188449a1ee 100644
--- a/math/unuran/inc/TUnuran.h
+++ b/math/unuran/inc/TUnuran.h
@@ -15,9 +15,7 @@
#include <string>
-#ifndef ROOT_Math_TUnuranBaseDist
#include "TUnuranBaseDist.h"
-#endif
class TUnuranContDist;
diff --git a/math/unuran/inc/TUnuranBaseDist.h b/math/unuran/inc/TUnuranBaseDist.h
index e4522c5b2eb22517f0e68e01c05637714ffee65c..9cca8c55a026db8d4418088d0150770bf65dcd15 100644
--- a/math/unuran/inc/TUnuranBaseDist.h
+++ b/math/unuran/inc/TUnuranBaseDist.h
@@ -15,9 +15,7 @@
#define ROOT_Math_TUnuranBaseDist
//needed by the ClassDef
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
//______________________________________________________________________
diff --git a/math/unuran/inc/TUnuranContDist.h b/math/unuran/inc/TUnuranContDist.h
index b3a2eb0f1a8c62b241f2f8e1c6fd2884f207354a..1fff870c5cf42733314252b9d03fc8b492ae2619 100644
--- a/math/unuran/inc/TUnuranContDist.h
+++ b/math/unuran/inc/TUnuranContDist.h
@@ -14,13 +14,9 @@
#ifndef ROOT_Math_TUnuranContDist
#define ROOT_Math_TUnuranContDist
-#ifndef ROOT_Math_TUnuranBaseDist
#include "TUnuranBaseDist.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
class TF1;
diff --git a/math/unuran/inc/TUnuranDiscrDist.h b/math/unuran/inc/TUnuranDiscrDist.h
index ab1bf282915c5a164eef782d2eca6bdb81ab7031..5a098cb36b6216b5fc35966b829e069c6c1d0863 100644
--- a/math/unuran/inc/TUnuranDiscrDist.h
+++ b/math/unuran/inc/TUnuranDiscrDist.h
@@ -14,13 +14,9 @@
#ifndef ROOT_Math_TUnuranDiscrDist
#define ROOT_Math_TUnuranDiscrDist
-#ifndef ROOT_Math_TUnuranBaseDist
#include "TUnuranBaseDist.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
#include <vector>
diff --git a/math/unuran/inc/TUnuranEmpDist.h b/math/unuran/inc/TUnuranEmpDist.h
index 65c18cf9ca6c49d55e749142918c6bc15cc58fd5..80e0d94b7d4434e0a643417325b87d664107a797 100644
--- a/math/unuran/inc/TUnuranEmpDist.h
+++ b/math/unuran/inc/TUnuranEmpDist.h
@@ -15,9 +15,7 @@
#define ROOT_Math_TUnuranEmpDist
-#ifndef ROOT_Math_TUnuranBaseDist
#include "TUnuranBaseDist.h"
-#endif
#include <vector>
diff --git a/math/unuran/inc/TUnuranMultiContDist.h b/math/unuran/inc/TUnuranMultiContDist.h
index f68a50f15c45ce1c2d63432814e3558c16c2da46..38103d9844c9f0953666a8c5fc29f8acc2e7d26a 100644
--- a/math/unuran/inc/TUnuranMultiContDist.h
+++ b/math/unuran/inc/TUnuranMultiContDist.h
@@ -13,13 +13,9 @@
#ifndef ROOT_Math_TUnuranMultiContDist
#define ROOT_Math_TUnuranMultiContDist
-#ifndef ROOT_Math_TUnuranBaseDist
#include "TUnuranBaseDist.h"
-#endif
-#ifndef ROOT_Math_IFunction
#include "Math/IFunction.h"
-#endif
diff --git a/math/unuran/inc/TUnuranSampler.h b/math/unuran/inc/TUnuranSampler.h
index 704894e55b22abb51d97d559933a08c24f26f5f4..0e59a644cb6700532790caa67c3a99d5f9fd4dd0 100644
--- a/math/unuran/inc/TUnuranSampler.h
+++ b/math/unuran/inc/TUnuranSampler.h
@@ -13,9 +13,7 @@
#define ROOT_TUnuranSampler
-#ifndef ROOT_Math_DistSampler
#include "Math/DistSampler.h"
-#endif
namespace ROOT {
diff --git a/misc/memstat/inc/TMemStat.h b/misc/memstat/inc/TMemStat.h
index a166511a2f8d7b0438dd93b64179648f56d17b4e..524d934b69d2caed0aaa74fadc6ea9b90cd52a98 100644
--- a/misc/memstat/inc/TMemStat.h
+++ b/misc/memstat/inc/TMemStat.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TMemStat
#define ROOT_TMemStat
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TMemStat: public TObject {
private:
diff --git a/misc/memstat/inc/TMemStatMng.h b/misc/memstat/inc/TMemStatMng.h
index 76f4f6272d5db86962fd560a99bce2901b8e92f4..be07cf18155d5b03d2f4d4cc87e1f936dd82daa4 100644
--- a/misc/memstat/inc/TMemStatMng.h
+++ b/misc/memstat/inc/TMemStatMng.h
@@ -14,19 +14,11 @@
// STD
#include <map>
// ROOT
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TTimeStamp
#include "TTimeStamp.h"
-#endif
// Memstat
-#ifndef ROOT_TMemStatHook
#include "TMemStatHook.h"
-#endif
-#ifndef ROOT_TMemStatDef
#include "TMemStatDef.h"
-#endif
class TTree;
class TFile;
diff --git a/misc/table/inc/TFileIter.h b/misc/table/inc/TFileIter.h
index b486749e5c9de9da4ff4d4270d0c66d5e915a6be..41f8889ff37f2a8f8ed1a96ebf2ca53c3a6945c5 100644
--- a/misc/table/inc/TFileIter.h
+++ b/misc/table/inc/TFileIter.h
@@ -44,18 +44,10 @@
// //
///////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TIterator
#include "TIterator.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
class TFileIter : public TListIter {
diff --git a/misc/table/inc/TIndexTable.h b/misc/table/inc/TIndexTable.h
index 6786bdbf8e3307b1c1ce4a28cec3692b126898e4..0c4206cd85c638c56d443df4f31552e7c697f12b 100644
--- a/misc/table/inc/TIndexTable.h
+++ b/misc/table/inc/TIndexTable.h
@@ -13,9 +13,7 @@
#ifndef ROOT_TIndexTable
#define ROOT_TIndexTable
-#ifndef ROOT_TTable
#include "TTable.h"
-#endif
//////////////////////////////////////////////////////
//
diff --git a/misc/table/inc/TPoints3D.h b/misc/table/inc/TPoints3D.h
index 56aacc0daea900fd8bdc2ac26a1647271bb94e3c..04299f5f2dad5f5548783e82cc3918ca55653748 100644
--- a/misc/table/inc/TPoints3D.h
+++ b/misc/table/inc/TPoints3D.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TPoints3DABC
#include "TPoints3DABC.h"
-#endif
class TPoints3D : public TPoints3DABC {
diff --git a/misc/table/inc/TPointsArray3D.h b/misc/table/inc/TPointsArray3D.h
index 85938579babfa8887d8d0cd3664289a7ad6be41a..bfa40398ed25a5078a52cc03f4b2eb877b439d9e 100644
--- a/misc/table/inc/TPointsArray3D.h
+++ b/misc/table/inc/TPointsArray3D.h
@@ -21,9 +21,7 @@
#include "TPoints3DABC.h"
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TPointsArray3D : public TPoints3DABC {
diff --git a/misc/table/inc/TPolyLineShape.h b/misc/table/inc/TPolyLineShape.h
index e94ecdd13da140d21f4d3d7536d39a5ffd9e132b..b176f9bab4018f6ed18c932cd4854e1ff267a82c 100644
--- a/misc/table/inc/TPolyLineShape.h
+++ b/misc/table/inc/TPolyLineShape.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TPolyLineShape
#define ROOT_TPolyLineShape
-#ifndef ROOT_TShape
#include "TShape.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
class TPoints3DABC;
class TVirtualPad;
diff --git a/misc/table/inc/TTableMap.h b/misc/table/inc/TTableMap.h
index e8a1171b0a22d6698765509ce485408e5e6f03ea..bf3efb3f5bbaed1dc41a07006afa94de83fc8a7f 100644
--- a/misc/table/inc/TTableMap.h
+++ b/misc/table/inc/TTableMap.h
@@ -16,9 +16,7 @@
#include "assert.h"
#include <vector>
-#ifndef ROOT_TTable
#include "TTable.h"
-#endif
//////////////////////////////////////////////////////
//
diff --git a/misc/table/inc/TTablePadView3D.h b/misc/table/inc/TTablePadView3D.h
index eefcacb035d394be099a0b8f62fd5911bcf60276..c4b412a6c2dd89c295a4245a59a0d559e34af12a 100644
--- a/misc/table/inc/TTablePadView3D.h
+++ b/misc/table/inc/TTablePadView3D.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
diff --git a/misc/table/inc/TVolume.h b/misc/table/inc/TVolume.h
index f684d8e595170256a962115b183a832995bc012d..89bffa589d3e2c63ce2470e5a16effb17e6b6ed4 100644
--- a/misc/table/inc/TVolume.h
+++ b/misc/table/inc/TVolume.h
@@ -24,15 +24,9 @@
#include "TNode.h"
-#ifndef ROOT_TShape
#include "TShape.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
class TBrowser;
class TVolumePosition;
diff --git a/montecarlo/eg/inc/Hepevt.h b/montecarlo/eg/inc/Hepevt.h
index 5c430295f57db3004f71b2c285f25640774aa0b4..ca530ceb997d8fa29d96ebb7da5f2d2141120a52 100644
--- a/montecarlo/eg/inc/Hepevt.h
+++ b/montecarlo/eg/inc/Hepevt.h
@@ -11,13 +11,9 @@
#ifndef ROOT_Hepevt
#define ROOT_Hepevt
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef __CFORTRAN_LOADED
#include "cfortran.h"
-#endif
extern "C" {
diff --git a/montecarlo/eg/inc/TAttParticle.h b/montecarlo/eg/inc/TAttParticle.h
index bdc51c70518c62e453fbbe17b616d0c9bd9d0c24..859da898b33a2d1e2d4dcf2cc5324ceecf10a9a4 100644
--- a/montecarlo/eg/inc/TAttParticle.h
+++ b/montecarlo/eg/inc/TAttParticle.h
@@ -22,12 +22,8 @@
#ifndef ROOT_TAttParticle
#define ROOT_TAttParticle
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
class THashList;
diff --git a/montecarlo/eg/inc/TDatabasePDG.h b/montecarlo/eg/inc/TDatabasePDG.h
index adc72d8f72a7eec9f01e6b7a19ea699a759c2d29..d4aab33738d7945e83732b89be9489090a210d4d 100644
--- a/montecarlo/eg/inc/TDatabasePDG.h
+++ b/montecarlo/eg/inc/TDatabasePDG.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TDatabasePDG
#define ROOT_TDatabasePDG
-#ifndef ROOT_TParticlePDG
#include "TParticlePDG.h"
-#endif
-#ifndef ROOT_TParticleClassPDG
#include "TParticleClassPDG.h"
-#endif
class THashList;
class TExMap;
diff --git a/montecarlo/eg/inc/TDecayChannel.h b/montecarlo/eg/inc/TDecayChannel.h
index 660eb3cdf2d283451616a9eb3711e147adfc5346..53f5901ec8e5533e87125d969baa225d77abef91 100644
--- a/montecarlo/eg/inc/TDecayChannel.h
+++ b/montecarlo/eg/inc/TDecayChannel.h
@@ -17,12 +17,8 @@
#ifndef ROOT_TDecayChannel
#define ROOT_TDecayChannel
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TArrayI
#include "TArrayI.h"
-#endif
class TDecayChannel: public TObject{
diff --git a/montecarlo/eg/inc/TGenerator.h b/montecarlo/eg/inc/TGenerator.h
index ddce96c41a5a2672a4e8bbe1d82b3429afa2d4a1..225e48225245c4409b791e35286fcf8fedac8f51 100644
--- a/montecarlo/eg/inc/TGenerator.h
+++ b/montecarlo/eg/inc/TGenerator.h
@@ -134,9 +134,7 @@
#ifndef ROOT_TGenerator
#define ROOT_TGenerator
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TBrowser;
class TParticle;
diff --git a/montecarlo/eg/inc/TParticle.h b/montecarlo/eg/inc/TParticle.h
index a7f0e2d16cf97e6cbfddbcf6ee12e83e6e30252b..7060b032b135279c4b47efacdcdb14b9846c35be 100644
--- a/montecarlo/eg/inc/TParticle.h
+++ b/montecarlo/eg/inc/TParticle.h
@@ -16,18 +16,10 @@
#ifndef ROOT_TParticle
#define ROOT_TParticle
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAtt3D
#include "TAtt3D.h"
-#endif
-#ifndef ROOT_TLorentzVector
#include "TLorentzVector.h"
-#endif
class TParticlePDG;
diff --git a/montecarlo/eg/inc/TParticlePDG.h b/montecarlo/eg/inc/TParticlePDG.h
index 48a2578154ebfaddc8c4c8a9bbe7a2ae0310437e..866678328405b23556f294b88d731fb86c7b05da 100644
--- a/montecarlo/eg/inc/TParticlePDG.h
+++ b/montecarlo/eg/inc/TParticlePDG.h
@@ -11,12 +11,8 @@
#ifndef TParticlePDG_hh
#define TParticlePDG_hh
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
class TDecayChannel;
diff --git a/montecarlo/eg/inc/TPrimary.h b/montecarlo/eg/inc/TPrimary.h
index ab0f2dff8cdf569ac25bfd3da2f73942441bc0d3..04bf38fcc4e5019a3ed68a85f3d41bb3774f1fce 100644
--- a/montecarlo/eg/inc/TPrimary.h
+++ b/montecarlo/eg/inc/TPrimary.h
@@ -21,18 +21,10 @@
#ifndef ROOT_TPrimary
#define ROOT_TPrimary
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAtt3D
#include "TAtt3D.h"
-#endif
-#ifndef ROOT_X3DBuffer
#include "X3DBuffer.h"
-#endif
class TAttParticle;
diff --git a/montecarlo/pythia6/inc/TMCParticle.h b/montecarlo/pythia6/inc/TMCParticle.h
index 0a0268e5f7555d0a1268bf4733bcac1e93eddf3c..d6a462b2562014c4ee3a29450fae70401bf21e0d 100644
--- a/montecarlo/pythia6/inc/TMCParticle.h
+++ b/montecarlo/pythia6/inc/TMCParticle.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TMCParticle
#define ROOT_TMCParticle
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TPrimary
#include "TPrimary.h"
-#endif
class TMCParticle : public TObject, public TAttLine {
diff --git a/montecarlo/pythia6/inc/TPythia6.h b/montecarlo/pythia6/inc/TPythia6.h
index 11cf5ec8b5e7dabaed9e9821025e34ed4d54c3ad..8ce10bbd98ddf26ca022f2277dc7779e34f44188 100644
--- a/montecarlo/pythia6/inc/TPythia6.h
+++ b/montecarlo/pythia6/inc/TPythia6.h
@@ -75,17 +75,11 @@
//#pragma interface
//#endif
-#ifndef ROOT_TPythia6Calls
#include "TPythia6Calls.h"
-#endif
-#ifndef ROOT_TGenerator
#include "TGenerator.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
class TPythia6 : public TGenerator {
diff --git a/montecarlo/pythia6/inc/TPythia6Decayer.h b/montecarlo/pythia6/inc/TPythia6Decayer.h
index bfb0d605e5b4db3610cc724a49512e6e03553a48..f8a66a8182ac617d250ab8e3af6443c03cd20bff 100644
--- a/montecarlo/pythia6/inc/TPythia6Decayer.h
+++ b/montecarlo/pythia6/inc/TPythia6Decayer.h
@@ -23,15 +23,9 @@
// //
///////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualMCDecayer
#include "TVirtualMCDecayer.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TArrayF
#include "TArrayF.h"
-#endif
class TPythia6Decayer : public TVirtualMCDecayer {
diff --git a/montecarlo/vmc/inc/TVirtualMCApplication.h b/montecarlo/vmc/inc/TVirtualMCApplication.h
index 2f292e41dc11e7ea9eb50d6b85b2feb183a550ea..ead5ad5245f5beb2e27b9deeaf70ef4b4af5bc3e 100644
--- a/montecarlo/vmc/inc/TVirtualMCApplication.h
+++ b/montecarlo/vmc/inc/TVirtualMCApplication.h
@@ -18,12 +18,8 @@
// Interface to a user Monte Carlo application.
//
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
#include "TMCtls.h"
diff --git a/net/alien/inc/TAlien.h b/net/alien/inc/TAlien.h
index 1c6880a8d5b0798dd268c7debace6cea0e8d8ca4..460c1bb834abff0b1c570828972e424ac6373327 100644
--- a/net/alien/inc/TAlien.h
+++ b/net/alien/inc/TAlien.h
@@ -21,13 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGrid
#include "TGrid.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class GapiUI;
class TGridJob;
diff --git a/net/alien/inc/TAlienCollection.h b/net/alien/inc/TAlienCollection.h
index ec5786615442404189c21761aa51257e8235d3ee..d22e963f815854f954616c628c2b07283daf4a8c 100644
--- a/net/alien/inc/TAlienCollection.h
+++ b/net/alien/inc/TAlienCollection.h
@@ -24,18 +24,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGridCollection
#include "TGridCollection.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TFileStager
#include "TFileStager.h"
-#endif
class TFileCollection;
diff --git a/net/alien/inc/TAlienDirectory.h b/net/alien/inc/TAlienDirectory.h
index 7d94e36836eff1fa65c45586c16f16987d8558e9..b68fa3dbf8ee8ea714cf564426c123fa74f12b59 100644
--- a/net/alien/inc/TAlienDirectory.h
+++ b/net/alien/inc/TAlienDirectory.h
@@ -20,18 +20,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Tlist
#include "TList.h"
-#endif
-#ifndef ROOT_TBrowser
#include "TBrowser.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class TAlienDirectoryEntry : public TNamed {
diff --git a/net/alien/inc/TAlienFile.h b/net/alien/inc/TAlienFile.h
index 42bf9f2545a7cc4e099e822d61661200bdfc83bf..adde2d4ab16a904543abe95ba06b633cc37d2f5c 100644
--- a/net/alien/inc/TAlienFile.h
+++ b/net/alien/inc/TAlienFile.h
@@ -31,9 +31,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TXNetFile
#include "TXNetFile.h"
-#endif
class TUrl;
diff --git a/net/alien/inc/TAlienJDL.h b/net/alien/inc/TAlienJDL.h
index 1a5ff91a64365ea629076851546484151d8f2b3b..9e6308447fcc1b4b146cd0ea8584f92ea07b29c2 100644
--- a/net/alien/inc/TAlienJDL.h
+++ b/net/alien/inc/TAlienJDL.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGridJDL
#include "TGridJDL.h"
-#endif
class TAlienJDL : public TGridJDL {
diff --git a/net/alien/inc/TAlienJob.h b/net/alien/inc/TAlienJob.h
index d3ba9d25826ecec32cb127de9955aaefe8be23bb..d4bf0e5d20db60eaee2fba220ff65ce4ab830b43 100644
--- a/net/alien/inc/TAlienJob.h
+++ b/net/alien/inc/TAlienJob.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGridJob
#include "TGridJob.h"
-#endif
class TAlienJob : public TGridJob {
diff --git a/net/alien/inc/TAlienJobStatus.h b/net/alien/inc/TAlienJobStatus.h
index bcaa1b6cb2872c7beac6ef615a9a3b80055a3b51..e9bab14d120441bc765a0bbdb12f9cc6e47d0217 100644
--- a/net/alien/inc/TAlienJobStatus.h
+++ b/net/alien/inc/TAlienJobStatus.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGridJobStatus
#include "TGridJobStatus.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class TAlienJob;
class TAlienMasterJob;
diff --git a/net/alien/inc/TAlienJobStatusList.h b/net/alien/inc/TAlienJobStatusList.h
index 688205211d60ffd49a2e7177d9021fce2a07acc6..844ac22ed00265836d67dc3393df835fbe08c797 100644
--- a/net/alien/inc/TAlienJobStatusList.h
+++ b/net/alien/inc/TAlienJobStatusList.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGridJobStatusList
#include "TGridJobStatusList.h"
-#endif
class TAlienJob;
diff --git a/net/alien/inc/TAlienMasterJob.h b/net/alien/inc/TAlienMasterJob.h
index 37a278dddbd8534073f87cfd6350b7d759b3cb06..4f021a1147c814420776b514c36e0946b508384c 100644
--- a/net/alien/inc/TAlienMasterJob.h
+++ b/net/alien/inc/TAlienMasterJob.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGridJob
#include "TGridJob.h"
-#endif
class TAlienMasterJob : public TGridJob {
diff --git a/net/alien/inc/TAlienMasterJobStatus.h b/net/alien/inc/TAlienMasterJobStatus.h
index 1815acc4b9d274de36e65d2cb33cdbc658a0e26f..6852368503e24cde491c9ab1cf66045224475c20 100644
--- a/net/alien/inc/TAlienMasterJobStatus.h
+++ b/net/alien/inc/TAlienMasterJobStatus.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGridJobStatus
#include "TGridJobStatus.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class TAlienJobStatus;
class TAlienMasterJob;
diff --git a/net/alien/inc/TAlienPackage.h b/net/alien/inc/TAlienPackage.h
index 132d33ff64c0286111707943e9d200c98ca70cc2..7566370e286ac16d549b4f6dd3af35df99c1b9a8 100644
--- a/net/alien/inc/TAlienPackage.h
+++ b/net/alien/inc/TAlienPackage.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TAlienPackage
#define ROOT_TAlienPackage
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TGrid
#include "TGrid.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/net/alien/inc/TAlienResult.h b/net/alien/inc/TAlienResult.h
index 2b83000fa0c53a7a6b35f61eae66de108fd4c700..f814c657c159090697268a578be5a336c419d57b 100644
--- a/net/alien/inc/TAlienResult.h
+++ b/net/alien/inc/TAlienResult.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGridResult
#include "TGridResult.h"
-#endif
class TAlienResult : public TGridResult {
diff --git a/net/alien/inc/TAlienSystem.h b/net/alien/inc/TAlienSystem.h
index a2e9397826a10f57876751470e83d630d1346677..8d931cc5ef1b68ac0651eee19c8daad52731dc43 100644
--- a/net/alien/inc/TAlienSystem.h
+++ b/net/alien/inc/TAlienSystem.h
@@ -24,9 +24,7 @@
#include <stdio.h>
#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
class TAlienSystem : public TSystem {
diff --git a/net/auth/inc/AuthConst.h b/net/auth/inc/AuthConst.h
index fdb227336408f2380c036cf9358df6a676185bd1..4e57f7f06de6526ce8938396cec84756e71ab844 100644
--- a/net/auth/inc/AuthConst.h
+++ b/net/auth/inc/AuthConst.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
// Number of security levels and masks
const Int_t kMAXSEC = 6;
diff --git a/net/auth/inc/TAFS.h b/net/auth/inc/TAFS.h
index dfdcbbb45587a0b07d1bbc7926116c44c272b49e..a477b9180fc5144bd0e3f7dd091805f7a0fbb131 100644
--- a/net/auth/inc/TAFS.h
+++ b/net/auth/inc/TAFS.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TPluginHandler;
diff --git a/net/auth/inc/TAuthenticate.h b/net/auth/inc/TAuthenticate.h
index 641fab602c7971c2c639d75747d77e01056b5c2d..2f0d81170cbbbee10742fc725d641b860d8d758a 100644
--- a/net/auth/inc/TAuthenticate.h
+++ b/net/auth/inc/TAuthenticate.h
@@ -22,24 +22,14 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TDatime
#include "TDatime.h"
-#endif
#ifndef ROOT_rsafun
//#include "rsafun.h"
#endif
-#ifndef ROOT_AuthConst
#include "AuthConst.h"
-#endif
#ifdef R__SSL
// SSL specific headers for blowfish encryption
#include <openssl/blowfish.h>
diff --git a/net/auth/inc/THostAuth.h b/net/auth/inc/THostAuth.h
index d2017141b5b8fd9e2ceb37d1925be43d28a83de2..4ca2d0697a4255b9df0666ca031d5549e2f417d7 100644
--- a/net/auth/inc/THostAuth.h
+++ b/net/auth/inc/THostAuth.h
@@ -23,21 +23,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TRootSecContext
#include "TRootSecContext.h"
-#endif
-#ifndef ROOT_AuthConst
#include "AuthConst.h"
-#endif
#include "TSecContext.h" // for kROOTTZERO.
diff --git a/net/auth/inc/TRootAuth.h b/net/auth/inc/TRootAuth.h
index 74b35278b0e10235c654aed1149c8d40477cd0f0..11d34e7b38a537d073dc0aba59829e091ae33659 100644
--- a/net/auth/inc/TRootAuth.h
+++ b/net/auth/inc/TRootAuth.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualAuth
#include "TVirtualAuth.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TSecContext;
class TSocket;
diff --git a/net/auth/inc/TRootSecContext.h b/net/auth/inc/TRootSecContext.h
index ef4e23e5943c909586a38a144ba6465b708b07e6..70650b140cee7ba9609494f881be70c56f804abd 100644
--- a/net/auth/inc/TRootSecContext.h
+++ b/net/auth/inc/TRootSecContext.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TAuthenticate
#include "TAuthenticate.h"
-#endif
-#ifndef ROOT_TSecContext
#include "TSecContext.h"
-#endif
class TRootSecContext : public TSecContext {
diff --git a/net/auth/res/rsaaux.h b/net/auth/res/rsaaux.h
index 999c4ec6ef2718d23ab91c3239d815188e99c993..823a4a0a3617e04c24305939275a0945bb3f8e27 100644
--- a/net/auth/res/rsaaux.h
+++ b/net/auth/res/rsaaux.h
@@ -34,9 +34,7 @@ MA 02110-1301 USA
#ifndef _RSAAUX_H
#define _RSAAUX_H
-#ifndef _RSADEF_H
#include "rsadef.h"
-#endif
extern rsa_NUMBER a_one,a_two;
diff --git a/net/auth/res/rsafun.h b/net/auth/res/rsafun.h
index e69c7c256252040ffd0664ebd39561a566ee5445..ddd2d7685b62cbf04408b4ed4ad44dafbac43121 100644
--- a/net/auth/res/rsafun.h
+++ b/net/auth/res/rsafun.h
@@ -36,9 +36,7 @@ MA 02110-1301 USA
#ifndef ROOT_rsafun
#define ROOT_rsafun
-#ifndef _RSADEF_H
#include "rsadef.h"
-#endif
typedef rsa_NUMBER (*RSA_genprim_t)(int, int);
diff --git a/net/auth/res/rsalib.h b/net/auth/res/rsalib.h
index dea5b33356707a7081af3e1fe1bff7f5c1b9df82..8086c50af62f8c54ef2ae20c1f898c56dd47da75 100644
--- a/net/auth/res/rsalib.h
+++ b/net/auth/res/rsalib.h
@@ -34,9 +34,7 @@ MA 02110-1301 USA
#ifndef _RSALIB_H
#define _RSALIB_H
-#ifndef _RSADEF_H
#include "rsadef.h"
-#endif
#include <stdio.h>
diff --git a/net/auth/src/DaemonUtils.h b/net/auth/src/DaemonUtils.h
index 1fe7de300f86b9823768416f8ca928ed248e1910..d28622b0f63a8dd95831e81b8f821b7f3873f34d 100644
--- a/net/auth/src/DaemonUtils.h
+++ b/net/auth/src/DaemonUtils.h
@@ -24,18 +24,10 @@
#include <string>
-#ifndef ROOT_TSocket
#include "TSocket.h"
-#endif
-#ifndef ROOT_TSeqCollection
#include "TSeqCollection.h"
-#endif
-#ifndef ROOT_NetErrors
#include "NetErrors.h"
-#endif
-#ifndef ROOT_rpddefs
#include "rpddefs.h"
-#endif
#include "rpdp.h"
diff --git a/net/bonjour/inc/TBonjourBrowser.h b/net/bonjour/inc/TBonjourBrowser.h
index 8ebfccbdcfd880dbe585057fdcc68eca00f57abd..57af6c02e5e95e7baacfd8efe4cc39ad0d6b9e8a 100644
--- a/net/bonjour/inc/TBonjourBrowser.h
+++ b/net/bonjour/inc/TBonjourBrowser.h
@@ -34,15 +34,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#if !defined(__CINT__)
#include <dns_sd.h>
diff --git a/net/bonjour/inc/TBonjourRecord.h b/net/bonjour/inc/TBonjourRecord.h
index 95176531ba154226b636a1eb7ac5a03cf39ac0a7..29d472e8fa423c25bffc09506a7e7f1a0102ff8b 100644
--- a/net/bonjour/inc/TBonjourRecord.h
+++ b/net/bonjour/inc/TBonjourRecord.h
@@ -21,13 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
diff --git a/net/bonjour/inc/TBonjourRegistrar.h b/net/bonjour/inc/TBonjourRegistrar.h
index cdacf2ade5b78c0beedc9c6f0fb2e48c50f3a0e7..23d52b85c17f1c56a6db46eeb10484808ba3ea0f 100644
--- a/net/bonjour/inc/TBonjourRegistrar.h
+++ b/net/bonjour/inc/TBonjourRegistrar.h
@@ -34,15 +34,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
-#ifndef ROOT_TBonjourRecord
#include "TBonjourRecord.h"
-#endif
#if !defined(__CINT__)
#include <dns_sd.h>
diff --git a/net/bonjour/inc/TBonjourResolver.h b/net/bonjour/inc/TBonjourResolver.h
index 42d84c4db54184aac8f8df47cf0ed56996309fa8..b8c025755c9c07b9e86f005434706295849a6d30 100644
--- a/net/bonjour/inc/TBonjourResolver.h
+++ b/net/bonjour/inc/TBonjourResolver.h
@@ -26,15 +26,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
-#ifndef ROOT_TInetAddress
#include "TInetAddress.h"
-#endif
#if !defined(__CINT__)
#include <dns_sd.h>
diff --git a/net/glite/inc/TGLite.h b/net/glite/inc/TGLite.h
index b8e00f68e2d28ee793b8f73154b76d676c1454b0..084ad924e5544b1906c335936034b04478dce682 100644
--- a/net/glite/inc/TGLite.h
+++ b/net/glite/inc/TGLite.h
@@ -33,9 +33,7 @@ defines interface to gLite GRID services. *//*
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGrid
#include "TGrid.h"
-#endif
class TGLite: public TGrid
{
diff --git a/net/glite/inc/TGLiteJob.h b/net/glite/inc/TGLiteJob.h
index 4fbffd29c8bd37dc78137581f3053b3d059f7f60..b4469515446db2f9af28b945aaafb02dc0e71392 100644
--- a/net/glite/inc/TGLiteJob.h
+++ b/net/glite/inc/TGLiteJob.h
@@ -24,9 +24,7 @@ gLite implementation of TGridJob*//*
#ifndef ROOT_TGLiteJob
#define ROOT_TGLiteJob
-#ifndef ROOT_TGridJob
#include "TGridJob.h"
-#endif
class TGLiteJob : public TGridJob
{
diff --git a/net/glite/inc/TGLiteJobStatus.h b/net/glite/inc/TGLiteJobStatus.h
index 0c53580d97b227c6edadb2045e79a704e5a34dc9..a118b73adadf89ca94282f2b2ce112e775a6ee10 100644
--- a/net/glite/inc/TGLiteJobStatus.h
+++ b/net/glite/inc/TGLiteJobStatus.h
@@ -24,13 +24,9 @@ gLite implementation of TGridJobStatus*//*
#ifndef ROOT_TGLiteJobStatus
#define ROOT_TGLiteJobStatus
-#ifndef ROOT_TGridJobStatus
#include "TGridJobStatus.h"
-#endif
-#ifndef ROOT_TGridJob
#include "TGridJob.h"
-#endif
class TGLiteJobStatus : public TGridJobStatus
{
diff --git a/net/glite/inc/TGLiteResult.h b/net/glite/inc/TGLiteResult.h
index 0422a4c8fd27c4ff05db33e4d73a223ab2c02472..5a17642492f95e475c26454ec3493cd4c4873e8a 100644
--- a/net/glite/inc/TGLiteResult.h
+++ b/net/glite/inc/TGLiteResult.h
@@ -35,9 +35,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGridResult
#include "TGridResult.h"
-#endif
class TGLiteResult : public TGridResult
{
diff --git a/net/http/inc/TCivetweb.h b/net/http/inc/TCivetweb.h
index 1566ce2f81b9c63d2222ab7893647b0c8766c35a..048b4e2ebb58de30614d100f2f882b105c4b8746 100644
--- a/net/http/inc/TCivetweb.h
+++ b/net/http/inc/TCivetweb.h
@@ -4,9 +4,7 @@
#ifndef ROOT_TCivetweb
#define ROOT_TCivetweb
-#ifndef ROOT_THttpEngine
#include "THttpEngine.h"
-#endif
#include "TString.h"
class TCivetweb : public THttpEngine {
diff --git a/net/http/inc/TFastCgi.h b/net/http/inc/TFastCgi.h
index 600ec92defad8df76ae036686aa5642a3a6a167f..643218338f10fc2af83c4abd2a64505821664407 100644
--- a/net/http/inc/TFastCgi.h
+++ b/net/http/inc/TFastCgi.h
@@ -4,9 +4,7 @@
#ifndef ROOT_TFastCgi
#define ROOT_TFastCgi
-#ifndef ROOT_THttpEngine
#include "THttpEngine.h"
-#endif
class TThread;
diff --git a/net/http/inc/THttpCallArg.h b/net/http/inc/THttpCallArg.h
index 0db5c3f649ab856908f275e4f1ce02f074895b82..3486b8af88f1a54e0a77208c1052069311a5cc26 100644
--- a/net/http/inc/THttpCallArg.h
+++ b/net/http/inc/THttpCallArg.h
@@ -4,13 +4,9 @@
#ifndef ROOT_THttpCallArg
#define ROOT_THttpCallArg
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#include <condition_variable>
diff --git a/net/http/inc/THttpEngine.h b/net/http/inc/THttpEngine.h
index 80fd439d29556c009a0524ee2bbc717239fb4ad7..4491857fc4d7df19c13ca9bffe8051e0defad9e1 100644
--- a/net/http/inc/THttpEngine.h
+++ b/net/http/inc/THttpEngine.h
@@ -4,9 +4,7 @@
#ifndef ROOT_THttpEngine
#define ROOT_THttpEngine
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class THttpServer;
class THttpCallArg;
diff --git a/net/http/inc/THttpServer.h b/net/http/inc/THttpServer.h
index bbe2ec429e5dca286a452fb59ef790921c6a3bf0..0fe1f9aed6622288a5181da36b5409950251ed33 100644
--- a/net/http/inc/THttpServer.h
+++ b/net/http/inc/THttpServer.h
@@ -4,21 +4,13 @@
#ifndef ROOT_THttpServer
#define ROOT_THttpServer
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_THttpCallArg
#include "THttpCallArg.h"
-#endif
#include <mutex>
diff --git a/net/http/inc/TRootSniffer.h b/net/http/inc/TRootSniffer.h
index ea5b5008d605c8888aac6b1c8464966c524453b1..d38d56ec7f37c3545cd397b99b8f66acf069803d 100644
--- a/net/http/inc/TRootSniffer.h
+++ b/net/http/inc/TRootSniffer.h
@@ -4,13 +4,9 @@
#ifndef ROOT_TRootSniffer
#define ROOT_TRootSniffer
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TFolder;
class TMemFile;
diff --git a/net/http/inc/TRootSnifferStore.h b/net/http/inc/TRootSnifferStore.h
index 361991fdcd11627df7235daad01ea13a35378db0..f14079002e0c06fd1bf20b0b0fa2e4e4fa9ac7c9 100644
--- a/net/http/inc/TRootSnifferStore.h
+++ b/net/http/inc/TRootSnifferStore.h
@@ -4,13 +4,9 @@
#ifndef ROOT_TRootSnifferStore
#define ROOT_TRootSnifferStore
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TDataMember;
class TFolder;
diff --git a/net/krb5auth/inc/TKSocket.h b/net/krb5auth/inc/TKSocket.h
index 6d93fddba4715fa1a612cf53ec849eb51c4282a1..0e8923ce3dd5b114364a98640256dba91e5d3596 100644
--- a/net/krb5auth/inc/TKSocket.h
+++ b/net/krb5auth/inc/TKSocket.h
@@ -6,9 +6,7 @@
#if !defined(__CINT__)
-#ifndef ROOT_Krb5Auth
#include "Krb5Auth.h"
-#endif
#else
@@ -20,9 +18,7 @@ typedef void* krb5_principal;
#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TSocket;
diff --git a/net/ldap/inc/TLDAPAttribute.h b/net/ldap/inc/TLDAPAttribute.h
index d072d7ebd308b9f7f6699ed48e4db70caae89666..a6ab7a33fdfab9a64e243f759761d528227c1ca8 100644
--- a/net/ldap/inc/TLDAPAttribute.h
+++ b/net/ldap/inc/TLDAPAttribute.h
@@ -9,15 +9,9 @@
#ifndef ROOT_TLDAPAttribute
#define ROOT_TLDAPAttribute
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_CintLDAP
#include "CintLDAP.h"
-#endif
class TLDAPEntry;
diff --git a/net/ldap/inc/TLDAPEntry.h b/net/ldap/inc/TLDAPEntry.h
index 5d8accca756e5f54ce87b4dcdf3bf4c9b5c6eaeb..949ec73b522ff6abc42337319d4d9616b2d78f99 100644
--- a/net/ldap/inc/TLDAPEntry.h
+++ b/net/ldap/inc/TLDAPEntry.h
@@ -9,18 +9,10 @@
#ifndef ROOT_TLDAPEntry
#define ROOT_TLDAPEntry
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_CintLDAP
#include "CintLDAP.h"
-#endif
class TLDAPServer;
diff --git a/net/ldap/inc/TLDAPResult.h b/net/ldap/inc/TLDAPResult.h
index b0b5b21d08c9bd76a4d7bda71df38cd2d3297dfc..8e5b35efa76821575b8adcbb0eb05967dd1113c5 100644
--- a/net/ldap/inc/TLDAPResult.h
+++ b/net/ldap/inc/TLDAPResult.h
@@ -9,12 +9,8 @@
#ifndef ROOT_TLDAPResult
#define ROOT_TLDAPResult
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_CintLDAP
#include "CintLDAP.h"
-#endif
class TLDAPServer;
diff --git a/net/ldap/inc/TLDAPServer.h b/net/ldap/inc/TLDAPServer.h
index dca339bc87c12010108098e3b256094c9f070c5d..346e81f7f7e794fb104430d1cd60f1bd9dd67989 100644
--- a/net/ldap/inc/TLDAPServer.h
+++ b/net/ldap/inc/TLDAPServer.h
@@ -9,15 +9,9 @@
#ifndef ROOT_TLDAPServer
#define ROOT_TLDAPServer
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_CintLDAP
#include "CintLDAP.h"
-#endif
class TList;
class TLDAPResult;
diff --git a/net/monalisa/inc/TMonaLisaWriter.h b/net/monalisa/inc/TMonaLisaWriter.h
index 1b78c88bb1cafc6ff50c24ccc17d0acb78296c2e..f040c9387a9524589f0cf0ff449a6c44bc6a051c 100644
--- a/net/monalisa/inc/TMonaLisaWriter.h
+++ b/net/monalisa/inc/TMonaLisaWriter.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TMonaLisaWriter
#define ROOT_TMonaLisaWriter
-#ifndef ROOT_TVirtualMonitoring
#include "TVirtualMonitoring.h"
-#endif
-#ifndef ROOT_TStopwatch
#include "TStopwatch.h"
-#endif
#ifndef __CINT__
#include <ApMon.h>
diff --git a/net/net/inc/NetErrors.h b/net/net/inc/NetErrors.h
index 9e32eecf3a448a8e0539d308cf757b8398eced86..e8b97f9d31cd69e195a038414393000282f78f2b 100644
--- a/net/net/inc/NetErrors.h
+++ b/net/net/inc/NetErrors.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
enum ERootdErrors {
kErrUndef,
diff --git a/net/net/inc/RRemoteProtocol.h b/net/net/inc/RRemoteProtocol.h
index 4484ab272879306a5470086adcb5eae7f665f1ca..65edf3d6f3a17f13651f1018a647fe1fa1ee5f4e 100644
--- a/net/net/inc/RRemoteProtocol.h
+++ b/net/net/inc/RRemoteProtocol.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
// Protocol version we run
// 1 Initial version
diff --git a/net/net/inc/TApplicationRemote.h b/net/net/inc/TApplicationRemote.h
index 3663daaaecb3f5130a910bd286a017a813e66198..328357d216aecd34214de535f76e1f6f27dd240c 100644
--- a/net/net/inc/TApplicationRemote.h
+++ b/net/net/inc/TApplicationRemote.h
@@ -23,27 +23,13 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_RRemoteProtocol
#include "RRemoteProtocol.h"
-#endif
-#ifndef ROOT_TApplication
#include "TApplication.h"
-#endif
-#ifndef ROOT_TMD5
#include "TMD5.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TMessage
#include "TMessage.h"
-#endif
-#ifndef ROOT_TSysEvtHandler
#include "TSysEvtHandler.h"
-#endif
class THashList;
diff --git a/net/net/inc/TApplicationServer.h b/net/net/inc/TApplicationServer.h
index 699555bd355c8de13975156358e7dc228ff861dc..29f1cab5ad40f795aef320b8d2f2620dcf5cf6ff 100644
--- a/net/net/inc/TApplicationServer.h
+++ b/net/net/inc/TApplicationServer.h
@@ -21,18 +21,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TApplication
#include "TApplication.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TSysEvtHandler
#include "TSysEvtHandler.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
class TList;
class TMessage;
diff --git a/net/net/inc/TFTP.h b/net/net/inc/TFTP.h
index 6b8a7efadcf93570fd5685b69f022bd530aa7e66..b04c26e246b582b69f5fd37598f6ea0fc6bfe9de 100644
--- a/net/net/inc/TFTP.h
+++ b/net/net/inc/TFTP.h
@@ -22,18 +22,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_MessageTypes
#include "MessageTypes.h"
-#endif
class TSocket;
diff --git a/net/net/inc/TFileStager.h b/net/net/inc/TFileStager.h
index 1118ed023220153681152c041bcfbebd456a6d9d..f14689c01ceaa7d5827a001e22cdc67657071199 100644
--- a/net/net/inc/TFileStager.h
+++ b/net/net/inc/TFileStager.h
@@ -27,12 +27,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TCollection;
class TFileCollection;
diff --git a/net/net/inc/TGrid.h b/net/net/inc/TGrid.h
index 401b58c98b0167edc254ac800533e026b65c1361..580648fda47d44fde0146c50688cac875c92bfac 100644
--- a/net/net/inc/TGrid.h
+++ b/net/net/inc/TGrid.h
@@ -29,17 +29,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TGridJob
#include "TGridJob.h"
-#endif
class TGridResult;
class TGridJDL;
diff --git a/net/net/inc/TGridCollection.h b/net/net/inc/TGridCollection.h
index 44c4f51288bbb6c603f917619a2ca5871d49daeb..febc152b22ead0eb333a052c9d2c409cc4180d76 100644
--- a/net/net/inc/TGridCollection.h
+++ b/net/net/inc/TGridCollection.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TMap;
class TFile;
diff --git a/net/net/inc/TGridJDL.h b/net/net/inc/TGridJDL.h
index 80890fb97e3c9981dc65b3e9013f5852ec9babda..99ed506d2b44d97e16928a21909664ac50cd174e 100644
--- a/net/net/inc/TGridJDL.h
+++ b/net/net/inc/TGridJDL.h
@@ -24,15 +24,9 @@
// . //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class TGridJDL : public TObject {
diff --git a/net/net/inc/TGridJob.h b/net/net/inc/TGridJob.h
index 11f0512022e62efca043e6508d4142cf6d427374..669165ef2599b3226f467dbc86c9308d83f3eda0 100644
--- a/net/net/inc/TGridJob.h
+++ b/net/net/inc/TGridJob.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TGridJobStatus;
diff --git a/net/net/inc/TGridJobStatus.h b/net/net/inc/TGridJobStatus.h
index dfc595a0eae1a6f6449d538e2be796eadc4197b4..50f0ca0cbe2614025e67814613d7b934a2fc33d0 100644
--- a/net/net/inc/TGridJobStatus.h
+++ b/net/net/inc/TGridJobStatus.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TGridJobStatus : public TNamed {
diff --git a/net/net/inc/TGridJobStatusList.h b/net/net/inc/TGridJobStatusList.h
index 56796e7fab00f32fa6b40a0f0ef4d87e03b6f632..b515a68bd59153917f20bef64f6ecd87dcba9858 100644
--- a/net/net/inc/TGridJobStatusList.h
+++ b/net/net/inc/TGridJobStatusList.h
@@ -20,13 +20,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TGridJob
#include "TGridJob.h"
-#endif
class TGridJob;
diff --git a/net/net/inc/TGridResult.h b/net/net/inc/TGridResult.h
index 2f4ef960760221200b27e409e2dedb041cb2f7a8..807875e017283ea4dbd8cc554a7c4c6e76fe0c87 100644
--- a/net/net/inc/TGridResult.h
+++ b/net/net/inc/TGridResult.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TEntryList;
diff --git a/net/net/inc/TMessage.h b/net/net/inc/TMessage.h
index 04f559ad2ed2e9206206dfe36a859d9cc8aa18dd..482cc8126d896fb298b6a7f12ab6edcb7a13528d 100644
--- a/net/net/inc/TMessage.h
+++ b/net/net/inc/TMessage.h
@@ -22,15 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBufferFile
#include "TBufferFile.h"
-#endif
-#ifndef ROOT_MessageTypes
#include "MessageTypes.h"
-#endif
-#ifndef ROOT_TBits
#include "TBits.h"
-#endif
class TList;
class TVirtualStreamerInfo;
diff --git a/net/net/inc/TMonitor.h b/net/net/inc/TMonitor.h
index 78e6aaa0aab9fe9a20241fb70c354f08edb6628c..a34cf113afa4a98991d82f00fd197fb7aeaa7c01 100644
--- a/net/net/inc/TMonitor.h
+++ b/net/net/inc/TMonitor.h
@@ -26,12 +26,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
class TList;
class TSocket;
diff --git a/net/net/inc/TNetFile.h b/net/net/inc/TNetFile.h
index c5234f87f1465c3265e3dccc33e962cb92b68746..fa7ae8bf0b3618ad194081b46c57e3cd13d13513 100644
--- a/net/net/inc/TNetFile.h
+++ b/net/net/inc/TNetFile.h
@@ -22,21 +22,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
-#ifndef ROOT_TFTP
#include "TFTP.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
-#ifndef ROOT_MessageTypes
#include "MessageTypes.h"
-#endif
class TSocket;
diff --git a/net/net/inc/TNetFileStager.h b/net/net/inc/TNetFileStager.h
index a14a7597612bf3ca5872809c1bdb48ecac5c97c0..12d2cfd8f15f19bcce33cfe1a28aa0114d89ed78 100644
--- a/net/net/inc/TNetFileStager.h
+++ b/net/net/inc/TNetFileStager.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFileStager
#include "TFileStager.h"
-#endif
class TCollection;
class TNetSystem;
diff --git a/net/net/inc/TPServerSocket.h b/net/net/inc/TPServerSocket.h
index 3b5d3373120e539a4517243592c115e20460a447..2c7bf8b0462fdac136f303c85ac70655f104e131 100644
--- a/net/net/inc/TPServerSocket.h
+++ b/net/net/inc/TPServerSocket.h
@@ -25,9 +25,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TServerSocket
#include "TServerSocket.h"
-#endif
class TPSocket;
diff --git a/net/net/inc/TPSocket.h b/net/net/inc/TPSocket.h
index 55b00d8443af5801dba4d41ad44c2bb407149e6a..3b8820412e26c96b6530d30b2ec4a96ac963c29e 100644
--- a/net/net/inc/TPSocket.h
+++ b/net/net/inc/TPSocket.h
@@ -25,9 +25,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSocket
#include "TSocket.h"
-#endif
class TMonitor;
diff --git a/net/net/inc/TParallelMergingFile.h b/net/net/inc/TParallelMergingFile.h
index 917e465fa90d112ea66bee40cf83a1d736feec8b..0254039d30916a602d6cb9a245298c133e8177e7 100644
--- a/net/net/inc/TParallelMergingFile.h
+++ b/net/net/inc/TParallelMergingFile.h
@@ -27,15 +27,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMemFile
#include "TMemFile.h"
-#endif
-#ifndef ROOT_TMessage
#include "TMessage.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
class TSocket;
diff --git a/net/net/inc/TS3HTTPRequest.h b/net/net/inc/TS3HTTPRequest.h
index 172b77feca28e0f99fa230961e771b56e5e926d1..0b66ae4d5fdd8858d5161bfc137818d6d6f747b1 100644
--- a/net/net/inc/TS3HTTPRequest.h
+++ b/net/net/inc/TS3HTTPRequest.h
@@ -36,13 +36,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
diff --git a/net/net/inc/TS3WebFile.h b/net/net/inc/TS3WebFile.h
index 68a892f700c0bdb2029fd8d2368645b443f4e2a4..affb31b9639afa3f650f21f3d326d57d09e8fed5 100644
--- a/net/net/inc/TS3WebFile.h
+++ b/net/net/inc/TS3WebFile.h
@@ -56,21 +56,13 @@
// http://docs.amazonwebservices.com/AmazonS3/latest/API/APIRest.html //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TWebFile
#include "TWebFile.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TS3HTTPRequest
#include "TS3HTTPRequest.h"
-#endif
class TS3WebFile: public TWebFile {
diff --git a/net/net/inc/TSQLColumnInfo.h b/net/net/inc/TSQLColumnInfo.h
index 58a07e7b6a6d4fcdbbb49ad2779d3b864cf1975c..fbd8a8d19398427ed92d4b1aca76131174ebb0c7 100644
--- a/net/net/inc/TSQLColumnInfo.h
+++ b/net/net/inc/TSQLColumnInfo.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSQLColumnInfo
#define ROOT_TSQLColumnInfo
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TSQLColumnInfo : public TNamed {
diff --git a/net/net/inc/TSQLMonitoring.h b/net/net/inc/TSQLMonitoring.h
index 2b705b74019b5b9c4b2356ea0edc5552e6d1d9a1..e2616b76a8d3e46ae819c5ab35ef5826b520b609 100644
--- a/net/net/inc/TSQLMonitoring.h
+++ b/net/net/inc/TSQLMonitoring.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualMonitoring
#include "TVirtualMonitoring.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TSQLServer;
diff --git a/net/net/inc/TSQLResult.h b/net/net/inc/TSQLResult.h
index 62a4334677bee611c661af8df129312ae60fedd5..bc74d0154b50101f1cde9663c4781197fad15876 100644
--- a/net/net/inc/TSQLResult.h
+++ b/net/net/inc/TSQLResult.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TSQLRow;
diff --git a/net/net/inc/TSQLRow.h b/net/net/inc/TSQLRow.h
index 7c4d678d326fde0156dcf1c50595539ff86465d5..c9392137c6d25239296ad822f805128103e62eee 100644
--- a/net/net/inc/TSQLRow.h
+++ b/net/net/inc/TSQLRow.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TSQLRow : public TObject {
diff --git a/net/net/inc/TSQLServer.h b/net/net/inc/TSQLServer.h
index 451a4793f240b7752ce46451ecda0311319725a2..0158c657f9c336a8976a7f60a622cc0743eefcec 100644
--- a/net/net/inc/TSQLServer.h
+++ b/net/net/inc/TSQLServer.h
@@ -30,12 +30,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TSQLResult;
class TSQLStatement;
diff --git a/net/net/inc/TSQLStatement.h b/net/net/inc/TSQLStatement.h
index 485a050dc8f690a1e993e3ac1e71b515884600fb..2e3998d53a03815216e54590f6f065e964b904dc 100644
--- a/net/net/inc/TSQLStatement.h
+++ b/net/net/inc/TSQLStatement.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TSQLStatement
#define ROOT_TSQLStatement
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TDatime
#include "TDatime.h"
-#endif
#include<vector>
class TSQLStatement : public TObject {
diff --git a/net/net/inc/TSQLTableInfo.h b/net/net/inc/TSQLTableInfo.h
index c84bee698e7c52c14a6c0414f8546b3e1b54b57d..d03c500510226c8fa06852f431372e7a1f3d01fb 100644
--- a/net/net/inc/TSQLTableInfo.h
+++ b/net/net/inc/TSQLTableInfo.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSQLTableInfo
#define ROOT_TSQLTableInfo
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TList;
class TSQLColumnInfo;
diff --git a/net/net/inc/TSSLSocket.h b/net/net/inc/TSSLSocket.h
index eb44db2079279d035b0c06535cb5bc8568499192..05ad82a7aece58a8926d6ac29253570170af1f80 100644
--- a/net/net/inc/TSSLSocket.h
+++ b/net/net/inc/TSSLSocket.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSocket
#include "TSocket.h"
-#endif
typedef struct ssl_st SSL;
typedef struct ssl_ctx_st SSL_CTX;
diff --git a/net/net/inc/TSecContext.h b/net/net/inc/TSecContext.h
index bcfc6c3e49a2a5b5b644f689cfc6976e7b1e0dec..b1b0c0807502502892f0cc1ee8fef5d20892ff11 100644
--- a/net/net/inc/TSecContext.h
+++ b/net/net/inc/TSecContext.h
@@ -22,15 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TDatime
#include "TDatime.h"
-#endif
// Jan 1, 1995, 00:00:00 in sec from EPOCH (Jan 1, 1970)
const TDatime kROOTTZERO = 788914800;
diff --git a/net/net/inc/TServerSocket.h b/net/net/inc/TServerSocket.h
index 2d1b2038841b0fc8b34504edbd17c24d34bb0f03..375298319e9cc2242bdea90a1c29913e4320fbc8 100644
--- a/net/net/inc/TServerSocket.h
+++ b/net/net/inc/TServerSocket.h
@@ -25,9 +25,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSocket
#include "TSocket.h"
-#endif
#include <string>
class TSeqCollection;
diff --git a/net/net/inc/TSocket.h b/net/net/inc/TSocket.h
index 37e646088ef04ba6610e699e7b66c739d6cc54aa..495343181b1809107d9f1db6cb3973e9b6cf7024 100644
--- a/net/net/inc/TSocket.h
+++ b/net/net/inc/TSocket.h
@@ -24,30 +24,14 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TBits
#include "TBits.h"
-#endif
-#ifndef ROOT_TInetAddress
#include "TInetAddress.h"
-#endif
-#ifndef ROOT_MessageTypes
#include "MessageTypes.h"
-#endif
-#ifndef ROOT_TVirtualAuth
#include "TVirtualAuth.h"
-#endif
-#ifndef ROOT_TSecContext
#include "TSecContext.h"
-#endif
-#ifndef ROOT_TTimeStamp
#include "TTimeStamp.h"
-#endif
-#ifndef ROOT_TVirtualMutex
#include "TVirtualMutex.h"
-#endif
enum ESockOptions {
kSendBuffer, // size of send buffer
diff --git a/net/net/inc/TUDPSocket.h b/net/net/inc/TUDPSocket.h
index fc780e1e55983a9bb85a777b7752f8aaba92ae5d..18c37404940dd58e9a571cd8fe28d78a819d1f27 100644
--- a/net/net/inc/TUDPSocket.h
+++ b/net/net/inc/TUDPSocket.h
@@ -24,33 +24,15 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TBits
#include "TBits.h"
-#endif
-#ifndef ROOT_TInetAddress
#include "TInetAddress.h"
-#endif
-#ifndef ROOT_MessageTypes
#include "MessageTypes.h"
-#endif
-#ifndef ROOT_TVirtualAuth
#include "TVirtualAuth.h"
-#endif
-#ifndef ROOT_TSecContext
#include "TSecContext.h"
-#endif
-#ifndef ROOT_TTimeStamp
#include "TTimeStamp.h"
-#endif
-#ifndef ROOT_TVirtualMutex
#include "TVirtualMutex.h"
-#endif
-#ifndef ROOT_TSocket
#include "TSocket.h"
-#endif
class TUDPSocket : public TNamed {
diff --git a/net/net/inc/TWebFile.h b/net/net/inc/TWebFile.h
index 6618c7195601ffff8cb80d03ed54d3166d94f076..4920877b39ed24fa812c111e3fbd8c71eb93551a 100644
--- a/net/net/inc/TWebFile.h
+++ b/net/net/inc/TWebFile.h
@@ -22,15 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
class TSocket;
class TWebSocket;
diff --git a/net/netx/inc/TXNetFile.h b/net/netx/inc/TXNetFile.h
index ed16958b07f19f77797083ac4cded7066cd701af..ef86371351860e64f01bca94e92f1743f9420958 100644
--- a/net/netx/inc/TXNetFile.h
+++ b/net/netx/inc/TXNetFile.h
@@ -44,15 +44,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNetFile
#include "TNetFile.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
class TFileStager;
class TSocket;
diff --git a/net/netx/inc/TXNetFileStager.h b/net/netx/inc/TXNetFileStager.h
index 1bd250a631089c617eb2e5efb01afff4efc7eacd..30fce47b9e377965e7c1ffcc702d9bbf5641f1fb 100644
--- a/net/netx/inc/TXNetFileStager.h
+++ b/net/netx/inc/TXNetFileStager.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFileStager
#include "TFileStager.h"
-#endif
class TCollection;
class TXNetSystem;
diff --git a/net/netx/inc/TXNetSystem.h b/net/netx/inc/TXNetSystem.h
index 37e06ca1f60f76d16597d85277d1109fb29744dc..07198e93ec7e4369c787aab30d8bc1398dafc1b8 100644
--- a/net/netx/inc/TXNetSystem.h
+++ b/net/netx/inc/TXNetSystem.h
@@ -25,21 +25,13 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNetSystem
#include "TNetFile.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_THashList
#include "THashList.h"
-#endif
class XrdClientAdmin;
class TCollection;
diff --git a/net/rootd/src/rootdp.h b/net/rootd/src/rootdp.h
index 343cfff7b938e9866dac3cd493d738d440c1aa10..7eae6abf8a9342b0ab365fe2b3b0b4359bdea568 100644
--- a/net/rootd/src/rootdp.h
+++ b/net/rootd/src/rootdp.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_rpdp
#include "rpdp.h"
-#endif
void RootdClose();
int RootdIsOpen();
diff --git a/net/rpdutils/res/rpddefs.h b/net/rpdutils/res/rpddefs.h
index ffa233e80154597407083bd85c613de1a598f9f1..5d4122f3801a694b586076e9c416506c93b1e184 100644
--- a/net/rpdutils/res/rpddefs.h
+++ b/net/rpdutils/res/rpddefs.h
@@ -19,9 +19,7 @@
// //
/////////////////////////////////////////////////////////////////////
-#ifndef ROOT_AuthConst
#include "AuthConst.h"
-#endif
//
// Typedefs
diff --git a/net/rpdutils/res/rpderr.h b/net/rpdutils/res/rpderr.h
index ac9f12c8fff0af445c925bd23e64198ae485d5ed..cb510dcc6ca99ad34d34091748f8766e3da51209 100644
--- a/net/rpdutils/res/rpderr.h
+++ b/net/rpdutils/res/rpderr.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_NetErrors
#include "NetErrors.h"
-#endif
typedef void (*ErrorHandler_t)(int level, const char *msg, int size);
diff --git a/net/rpdutils/res/rpdp.h b/net/rpdutils/res/rpdp.h
index ffcf6377e639b69ce889c4b04e37380a54cd0226..71cb61d78728a929e262b0072efdd16c041217e6 100644
--- a/net/rpdutils/res/rpdp.h
+++ b/net/rpdutils/res/rpdp.h
@@ -22,15 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_VarArgs
#include "Varargs.h"
-#endif
-#ifndef ROOT_MessageTypes
#include "MessageTypes.h"
-#endif
-#ifndef ROOT_rpderr
#include "rpderr.h"
-#endif
#include <string>
#ifdef R__GLOBALSTL
namespace std { using ::string; }
@@ -42,9 +36,7 @@ namespace std { using ::string; }
// //
/////////////////////////////////////////////////////////////////////
-#ifndef ROOT_rpddefs
#include "rpddefs.h"
-#endif
#include "Rtypes.h" //const int kMAXPATHLEN = kMAXSECBUF;
diff --git a/net/rpdutils/src/daemon.cxx b/net/rpdutils/src/daemon.cxx
index f1d2fdc99ace2d96207cc7cbad4a6b35e0d19834..806e50d0a465dd62a3c5d20a72447d1d4db3be2f 100644
--- a/net/rpdutils/src/daemon.cxx
+++ b/net/rpdutils/src/daemon.cxx
@@ -38,9 +38,7 @@
#include <sys/wait.h>
#endif
-#ifndef ROOT_RConfig
#include "RConfig.h"
-#endif
#ifndef NOFILE
# define NOFILE 0
diff --git a/proof/pq2/src/pq2ping.h b/proof/pq2/src/pq2ping.h
index 3fb5272e54e98a72bcf949def922c51807177207..7eae8f1333a4d69f844365a7376f503a982c4441 100644
--- a/proof/pq2/src/pq2ping.h
+++ b/proof/pq2/src/pq2ping.h
@@ -12,9 +12,7 @@
#ifndef PQ2_ping
#define PQ2_ping
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/proof/proof/inc/TCondor.h b/proof/proof/inc/TCondor.h
index 055b49272cd5e3cbf58b6af5772a6dc5a4b5e776..6b3049a7b66869fc6adeab3c0be2f7d3a7e8c63c 100644
--- a/proof/proof/inc/TCondor.h
+++ b/proof/proof/inc/TCondor.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TList;
diff --git a/proof/proof/inc/TDSet.h b/proof/proof/inc/TDSet.h
index 20bf60206baacc77170e9a14df4db104b8fcb0c9..a1d560a5132c5545145d94c1270760b51cbe37f2 100644
--- a/proof/proof/inc/TDSet.h
+++ b/proof/proof/inc/TDSet.h
@@ -42,9 +42,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TChain;
class TCollection;
diff --git a/proof/proof/inc/TDSetProxy.h b/proof/proof/inc/TDSetProxy.h
index fb203be0676cb41c757975707815db9cd0a62ea8..9bfd355941729bc972ea7893c470c1030f68cee1 100644
--- a/proof/proof/inc/TDSetProxy.h
+++ b/proof/proof/inc/TDSetProxy.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDSet
#include "TDSet.h"
-#endif
class TProofServ;
diff --git a/proof/proof/inc/TDataSetManager.h b/proof/proof/inc/TDataSetManager.h
index ab40f93943f67d34169bd7439e8b8da5351c45fb..aec763c8381ec7410c5e3543edf2832935bd53a7 100644
--- a/proof/proof/inc/TDataSetManager.h
+++ b/proof/proof/inc/TDataSetManager.h
@@ -22,18 +22,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
-#ifndef ROOT_TUri
#include "TUri.h"
-#endif
class TFileCollection;
diff --git a/proof/proof/inc/TDataSetManagerAliEn.h b/proof/proof/inc/TDataSetManagerAliEn.h
index 03b7eb1fa25f2160a96860edcc5e85c6f2d27d90..5dd2c5c41c74d637c598df35dc7481efe8280bec 100644
--- a/proof/proof/inc/TDataSetManagerAliEn.h
+++ b/proof/proof/inc/TDataSetManagerAliEn.h
@@ -21,13 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDataSetManager
#include "TDataSetManager.h"
-#endif
-#ifndef ROOT_TDataSetManagerFile
#include "TDataSetManagerFile.h"
-#endif
#include "TFileStager.h"
#include "TPRegexp.h"
diff --git a/proof/proof/inc/TDataSetManagerFile.h b/proof/proof/inc/TDataSetManagerFile.h
index 554604cb0a8a5eac2fc6f0985cc646e6523f8f89..5f3afd805923030f8991f5927b9ed72208c1ec78 100644
--- a/proof/proof/inc/TDataSetManagerFile.h
+++ b/proof/proof/inc/TDataSetManagerFile.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDataSetManager
#include "TDataSetManager.h"
-#endif
const char* const kDataSet_LocalCache = "dataset.cache"; // default cache subdirectory
const char* const kDataSet_DataSetList = "dataset.list"; // file with info about all datasets
diff --git a/proof/proof/inc/TLockPath.h b/proof/proof/inc/TLockPath.h
index eff9e8a557828a89f8b1b26e9bbd5fd9af87e5e4..85f32c888072e147b59212933baf61f95b532377 100644
--- a/proof/proof/inc/TLockPath.h
+++ b/proof/proof/inc/TLockPath.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TLockPath : public TObject {
private:
diff --git a/proof/proof/inc/TPackMgr.h b/proof/proof/inc/TPackMgr.h
index 017e26c1478aa72a620501ce0e467e28a798e2ce..7ce793924c1d2ad5ab79e0c255acb8d4f4a07713 100644
--- a/proof/proof/inc/TPackMgr.h
+++ b/proof/proof/inc/TPackMgr.h
@@ -24,21 +24,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TLockPath
#include "TLockPath.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TMD5
#include "TMD5.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
typedef void (*TPackMgrLog_t)(const char *);
diff --git a/proof/proof/inc/TProof.h b/proof/proof/inc/TProof.h
index af81fbc0d996249f0656be335968567957482915..c06071243d371a6bf763dfc773bfc0cc82aae6d3 100644
--- a/proof/proof/inc/TProof.h
+++ b/proof/proof/inc/TProof.h
@@ -24,45 +24,19 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProofMgr
#include "TProofMgr.h"
-#endif
-#ifndef ROOT_TProofDebug
#include "TProofDebug.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMacro
#include "TMacro.h"
-#endif
-#ifndef ROOT_MessageTypes
#include "MessageTypes.h"
-#endif
-#ifndef ROOT_TMD5
#include "TMD5.h"
-#endif
-#ifndef ROOT_TRegexp
#include "TRegexp.h"
-#endif
-#ifndef ROOT_TSysEvtHandler
#include "TSysEvtHandler.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
-#ifndef ROOT_TProofOutputList
#include "TProofOutputList.h"
-#endif
-#ifndef ROOT_TStopwatch
#include "TStopwatch.h"
-#endif
-#ifndef ROOT_TVirtualMutex
#include "TVirtualMutex.h"
-#endif
-#ifndef ROOT_TPackMgr
#include "TPackMgr.h"
-#endif
#include <map>
#include <mutex>
diff --git a/proof/proof/inc/TProofChain.h b/proof/proof/inc/TProofChain.h
index 73e934232780c96017c94ebcc2caea44d7424ffb..677fed56e097d24d18411b07220e33f2c254d584 100644
--- a/proof/proof/inc/TProofChain.h
+++ b/proof/proof/inc/TProofChain.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TChain
#include "TChain.h"
-#endif
class TDSet;
class TList;
diff --git a/proof/proof/inc/TProofCondor.h b/proof/proof/inc/TProofCondor.h
index 97b54c6439e2746e706ff1aea54b46b67bfdc0cc..5e0a3d475cca29026be70c9bd18da4e41db01afc 100644
--- a/proof/proof/inc/TProofCondor.h
+++ b/proof/proof/inc/TProofCondor.h
@@ -24,12 +24,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProof
#include "TProof.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TCondor;
class TTimer;
diff --git a/proof/proof/inc/TProofDebug.h b/proof/proof/inc/TProofDebug.h
index b893c7ecfce0b3411f3f8f71eb16b915e8f5a75c..e7ad3f0d9b5e8cb22a882c1a2e75607673186e32 100644
--- a/proof/proof/inc/TProofDebug.h
+++ b/proof/proof/inc/TProofDebug.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
// Remember to update the related mapping in tutorials/proof/runProof.C !
diff --git a/proof/proof/inc/TProofLite.h b/proof/proof/inc/TProofLite.h
index 54d1f51935551460e37f1c94b0ac791e8fb62d53..bcbb0deb92eb510ec4b3ec2a8e9212546b658853 100644
--- a/proof/proof/inc/TProofLite.h
+++ b/proof/proof/inc/TProofLite.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProof
#include "TProof.h"
-#endif
class TDSet;
class TList;
diff --git a/proof/proof/inc/TProofLog.h b/proof/proof/inc/TProofLog.h
index 27ac4719d5ca4eca5655ba2a01733e3b28dc19b1..c2e72c8de6078f24b4c29950bbb9646f84bb519a 100644
--- a/proof/proof/inc/TProofLog.h
+++ b/proof/proof/inc/TProofLog.h
@@ -20,15 +20,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TDatime
#include "TDatime.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
class TMacro;
class TProofLogElem;
diff --git a/proof/proof/inc/TProofMgr.h b/proof/proof/inc/TProofMgr.h
index aedc9d22ff50e462cd3bce2c21ccfa54a2ad5e0a..4a230de6ebf7fd9879787c171986d7a4c388598a 100644
--- a/proof/proof/inc/TProofMgr.h
+++ b/proof/proof/inc/TProofMgr.h
@@ -24,21 +24,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
class TFileCollection;
class TObjString;
diff --git a/proof/proof/inc/TProofMgrLite.h b/proof/proof/inc/TProofMgrLite.h
index acf40286b04b21bc1d28a741cd80dd297ccbcec6..27876b8599ec8b6a1e243db2a510adc5d1906bb2 100644
--- a/proof/proof/inc/TProofMgrLite.h
+++ b/proof/proof/inc/TProofMgrLite.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProofMgr
#include "TProofMgr.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
class TProofMgrLite : public TProofMgr {
diff --git a/proof/proof/inc/TProofNodeInfo.h b/proof/proof/inc/TProofNodeInfo.h
index b0726b5b38c966da2d9f81abfe63ffbe84614588..e84f6822ea5643dddac6c1dd20d0c66b8b5dc5b0 100644
--- a/proof/proof/inc/TProofNodeInfo.h
+++ b/proof/proof/inc/TProofNodeInfo.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TProofResourcesStatic;
diff --git a/proof/proof/inc/TProofOutputFile.h b/proof/proof/inc/TProofOutputFile.h
index 02c675e9266868b8f1035bc478b7d8b9acaebb8e..5fed1eed48627cfcd72ed58e3d377eba6b1c3dc3 100644
--- a/proof/proof/inc/TProofOutputFile.h
+++ b/proof/proof/inc/TProofOutputFile.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TCollection;
class TString;
diff --git a/proof/proof/inc/TProofOutputList.h b/proof/proof/inc/TProofOutputList.h
index 37cee44c67819d592793bc9ba25afc4fea837d85..e30a74208a48c031d52936d560f49cfa63852148 100644
--- a/proof/proof/inc/TProofOutputList.h
+++ b/proof/proof/inc/TProofOutputList.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TProofOutputList : public TList {
diff --git a/proof/proof/inc/TProofProgressStatus.h b/proof/proof/inc/TProofProgressStatus.h
index 194ae14bc89b25443fafeae0f2c74860e57ff380..e2fa494ea3b66ce93326266c342f32bc193b5d9c 100644
--- a/proof/proof/inc/TProofProgressStatus.h
+++ b/proof/proof/inc/TProofProgressStatus.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TProofProgressStatus
#define ROOT_TProofProgressStatus
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/proof/proof/inc/TProofQueryResult.h b/proof/proof/inc/TProofQueryResult.h
index f13f17053a0c4eab4bbb28b4f76c7c9b862e8593..4c549ba5c53977bb8fb1244fdd693c43209b7a41 100644
--- a/proof/proof/inc/TProofQueryResult.h
+++ b/proof/proof/inc/TProofQueryResult.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TQueryResult
#include "TQueryResult.h"
-#endif
class TDSet;
diff --git a/proof/proof/inc/TProofResources.h b/proof/proof/inc/TProofResources.h
index b24ae3455a5ab3cfba26d1c4c9e601e937c0d76b..e04aaa22a54ec0ca857e3675b3a772c8ffa74e62 100644
--- a/proof/proof/inc/TProofResources.h
+++ b/proof/proof/inc/TProofResources.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TList;
class TString;
diff --git a/proof/proof/inc/TProofResourcesStatic.h b/proof/proof/inc/TProofResourcesStatic.h
index 697821d0ae4eba385b5e879d7e6ba7eb7e4640c5..2ae9ce236fbaccbf298c0a24f039f43287214351 100644
--- a/proof/proof/inc/TProofResourcesStatic.h
+++ b/proof/proof/inc/TProofResourcesStatic.h
@@ -27,12 +27,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProofResources
#include "TProofResources.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TList;
class TProofNodeInfo;
diff --git a/proof/proof/inc/TProofServ.h b/proof/proof/inc/TProofServ.h
index e8d1399b3a235702abd9fc8b5f6a145d7d45e67f..be7f75663876a76fcf2976b311dcb4dec3c9d8d9 100644
--- a/proof/proof/inc/TProofServ.h
+++ b/proof/proof/inc/TProofServ.h
@@ -24,27 +24,13 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TApplication
#include "TApplication.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TSysEvtHandler
#include "TSysEvtHandler.h"
-#endif
-#ifndef ROOT_TStopwatch
#include "TStopwatch.h"
-#endif
-#ifndef ROOT_TTimer
#include "TTimer.h"
-#endif
-#ifndef ROOT_TPackMgr
#include "TPackMgr.h"
-#endif
-#ifndef ROOT_TProofQueryResult
#include "TProofQueryResult.h"
-#endif
#include <mutex>
diff --git a/proof/proof/inc/TProofServLite.h b/proof/proof/inc/TProofServLite.h
index 09bc0137ca51287682658745b64393d6c583a07d..dc78c307a7486293b5c4a05c01a6afebeedd1498 100644
--- a/proof/proof/inc/TProofServLite.h
+++ b/proof/proof/inc/TProofServLite.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProofServ
#include "TProofServ.h"
-#endif
class TProofServLiteInterruptHandler;
diff --git a/proof/proof/inc/TProofSuperMaster.h b/proof/proof/inc/TProofSuperMaster.h
index 59b0d12061e6191763113b36c82ceb4d2643446b..110b00ee1e693a3f10f64032377651b0af96e21f 100644
--- a/proof/proof/inc/TProofSuperMaster.h
+++ b/proof/proof/inc/TProofSuperMaster.h
@@ -24,12 +24,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProof
#include "TProof.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TVirtualProofPlayer;
class TDSet;
diff --git a/proof/proof/inc/TQueryResultManager.h b/proof/proof/inc/TQueryResultManager.h
index 1a6a2a400849ab8dbcd0318080c5afacd1af6fcc..a7d33f0eef9d4ef6be79a2c7003291ede2d980be 100644
--- a/proof/proof/inc/TQueryResultManager.h
+++ b/proof/proof/inc/TQueryResultManager.h
@@ -21,15 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TStopwatch
#include "TStopwatch.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TList;
class TProof;
diff --git a/proof/proof/inc/TSelVerifyDataSet.h b/proof/proof/inc/TSelVerifyDataSet.h
index 58b16ca80932a4da79b0080909e67e07d9cb37b5..5e1f31c3b35385b2e54f031e3851c20b438d5b1f 100644
--- a/proof/proof/inc/TSelVerifyDataSet.h
+++ b/proof/proof/inc/TSelVerifyDataSet.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSelector
#include <TSelector.h>
-#endif
-#ifndef ROOT_TString
#include <TString.h>
-#endif
class TTree;
class TFileCollection;
diff --git a/proof/proof/inc/TSlave.h b/proof/proof/inc/TSlave.h
index 72017afa6665da03942762c8c67e9b9b468c4365..3840e0fe410929fa390003bc4924144deb529892 100644
--- a/proof/proof/inc/TSlave.h
+++ b/proof/proof/inc/TSlave.h
@@ -24,12 +24,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TFileHandler;
class TObjString;
diff --git a/proof/proof/inc/TSlaveLite.h b/proof/proof/inc/TSlaveLite.h
index 296b6b23893f4c716a59102efc98d5fc56112c76..e22e66da28829c0282349e9d109ad82e848a579e 100644
--- a/proof/proof/inc/TSlaveLite.h
+++ b/proof/proof/inc/TSlaveLite.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSlave
#include "TSlave.h"
-#endif
class TObjString;
class TSocket;
diff --git a/proof/proof/inc/TVirtualProofPlayer.h b/proof/proof/inc/TVirtualProofPlayer.h
index 3058e7bd4a15f40bfbe84c09c86c8124740818ee..7a987db690874222376ddc5439f6afababab7afc 100644
--- a/proof/proof/inc/TVirtualProofPlayer.h
+++ b/proof/proof/inc/TVirtualProofPlayer.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
class TDSet;
class TDSetElement;
diff --git a/proof/proofbench/inc/TProofBench.h b/proof/proofbench/inc/TProofBench.h
index 24f2d75631e1a5da1e7d80f664076d70fafb7b3a..fc5a190271d1354d4b8f37c80175b81fd2a808e2 100644
--- a/proof/proofbench/inc/TProofBench.h
+++ b/proof/proofbench/inc/TProofBench.h
@@ -20,15 +20,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TProofBenchTypes
#include "TProofBenchTypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TF1;
diff --git a/proof/proofbench/inc/TProofBenchDataSet.h b/proof/proofbench/inc/TProofBenchDataSet.h
index d824c34072285bec96d307aebce21d158215278b..568622ff11fbd823a17dc35a9c0fba37e0cb9a94 100644
--- a/proof/proofbench/inc/TProofBenchDataSet.h
+++ b/proof/proofbench/inc/TProofBenchDataSet.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TProof;
diff --git a/proof/proofbench/inc/TProofBenchRun.h b/proof/proofbench/inc/TProofBenchRun.h
index df43d5072a00d55cdedb426f0f4d08a97cb280e6..e6ed7f6897be3933511c3b0f38a0b785671b67d6 100644
--- a/proof/proofbench/inc/TProofBenchRun.h
+++ b/proof/proofbench/inc/TProofBenchRun.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TProofBenchTypes
#include "TProofBenchTypes.h"
-#endif
class TProof;
diff --git a/proof/proofbench/inc/TProofBenchRunCPU.h b/proof/proofbench/inc/TProofBenchRunCPU.h
index 0d33af8f3ea6fedfaa5ccfcf4614dc58d3238b8f..1b1340f773a50041d93341b84bea56ab15f3d5c2 100644
--- a/proof/proofbench/inc/TProofBenchRunCPU.h
+++ b/proof/proofbench/inc/TProofBenchRunCPU.h
@@ -21,13 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TProofBenchRun
#include "TProofBenchRun.h"
-#endif
class TCanvas;
diff --git a/proof/proofbench/inc/TProofBenchRunDataRead.h b/proof/proofbench/inc/TProofBenchRunDataRead.h
index fba241b33621ab9472e255696655c596f875a4a3..4dc6a9106d83a77e46b387b83cb2efeb23faeded 100644
--- a/proof/proofbench/inc/TProofBenchRunDataRead.h
+++ b/proof/proofbench/inc/TProofBenchRunDataRead.h
@@ -24,13 +24,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TProofBenchRun
#include "TProofBenchRun.h"
-#endif
class TProof;
class TCanvas;
diff --git a/proof/proofbench/inc/TProofBenchTypes.h b/proof/proofbench/inc/TProofBenchTypes.h
index f30107011f757af9752b40451474c4dc06c8f35e..3e9648a7f19fe4300beb8e0b76cf62b9c6c0a7ab 100644
--- a/proof/proofbench/inc/TProofBenchTypes.h
+++ b/proof/proofbench/inc/TProofBenchTypes.h
@@ -18,12 +18,8 @@
// Const and types used by ProofBench and its selectors //
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
const char* const kPROOF_BenchCPUSelPar = "ProofBenchCPUSel"; // PAR with bench CPU selectors
const char* const kPROOF_BenchDataSelPar = "ProofBenchDataSel"; // PAR with bench data selectors
diff --git a/proof/proofbench/inc/TProofNodes.h b/proof/proofbench/inc/TProofNodes.h
index f4d3d5f457920183d72fbeb817427bad8c346407..a89cb00cbb055bd05c86a7e42116bbf6b44c1c93 100644
--- a/proof/proofbench/inc/TProofNodes.h
+++ b/proof/proofbench/inc/TProofNodes.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TProof;
class TMap;
diff --git a/proof/proofbench/inc/TProofPerfAnalysis.h b/proof/proofbench/inc/TProofPerfAnalysis.h
index 28ab4d68b4fc90560007e592b88bc86a1fcf7eb0..1e5b61570623671417e8ab8c080d85611b908d67 100644
--- a/proof/proofbench/inc/TProofPerfAnalysis.h
+++ b/proof/proofbench/inc/TProofPerfAnalysis.h
@@ -20,15 +20,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TSortedList
#include "TSortedList.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TFile;
class TH1F;
diff --git a/proof/proofbench/inc/TSelEvent.h b/proof/proofbench/inc/TSelEvent.h
index 7bb83ae491fa8a2d5cd78e502c31078e1c26c5fe..df65db6ebca14681449f0b6a6d63317c3483fe0a 100644
--- a/proof/proofbench/inc/TSelEvent.h
+++ b/proof/proofbench/inc/TSelEvent.h
@@ -25,21 +25,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TChain
#include <TChain.h>
-#endif
-#ifndef ROOT_TFile
#include <TFile.h>
-#endif
-#ifndef ROOT_TSelector
#include <TSelector.h>
-#endif
-#ifndef ROOT_TRef
#include <TRef.h>
-#endif
-#ifndef ROOT_Event
#include <Event.h>
-#endif
class TROOT;
class TH1F;
diff --git a/proof/proofbench/inc/TSelEventGen.h b/proof/proofbench/inc/TSelEventGen.h
index ec48757e86a75e6e138ef43fde8d749deb18d767..d522b3e1d15d0ed0276100159396632910c96fda 100644
--- a/proof/proofbench/inc/TSelEventGen.h
+++ b/proof/proofbench/inc/TSelEventGen.h
@@ -23,15 +23,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSelector
#include <TSelector.h>
-#endif
-#ifndef ROOT_TTree
#include <TTree.h>
-#endif
-#ifndef ROOT_TString
#include <TString.h>
-#endif
class TList;
class TMacro;
diff --git a/proof/proofbench/inc/TSelHandleDataSet.h b/proof/proofbench/inc/TSelHandleDataSet.h
index d6b328aeef8cd6280a1defa94828763134294c3d..bd03a354d69075e10e7a9533638065c069a53f9f 100644
--- a/proof/proofbench/inc/TSelHandleDataSet.h
+++ b/proof/proofbench/inc/TSelHandleDataSet.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSelector
#include <TSelector.h>
-#endif
-#ifndef ROOT_TString
#include <TString.h>
-#endif
class TList;
class TPBHandleDSType;
diff --git a/proof/proofbench/inc/TSelHist.h b/proof/proofbench/inc/TSelHist.h
index 67f89a884e14f670f4a61de3b8e1b12d50521b47..fc656c026ac221e667674e89f80a7fd2a1641acd 100644
--- a/proof/proofbench/inc/TSelHist.h
+++ b/proof/proofbench/inc/TSelHist.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSelector
#include <TSelector.h>
-#endif
class TH1F;
class TH2F;
diff --git a/proof/proofd/inc/XrdProofConn.h b/proof/proofd/inc/XrdProofConn.h
index ee2ff9972d045f76a13a611ad25a86ec3f5a8fb4..772e64e47957ee6c1985cee39ee2b7ab6de18ed1 100644
--- a/proof/proofd/inc/XrdProofConn.h
+++ b/proof/proofd/inc/XrdProofConn.h
@@ -24,21 +24,11 @@
#define DFLT_CONNECTMAXTRY 10
-#ifndef ROOT_XrdSysToOuc
#include "XrdSysToOuc.h"
-#endif
-#ifndef ROOT_XProofProtocol
#include "XProofProtocol.h"
-#endif
-#ifndef ROOT_XProofProtUtils
#include "XProofProtUtils.h"
-#endif
-#ifndef XRC_UNSOLMSG_H
#include "XrdClient/XrdClientUnsolMsg.hh"
-#endif
-#ifndef _XRC_URLINFO_H
#include "XrdClient/XrdClientUrlInfo.hh"
-#endif
#ifndef __OUC_STRING_H__
#include "XrdOuc/XrdOucString.hh"
#endif
diff --git a/proof/proofd/inc/XrdProofPhyConn.h b/proof/proofd/inc/XrdProofPhyConn.h
index 46bcd3cca8c4556f8d5ffeb268ef893e2aa710de..aca99dbb06e17e047e901fc8e43720bf23b0dab7 100644
--- a/proof/proofd/inc/XrdProofPhyConn.h
+++ b/proof/proofd/inc/XrdProofPhyConn.h
@@ -23,9 +23,7 @@
// (Unix or Tcp) //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_XrdProofConn
#include "XrdProofConn.h"
-#endif
class XrdProofPhyConn : public XrdProofConn {
diff --git a/proof/proofd/inc/XrdProofdPlatform.h b/proof/proofd/inc/XrdProofdPlatform.h
index 088325fbda8ea745de0059a1cb57f7ce9cc4ba59..b902a15dda376e9b1337f34566c60ef223ef773e 100644
--- a/proof/proofd/inc/XrdProofdPlatform.h
+++ b/proof/proofd/inc/XrdProofdPlatform.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_RConfig
#include "RConfig.h"
-#endif
// 32 or 64 bits
#if ((defined(__hpux) && defined(__LP64__)) || \
diff --git a/proof/proofd/inc/XrdProofdTrace.h b/proof/proofd/inc/XrdProofdTrace.h
index 22e00a15d6c87c9d6f6b125899d59b08096f7438..f3b1b24a212c2c23d2b635ba5ace19c0d73b9cbe 100644
--- a/proof/proofd/inc/XrdProofdTrace.h
+++ b/proof/proofd/inc/XrdProofdTrace.h
@@ -51,9 +51,7 @@
#ifndef NODEBUG
-#ifndef ROOT_DllImport
#include "DllImport.h"
-#endif
#include "XrdOuc/XrdOucTrace.hh"
R__EXTERN XrdOucTrace *XrdProofdTrace;
diff --git a/proof/proofd/src/proofdp.h b/proof/proofd/src/proofdp.h
index 4f23dd3dd197af63492ad04959a889a5d67b65f9..0959bfa51f3a67b25e69a9e5d0901b9988a46e62 100644
--- a/proof/proofd/src/proofdp.h
+++ b/proof/proofd/src/proofdp.h
@@ -22,8 +22,6 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_rpdp
#include "rpdp.h"
-#endif
#endif
diff --git a/proof/proofplayer/inc/TDrawFeedback.h b/proof/proofplayer/inc/TDrawFeedback.h
index 234388c663ea147bb135435cd943872b1d9a23d2..e3c9a532519c0c74e0a7969f26ad84be090e41be 100644
--- a/proof/proofplayer/inc/TDrawFeedback.h
+++ b/proof/proofplayer/inc/TDrawFeedback.h
@@ -24,12 +24,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TProof;
class TProof;
diff --git a/proof/proofplayer/inc/TEventIter.h b/proof/proofplayer/inc/TEventIter.h
index 5f76e664e18f293ee9233a5ef361174250f5db86..a4596095750054b6a0a8a03d0b49f6d7d48e8349 100644
--- a/proof/proofplayer/inc/TEventIter.h
+++ b/proof/proofplayer/inc/TEventIter.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TDSet;
class TDSetElement;
diff --git a/proof/proofplayer/inc/TOutputListSelectorDataMap.h b/proof/proofplayer/inc/TOutputListSelectorDataMap.h
index 8e5bbe0b1aedf18813cfba1f014bf5fe9fe5385a..98ee2f76dee5bfc04383984f824f8136deaa35cb 100644
--- a/proof/proofplayer/inc/TOutputListSelectorDataMap.h
+++ b/proof/proofplayer/inc/TOutputListSelectorDataMap.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TSelector;
class TCollection;
diff --git a/proof/proofplayer/inc/TPacketizer.h b/proof/proofplayer/inc/TPacketizer.h
index a3d04019e8df997b948cf709b35faf451b0a3808..8d1392e01d686434143a53177a7a28fbb9a62161 100644
--- a/proof/proofplayer/inc/TPacketizer.h
+++ b/proof/proofplayer/inc/TPacketizer.h
@@ -26,9 +26,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualPacketizer
#include "TVirtualPacketizer.h"
-#endif
class TMessage;
diff --git a/proof/proofplayer/inc/TPacketizerAdaptive.h b/proof/proofplayer/inc/TPacketizerAdaptive.h
index b6d4159bfc0f688d1dfb91d2d00ff83a1c842fc1..063909b0bd6d7e3841768b2a9adbc87c9d9d6e45 100644
--- a/proof/proofplayer/inc/TPacketizerAdaptive.h
+++ b/proof/proofplayer/inc/TPacketizerAdaptive.h
@@ -34,9 +34,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualPacketizer
#include "TVirtualPacketizer.h"
-#endif
class TMessage;
diff --git a/proof/proofplayer/inc/TPacketizerFile.h b/proof/proofplayer/inc/TPacketizerFile.h
index 628ebcd0d8bde46b1d8c7745395f137bbe1a3056..e297456275a275bb64f5e8356330eeef595b0fe6 100644
--- a/proof/proofplayer/inc/TPacketizerFile.h
+++ b/proof/proofplayer/inc/TPacketizerFile.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualPacketizer
#include "TVirtualPacketizer.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class TMessage;
diff --git a/proof/proofplayer/inc/TPacketizerMulti.h b/proof/proofplayer/inc/TPacketizerMulti.h
index b3a73c82e124317a4297abc152ceb2b684355cec..b862223ad4945b8ad3f9274adee12b9629e673c9 100644
--- a/proof/proofplayer/inc/TPacketizerMulti.h
+++ b/proof/proofplayer/inc/TPacketizerMulti.h
@@ -26,9 +26,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualPacketizer
#include "TVirtualPacketizer.h"
-#endif
class TIter;
diff --git a/proof/proofplayer/inc/TPacketizerUnit.h b/proof/proofplayer/inc/TPacketizerUnit.h
index fff75c8ccefdd2f8bc7f872add3cb291e4525e10..a9bd3fe8e53a0cd0b24ac1617bb671fc7c39fd73 100644
--- a/proof/proofplayer/inc/TPacketizerUnit.h
+++ b/proof/proofplayer/inc/TPacketizerUnit.h
@@ -26,12 +26,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualPacketizer
#include "TVirtualPacketizer.h"
-#endif
-#ifndef ROOT_TMap
#include "TMap.h"
-#endif
class TMessage;
diff --git a/proof/proofplayer/inc/TPerfStats.h b/proof/proofplayer/inc/TPerfStats.h
index f2120193e6ada6fca235813149754905e9b52d9d..56566d55d1f873768c531c906decc8d200c41846 100644
--- a/proof/proofplayer/inc/TPerfStats.h
+++ b/proof/proofplayer/inc/TPerfStats.h
@@ -22,21 +22,11 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TTimeStamp
#include "TTimeStamp.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TVirtualPerfStats
#include "TVirtualPerfStats.h"
-#endif
class TDSet;
diff --git a/proof/proofplayer/inc/TProofDraw.h b/proof/proofplayer/inc/TProofDraw.h
index daa4a0659d13db972866db2353e5e246f36e18a2..1e2287b5d3818292b0037021b7546f2f3b869dae 100644
--- a/proof/proofplayer/inc/TProofDraw.h
+++ b/proof/proofplayer/inc/TProofDraw.h
@@ -21,21 +21,13 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSelector
#include "TSelector.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TTreeDrawArgsParser
#include "TTreeDrawArgsParser.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
#include <vector>
diff --git a/proof/proofplayer/inc/TProofLimitsFinder.h b/proof/proofplayer/inc/TProofLimitsFinder.h
index 59ae99f4526a869b5dcc8ff7b22c054f66d8abc8..ffbe02cd64b09840db5622b8cc425fecbce8750d 100644
--- a/proof/proofplayer/inc/TProofLimitsFinder.h
+++ b/proof/proofplayer/inc/TProofLimitsFinder.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_THLimitsFinder
#include "THLimitsFinder.h"
-#endif
class TH1;
class TString;
diff --git a/proof/proofplayer/inc/TProofMonSender.h b/proof/proofplayer/inc/TProofMonSender.h
index b14e14e1e282db377b3344af6c291f427e459c6f..40284b02e29cb0ccd1a173f0bac1ad64d95115a0 100644
--- a/proof/proofplayer/inc/TProofMonSender.h
+++ b/proof/proofplayer/inc/TProofMonSender.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TDSet;
class TList;
diff --git a/proof/proofplayer/inc/TProofMonSenderML.h b/proof/proofplayer/inc/TProofMonSenderML.h
index 2f387e35eefd0ca178dac36a03c65c43518991c6..e90d572f636b3f804cbcca4d561dc028c3b033ab 100644
--- a/proof/proofplayer/inc/TProofMonSenderML.h
+++ b/proof/proofplayer/inc/TProofMonSenderML.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProofMonSender
#include "TProofMonSender.h"
-#endif
class TDSet;
class TList;
diff --git a/proof/proofplayer/inc/TProofMonSenderSQL.h b/proof/proofplayer/inc/TProofMonSenderSQL.h
index db4fa1769d2c4292e4fc087a8834ab8487b12c0e..5277d19e269d931ae9046ab84e6f55294e486f77 100644
--- a/proof/proofplayer/inc/TProofMonSenderSQL.h
+++ b/proof/proofplayer/inc/TProofMonSenderSQL.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProofMonSender
#include "TProofMonSender.h"
-#endif
class TDSet;
class TList;
diff --git a/proof/proofplayer/inc/TProofPlayer.h b/proof/proofplayer/inc/TProofPlayer.h
index e30a071bba804365fca119e0fe99f697f4dfa402..5a5ce35c236a05a57a51abf98f778ab9e1b011b7 100644
--- a/proof/proofplayer/inc/TProofPlayer.h
+++ b/proof/proofplayer/inc/TProofPlayer.h
@@ -30,33 +30,15 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualProofPlayer
#include "TVirtualProofPlayer.h"
-#endif
-#ifndef ROOT_TArrayL64
#include "TArrayL64.h"
-#endif
-#ifndef ROOT_TArrayF
#include "TArrayF.h"
-#endif
-#ifndef ROOT_TArrayI
#include "TArrayI.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TSystem
#include "TSystem.h"
-#endif
-#ifndef ROOT_TQueryResult
#include "TQueryResult.h"
-#endif
-#ifndef ROOT_TProofProgressStatus
#include "TProofProgressStatus.h"
-#endif
-#ifndef ROOT_TError
#include "TError.h"
-#endif
#include <mutex>
diff --git a/proof/proofplayer/inc/TProofPlayerLite.h b/proof/proofplayer/inc/TProofPlayerLite.h
index f2596820160b61ea424cabe2f9990ede56a927d6..d4782cbcda583a7b9bda8a390e704cd698dea2c7 100644
--- a/proof/proofplayer/inc/TProofPlayerLite.h
+++ b/proof/proofplayer/inc/TProofPlayerLite.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProofPlayer
#include "TProofPlayer.h"
-#endif
class TProofPlayerLite : public TProofPlayerRemote {
diff --git a/proof/proofplayer/inc/TStatsFeedback.h b/proof/proofplayer/inc/TStatsFeedback.h
index 639760d97d7854fa9d40776eec426128d7fa7b21..58bcf55a73fa36634ce7bac7bce8eed39f0c64f0 100644
--- a/proof/proofplayer/inc/TStatsFeedback.h
+++ b/proof/proofplayer/inc/TStatsFeedback.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TQObject
#include "TQObject.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TProof;
class TProof;
diff --git a/proof/proofplayer/inc/TStatus.h b/proof/proofplayer/inc/TStatus.h
index 6c3705032b2eabcfb64f2b99cc4147136d8f5918..08a8e3971c257fed2d8690bc5a1705316386c558 100644
--- a/proof/proofplayer/inc/TStatus.h
+++ b/proof/proofplayer/inc/TStatus.h
@@ -23,12 +23,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_THashList
#include "THashList.h"
-#endif
#include <set>
#include <string>
diff --git a/proof/proofplayer/inc/TVirtualPacketizer.h b/proof/proofplayer/inc/TVirtualPacketizer.h
index 899097cce09b3c3432a8bb4bf61c4b6b2710abe3..2ac64cb94196acfedc7482a8ce162c536ed8c470 100644
--- a/proof/proofplayer/inc/TVirtualPacketizer.h
+++ b/proof/proofplayer/inc/TVirtualPacketizer.h
@@ -33,18 +33,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TSlave
#include "TSlave.h"
-#endif
-#ifndef ROOT_TProofProgressStatus
#include "TProofProgressStatus.h"
-#endif
-#ifndef ROOT_TTime
#include "TTime.h"
-#endif
class TDSet;
diff --git a/proof/proofx/inc/TXHandler.h b/proof/proofx/inc/TXHandler.h
index 42a225ac524cb58926ccee53a4c488536f94ed47..6a077247eb8dd071b07335a2ce5105660108485c 100644
--- a/proof/proofx/inc/TXHandler.h
+++ b/proof/proofx/inc/TXHandler.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TXHandler {
diff --git a/proof/proofx/inc/TXProofMgr.h b/proof/proofx/inc/TXProofMgr.h
index 9b0592b5ea85d2e0c4d5681a8c963852bf6b42c4..89768a92507e44022ebf951e578d46358a7e4eac 100644
--- a/proof/proofx/inc/TXProofMgr.h
+++ b/proof/proofx/inc/TXProofMgr.h
@@ -24,15 +24,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProofMgr
#include "TProofMgr.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
-#ifndef ROOT_TXHandler
#include "TXHandler.h"
-#endif
//
// XPROOF client version: increase whenever a non backward compatible
diff --git a/proof/proofx/inc/TXProofServ.h b/proof/proofx/inc/TXProofServ.h
index 8e03d04a25ce3033b0258ea6369271974e531b1f..365bb81310126dee5142bc28cb5ec4518a5a5c49 100644
--- a/proof/proofx/inc/TXProofServ.h
+++ b/proof/proofx/inc/TXProofServ.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TProofServ
#include "TProofServ.h"
-#endif
-#ifndef ROOT_TXHandler
#include "TXHandler.h"
-#endif
class TXProofServInterruptHandler;
class TXSocketHandler;
diff --git a/proof/proofx/inc/TXSlave.h b/proof/proofx/inc/TXSlave.h
index 8c75b26cf2c38e3d506210f31fd5d3c1275b162c..bcfc325b0c1c9079e3587a2766869b77d81daabd 100644
--- a/proof/proofx/inc/TXSlave.h
+++ b/proof/proofx/inc/TXSlave.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSlave
#include "TSlave.h"
-#endif
-#ifndef ROOT_TXHandler
#include "TXHandler.h"
-#endif
class TObjString;
class TSocket;
diff --git a/proof/proofx/inc/TXSocket.h b/proof/proofx/inc/TXSocket.h
index b4a1ecf034b00f16a95346a115bb0dd84979898c..dfc63d306a6f28d46617c6b7d9eb531d1d8fe4bc 100644
--- a/proof/proofx/inc/TXSocket.h
+++ b/proof/proofx/inc/TXSocket.h
@@ -22,30 +22,16 @@
#define DFLT_CONNECTMAXTRY 10
-#ifndef ROOT_TSemaphore
#include "TSemaphore.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TMessage
#include "TMessage.h"
-#endif
-#ifndef ROOT_TUrl
#include "TUrl.h"
-#endif
-#ifndef ROOT_TSocket
#include "TSocket.h"
-#endif
#ifndef __XPTYPES_H
#include "XProtocol/XPtypes.hh"
#endif
-#ifndef XRC_UNSOLMSG_H
#include "XrdClient/XrdClientUnsolMsg.hh"
-#endif
#include <list>
#include <mutex>
diff --git a/proof/proofx/inc/TXSocketHandler.h b/proof/proofx/inc/TXSocketHandler.h
index 2414d3289509e5134ce345b59d8208ee375f1ba0..ccdf65256a0c62112ee6458ce3da7b427c45800c 100644
--- a/proof/proofx/inc/TXSocketHandler.h
+++ b/proof/proofx/inc/TXSocketHandler.h
@@ -22,12 +22,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSysEvtHandler
#include "TSysEvtHandler.h"
-#endif
-#ifndef ROOT_TXSocket
#include "TXSocket.h"
-#endif
class TXSocketHandler : public TFileHandler {
diff --git a/proof/proofx/inc/TXUnixSocket.h b/proof/proofx/inc/TXUnixSocket.h
index e0ac1981f35fa811e1adda8443854ef56cb56f92..0c59d88bb0775e41f6ed2ce61aedc41b661ff289 100644
--- a/proof/proofx/inc/TXUnixSocket.h
+++ b/proof/proofx/inc/TXUnixSocket.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TXSocket
#include "TXSocket.h"
-#endif
#include <list>
class TXHandler;
diff --git a/roofit/roofitcore/src/RooAbsReal.cxx b/roofit/roofitcore/src/RooAbsReal.cxx
index 3b1feef2bd99b072d9ac3df60794706179d23f09..c7ed7a9c8f49e1b5a31ba075833dd806e359c83b 100644
--- a/roofit/roofitcore/src/RooAbsReal.cxx
+++ b/roofit/roofitcore/src/RooAbsReal.cxx
@@ -73,9 +73,7 @@
#include "RooCmdConfig.h"
#include "RooXYChi2Var.h"
#include "RooMinuit.h"
-#ifndef __ROOFIT_NOROOMINIMIZER
#include "RooMinimizer.h"
-#endif
#include "RooChi2Var.h"
#include "RooFitResult.h"
#include "RooAbsMoment.h"
diff --git a/roofit/roostats/inc/RooStats/AsymptoticCalculator.h b/roofit/roostats/inc/RooStats/AsymptoticCalculator.h
index 3888dfbae256f09b4b9dd9ecf5a503fdd4c506a8..e87dc869d1a327d468ba029d37346a4243968a86 100644
--- a/roofit/roostats/inc/RooStats/AsymptoticCalculator.h
+++ b/roofit/roostats/inc/RooStats/AsymptoticCalculator.h
@@ -11,9 +11,7 @@
#ifndef ROOSTATS_AsymptoticCalculator
#define ROOSTATS_AsymptoticCalculator
-#ifndef ROOSTATS_HypoTestCalculatorGeneric
#include "RooStats/HypoTestCalculatorGeneric.h"
-#endif
#include "RooArgSet.h"
#include "Rtypes.h"
diff --git a/roofit/roostats/inc/RooStats/BayesianCalculator.h b/roofit/roostats/inc/RooStats/BayesianCalculator.h
index 514f4002c4f12fd825ca3c631d68abf793cdcca4..5b784a519a9c76ca62286f639d6eed2de48955f6 100644
--- a/roofit/roostats/inc/RooStats/BayesianCalculator.h
+++ b/roofit/roostats/inc/RooStats/BayesianCalculator.h
@@ -15,17 +15,11 @@
#include "Math/IFunctionfwd.h"
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROOSTATS_IntervalCalculator
#include "RooStats/IntervalCalculator.h"
-#endif
-#ifndef ROOSTATS_SimpleInterval
#include "RooStats/SimpleInterval.h"
-#endif
class RooAbsData;
class RooAbsPdf;
diff --git a/roofit/roostats/inc/RooStats/BernsteinCorrection.h b/roofit/roostats/inc/RooStats/BernsteinCorrection.h
index 1a571d9841395d01c95f274edee2b1f7c0c9e7bf..04663a08e206c1b866713b29b6282630cc327ec3 100644
--- a/roofit/roostats/inc/RooStats/BernsteinCorrection.h
+++ b/roofit/roostats/inc/RooStats/BernsteinCorrection.h
@@ -12,9 +12,7 @@
#define ROOSTATS_BernsteinCorrection
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include "TH1F.h"
#include "RooWorkspace.h"
diff --git a/roofit/roostats/inc/RooStats/CombinedCalculator.h b/roofit/roostats/inc/RooStats/CombinedCalculator.h
index ec8c355c04ae8a504b1574c351aa16b945e7bd5d..c83f5a85eb3a7d45612182322a6ec96d24c4589a 100644
--- a/roofit/roostats/inc/RooStats/CombinedCalculator.h
+++ b/roofit/roostats/inc/RooStats/CombinedCalculator.h
@@ -12,29 +12,17 @@
#define ROOSTATS_CombinedCalculator
-#ifndef ROOSTATS_IntervalCalculator
#include "RooStats/IntervalCalculator.h"
-#endif
-#ifndef ROOSTATS_HypoTestCalculator
#include "RooStats/HypoTestCalculator.h"
-#endif
-#ifndef ROOSTATS_ModelConfig
#include "RooStats/ModelConfig.h"
-#endif
-#ifndef ROO_ABS_PDF
#include "RooAbsPdf.h"
-#endif
-#ifndef ROO_ABS_DATA
#include "RooAbsData.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
// #ifndef ROO_WORKSPACE
// #include "RooWorkspace.h"
diff --git a/roofit/roostats/inc/RooStats/ConfInterval.h b/roofit/roostats/inc/RooStats/ConfInterval.h
index 7df6644d809fd8c1f2374e27770fe713db0ebaef..663876e42797cece25bf166d5cba606029639b54 100644
--- a/roofit/roostats/inc/RooStats/ConfInterval.h
+++ b/roofit/roostats/inc/RooStats/ConfInterval.h
@@ -11,13 +11,9 @@
#ifndef ROOSTATS_ConfInterval
#define ROOSTATS_ConfInterval
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/ConfidenceBelt.h b/roofit/roostats/inc/RooStats/ConfidenceBelt.h
index a2832c3ad09569c62a483e673762a90c0d8fc2ac..9f8f49f4fa78936d692471d9e36799e461b0828d 100644
--- a/roofit/roostats/inc/RooStats/ConfidenceBelt.h
+++ b/roofit/roostats/inc/RooStats/ConfidenceBelt.h
@@ -11,15 +11,9 @@
#ifndef RooStats_ConfidenceBelt
#define RooStats_ConfidenceBelt
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_TREE_DATA
#include "RooAbsData.h"
-#endif
-#ifndef RooStats_ConfInterval
#include "RooStats/ConfInterval.h"
-#endif
#include "RooStats/SamplingDistribution.h"
diff --git a/roofit/roostats/inc/RooStats/DebuggingSampler.h b/roofit/roostats/inc/RooStats/DebuggingSampler.h
index 7dab071fdda63e123f7dbb16050a5ba8af06c172..ce804877d007ad2e11ff931e5992e21830754d69 100644
--- a/roofit/roostats/inc/RooStats/DebuggingSampler.h
+++ b/roofit/roostats/inc/RooStats/DebuggingSampler.h
@@ -20,9 +20,7 @@ for true statistical tests, but it is useful for debugging.
*/
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <vector>
diff --git a/roofit/roostats/inc/RooStats/DebuggingTestStat.h b/roofit/roostats/inc/RooStats/DebuggingTestStat.h
index 4772dc58d805260a700b54fa891ebbdcb2939779..a85c2bfa5fa557f3bfe85cb72463d55cbb95ce49 100644
--- a/roofit/roostats/inc/RooStats/DebuggingTestStat.h
+++ b/roofit/roostats/inc/RooStats/DebuggingTestStat.h
@@ -20,9 +20,7 @@ for true statistical tests, but it is useful for debugging.
*/
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <vector>
diff --git a/roofit/roostats/inc/RooStats/DetailedOutputAggregator.h b/roofit/roostats/inc/RooStats/DetailedOutputAggregator.h
index 4b3a10b84ec61045172e4b1346dff30b1b057aac..163d2d39bdf9b433f2834b552e6892d5aa9479a8 100644
--- a/roofit/roostats/inc/RooStats/DetailedOutputAggregator.h
+++ b/roofit/roostats/inc/RooStats/DetailedOutputAggregator.h
@@ -11,9 +11,7 @@
#ifndef ROOSTATS_DetailedOutputAggregator
#define ROOSTATS_DetailedOutputAggregator
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class RooAbsCollection;
class RooFitResult;
diff --git a/roofit/roostats/inc/RooStats/FeldmanCousins.h b/roofit/roostats/inc/RooStats/FeldmanCousins.h
index ec8780fa53312d5e73301b85f483d7e304c47e6d..8a865c63d94499625790dee0349689925266077e 100644
--- a/roofit/roostats/inc/RooStats/FeldmanCousins.h
+++ b/roofit/roostats/inc/RooStats/FeldmanCousins.h
@@ -12,13 +12,9 @@
#define ROOSTATS_FeldmanCousins
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOSTATS_IntervalCalculator
#include "RooStats/IntervalCalculator.h"
-#endif
#include "RooStats/ToyMCSampler.h"
#include "RooStats/ConfidenceBelt.h"
diff --git a/roofit/roostats/inc/RooStats/FrequentistCalculator.h b/roofit/roostats/inc/RooStats/FrequentistCalculator.h
index 77f789f17b4a7488be1b4e3fb9a8c87afbf12858..7730412a738297554efa33cf54749ec1ef88a9e0 100644
--- a/roofit/roostats/inc/RooStats/FrequentistCalculator.h
+++ b/roofit/roostats/inc/RooStats/FrequentistCalculator.h
@@ -12,17 +12,11 @@
#define ROOSTATS_FrequentistCalculator
-#ifndef ROOSTATS_HypoTestCalculatorGeneric
#include "RooStats/HypoTestCalculatorGeneric.h"
-#endif
-#ifndef ROOSTATS_ToyMCSampler
#include "RooStats/ToyMCSampler.h"
-#endif
-#ifndef ROOSTATS_DetailedOutputAggregator
#include "RooStats/DetailedOutputAggregator.h"
-#endif
#include "RooFitResult.h"
diff --git a/roofit/roostats/inc/RooStats/Heaviside.h b/roofit/roostats/inc/RooStats/Heaviside.h
index b185f34dcd296247563472f08c8d55b239656b77..d8cd7f6506046a1fb8a2b9b33ffb1735cb3de0e7 100644
--- a/roofit/roostats/inc/RooStats/Heaviside.h
+++ b/roofit/roostats/inc/RooStats/Heaviside.h
@@ -7,21 +7,11 @@
#ifndef RooStats_Heaviside
#define RooStats_Heaviside
-#ifndef ROO_ABS_REAL
#include "RooAbsReal.h"
-#endif
-#ifndef ROO_REAL_PROXY
#include "RooRealProxy.h"
-#endif
-#ifndef ROO_CATEGORY_PROXY
#include "RooCategoryProxy.h"
-#endif
-#ifndef ROO_ABS_REAL
#include "RooAbsReal.h"
-#endif
-#ifndef ROO_ABS_CATEGORY
#include "RooAbsCategory.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/HybridCalculator.h b/roofit/roostats/inc/RooStats/HybridCalculator.h
index bd94aafb43988a411ebf4d3050ccd7b6dceeb13e..985c6b5b5eb31b4cf31fe502c016326274bacdcf 100644
--- a/roofit/roostats/inc/RooStats/HybridCalculator.h
+++ b/roofit/roostats/inc/RooStats/HybridCalculator.h
@@ -11,13 +11,9 @@
#ifndef ROOSTATS_HybridCalculator
#define ROOSTATS_HybridCalculator
-#ifndef ROOSTATS_HypoTestCalculatorGeneric
#include "RooStats/HypoTestCalculatorGeneric.h"
-#endif
-#ifndef ROOSTATS_ToyMCSampler
#include "RooStats/ToyMCSampler.h"
-#endif
diff --git a/roofit/roostats/inc/RooStats/HybridCalculatorOriginal.h b/roofit/roostats/inc/RooStats/HybridCalculatorOriginal.h
index 6cdc7779e17ab72e2fd6e6294f4b7715501f0b0b..b2a70f8a17adf8fedc38d10f988987dd7c03b14d 100644
--- a/roofit/roostats/inc/RooStats/HybridCalculatorOriginal.h
+++ b/roofit/roostats/inc/RooStats/HybridCalculatorOriginal.h
@@ -16,20 +16,14 @@
#ifndef ROOSTATS_HybridCalculatorOriginal
#define ROOSTATS_HybridCalculatorOriginal
-#ifndef ROOSTATS_HypoTestCalculator
#include "RooStats/HypoTestCalculator.h"
-#endif
#include <vector>
-#ifndef ROOSTATS_HybridResult
#include "RooStats/HybridResult.h"
-#endif
-#ifndef ROOSTATS_ModelConfig
#include "RooStats/ModelConfig.h"
-#endif
class TH1;
diff --git a/roofit/roostats/inc/RooStats/HybridPlot.h b/roofit/roostats/inc/RooStats/HybridPlot.h
index 4934672e3a0b218593064298ade6a87c91960371..abfb1c46e34c5c0f45bb0e3b7db78ca75c8dbe7a 100644
--- a/roofit/roostats/inc/RooStats/HybridPlot.h
+++ b/roofit/roostats/inc/RooStats/HybridPlot.h
@@ -19,9 +19,7 @@
#include <vector>
#include <iostream>
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
// these should be maybe forward declared
// by moving implementations in source file
diff --git a/roofit/roostats/inc/RooStats/HybridResult.h b/roofit/roostats/inc/RooStats/HybridResult.h
index f804e91cf056ec1c1effcb33ac66f367ec26e20d..dc87022cdea43ef405660d6dfa2283008fe4be6e 100644
--- a/roofit/roostats/inc/RooStats/HybridResult.h
+++ b/roofit/roostats/inc/RooStats/HybridResult.h
@@ -16,9 +16,7 @@
#ifndef ROOSTATS_HybridResult
#define ROOSTATS_HybridResult
-#ifndef ROOSTATS_HypoTestResult
#include "RooStats/HypoTestResult.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/HypoTestCalculator.h b/roofit/roostats/inc/RooStats/HypoTestCalculator.h
index 6194dc6163235434097656120ff1ad8c64411e05..55117a07c2c3c4e2c4c9d5ab89b3541e4f9474f4 100644
--- a/roofit/roostats/inc/RooStats/HypoTestCalculator.h
+++ b/roofit/roostats/inc/RooStats/HypoTestCalculator.h
@@ -13,9 +13,7 @@
//#include "TNamed.h"
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
diff --git a/roofit/roostats/inc/RooStats/HypoTestCalculatorGeneric.h b/roofit/roostats/inc/RooStats/HypoTestCalculatorGeneric.h
index 208fb506558eefad23e4fd23716e7d92761e31d3..327b70e8af8de5f21a7f22148a59c9aec9b601cf 100644
--- a/roofit/roostats/inc/RooStats/HypoTestCalculatorGeneric.h
+++ b/roofit/roostats/inc/RooStats/HypoTestCalculatorGeneric.h
@@ -16,29 +16,17 @@
#include "Rtypes.h" // necessary for TNamed
#endif
-#ifndef ROOSTATS_HypoTestCalculator
#include "RooStats/HypoTestCalculator.h"
-#endif
-#ifndef ROOSTATS_ModelConfig
#include "RooStats/ModelConfig.h"
-#endif
-#ifndef ROOSTATS_TestStatistic
#include "RooStats/TestStatistic.h"
-#endif
-#ifndef ROOSTATS_TestStatSampler
#include "RooStats/TestStatSampler.h"
-#endif
-#ifndef ROOSTATS_SamplingDistribution
#include "RooStats/SamplingDistribution.h"
-#endif
-#ifndef ROOSTATS_HypoTestResult
#include "RooStats/HypoTestResult.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/HypoTestInverter.h b/roofit/roostats/inc/RooStats/HypoTestInverter.h
index a40ad9167d62bf1ab2ccf05af6f187aa0a2836c3..89dd880ed406f02a40599ef8593341789918d305 100644
--- a/roofit/roostats/inc/RooStats/HypoTestInverter.h
+++ b/roofit/roostats/inc/RooStats/HypoTestInverter.h
@@ -12,14 +12,10 @@
#define ROOSTATS_HypoTestInverter
-#ifndef ROOSTATS_IntervalCalculator
#include "RooStats/IntervalCalculator.h"
-#endif
-#ifndef ROOSTATS_HypoTestInverterResult
#include "RooStats/HypoTestInverterResult.h"
-#endif
class RooRealVar;
class TGraphErrors;
diff --git a/roofit/roostats/inc/RooStats/HypoTestInverterOriginal.h b/roofit/roostats/inc/RooStats/HypoTestInverterOriginal.h
index 77d67507e937196ddc3799a8bfe54838da63917b..adf7e85624e512efd3abe90bbf13ad560bb1ff8b 100644
--- a/roofit/roostats/inc/RooStats/HypoTestInverterOriginal.h
+++ b/roofit/roostats/inc/RooStats/HypoTestInverterOriginal.h
@@ -13,17 +13,11 @@
-#ifndef ROOSTATS_IntervalCalculator
#include "RooStats/IntervalCalculator.h"
-#endif
-#ifndef ROOSTATS_HypoTestCalculator
#include "RooStats/HypoTestCalculator.h"
-#endif
-#ifndef ROOSTATS_HypoTestInverterResult
#include "RooStats/HypoTestInverterResult.h"
-#endif
class RooRealVar;
diff --git a/roofit/roostats/inc/RooStats/HypoTestInverterResult.h b/roofit/roostats/inc/RooStats/HypoTestInverterResult.h
index 16996930f6fdad04ad261ce60d2eb5f4ce8564e1..51a8385a291ea078ca2e4def0e9bc3c6c73b97c3 100644
--- a/roofit/roostats/inc/RooStats/HypoTestInverterResult.h
+++ b/roofit/roostats/inc/RooStats/HypoTestInverterResult.h
@@ -13,9 +13,7 @@
-#ifndef ROOSTATS_SimpleInterval
#include "RooStats/SimpleInterval.h"
-#endif
#include "RooStats/HypoTestResult.h"
diff --git a/roofit/roostats/inc/RooStats/HypoTestPlot.h b/roofit/roostats/inc/RooStats/HypoTestPlot.h
index 278da58eb32357ffb61b5e4b79b64ea1ce0767af..5c116d029a43923bc487fa274084f40dca0fdf85 100644
--- a/roofit/roostats/inc/RooStats/HypoTestPlot.h
+++ b/roofit/roostats/inc/RooStats/HypoTestPlot.h
@@ -11,17 +11,11 @@
#ifndef ROOSTATS_HypoTestPlot
#define ROOSTATS_HypoTestPlot
-#ifndef ROOSTATS_SamplingDistPlot
#include "RooStats/SamplingDistPlot.h"
-#endif
-#ifndef ROOSTATS_SamplingDistribution
#include "RooStats/SamplingDistribution.h"
-#endif
-#ifndef ROOSTATS_HypoTestResult
#include "RooStats/HypoTestResult.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/HypoTestResult.h b/roofit/roostats/inc/RooStats/HypoTestResult.h
index 6515741c77e0c3622d0ffb91a27fbd0796732e69..0c0d2fde716c095f978fa18ea3068b8c0bf7e201 100644
--- a/roofit/roostats/inc/RooStats/HypoTestResult.h
+++ b/roofit/roostats/inc/RooStats/HypoTestResult.h
@@ -14,17 +14,11 @@
#ifndef ROOSTATS_HypoTestResult
#define ROOSTATS_HypoTestResult
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOSTATS_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
-#ifndef ROOSTATS_SamplingDistribution
#include "RooStats/SamplingDistribution.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/IntervalCalculator.h b/roofit/roostats/inc/RooStats/IntervalCalculator.h
index 92efa3e602efb388158489bece6fe27ff1455a3e..6c3a65035a8847aba7c3a6a2415da45a656b582e 100644
--- a/roofit/roostats/inc/RooStats/IntervalCalculator.h
+++ b/roofit/roostats/inc/RooStats/IntervalCalculator.h
@@ -13,9 +13,7 @@
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
//#include "TNamed.h"
diff --git a/roofit/roostats/inc/RooStats/LikelihoodInterval.h b/roofit/roostats/inc/RooStats/LikelihoodInterval.h
index c12b679a27121fcf7c4a55c26d5777a3edbfddda..dcaaff42973647ab520df5e3d26fd8b8346c11b5 100644
--- a/roofit/roostats/inc/RooStats/LikelihoodInterval.h
+++ b/roofit/roostats/inc/RooStats/LikelihoodInterval.h
@@ -11,21 +11,13 @@
#ifndef RooStats_LikelihoodInterval
#define RooStats_LikelihoodInterval
-#ifndef RooStats_ConfInterval
#include "RooStats/ConfInterval.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_ABS_REAL
#include "RooAbsReal.h"
-#endif
-#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
-#endif
#include <map>
#include <memory>
diff --git a/roofit/roostats/inc/RooStats/MCMCCalculator.h b/roofit/roostats/inc/RooStats/MCMCCalculator.h
index e5af334eb2ee366a19234d647a738a8b92d2c2c1..58b4b5b9dafc90be48bfbd4c536187efcf8a3586 100644
--- a/roofit/roostats/inc/RooStats/MCMCCalculator.h
+++ b/roofit/roostats/inc/RooStats/MCMCCalculator.h
@@ -12,34 +12,16 @@
#ifndef ROOSTATS_MCMCCalculator
#define ROOSTATS_MCMCCalculator
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROO_ABS_PDF
#include "RooAbsPdf.h"
-#endif
-#ifndef ROO_ABS_DATA
#include "RooAbsData.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_ARG_LIST
#include "RooArgList.h"
-#endif
-#ifndef ROOSTATS_ProposalFunction
#include "RooStats/ProposalFunction.h"
-#endif
-#ifndef ROOSTATS_IntervalCalculator
#include "RooStats/IntervalCalculator.h"
-#endif
-#ifndef RooStats_MCMCInterval
#include "RooStats/MCMCInterval.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/MCMCInterval.h b/roofit/roostats/inc/RooStats/MCMCInterval.h
index 2e5f81765f4024a768d4760bec355aaa1c52794a..2e31c89eac8f702b780f42d14e7678cd17ef2a4f 100644
--- a/roofit/roostats/inc/RooStats/MCMCInterval.h
+++ b/roofit/roostats/inc/RooStats/MCMCInterval.h
@@ -12,22 +12,12 @@
#ifndef RooStats_MCMCInterval
#define RooStats_MCMCInterval
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOSTATS_ConfInterval
#include "RooStats/ConfInterval.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_ARG_LIST
#include "RooArgList.h"
-#endif
-#ifndef ROOSTATS_MarkovChain
#include "RooStats/MarkovChain.h"
-#endif
class RooNDKeysPdf;
class RooProduct;
diff --git a/roofit/roostats/inc/RooStats/MCMCIntervalPlot.h b/roofit/roostats/inc/RooStats/MCMCIntervalPlot.h
index 44508ef937a300d636275259c94d6257be4a5ff5..8d1228848b4e14d067644b5fce3a5d93280d5a15 100644
--- a/roofit/roostats/inc/RooStats/MCMCIntervalPlot.h
+++ b/roofit/roostats/inc/RooStats/MCMCIntervalPlot.h
@@ -15,27 +15,13 @@
#ifndef ROOSTATS_MCMCIntervalPlot
#define ROOSTATS_MCMCIntervalPlot
-#ifndef ROO_PRINTABLE
#include "RooPrintable.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
-#ifndef RooStats_MCMCInterval
#include "RooStats/MCMCInterval.h"
-#endif
-#ifndef ROO_KEYS_PDF
#include "RooNDKeysPdf.h"
-#endif
-#ifndef ROO_PRODUCT
#include "RooProduct.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/MarkovChain.h b/roofit/roostats/inc/RooStats/MarkovChain.h
index 0a22282f134e80455b056d82e313aef23bf3369f..2b40f03d5247fce5598278f4bd6fef393cd9dba5 100644
--- a/roofit/roostats/inc/RooStats/MarkovChain.h
+++ b/roofit/roostats/inc/RooStats/MarkovChain.h
@@ -12,26 +12,14 @@
#ifndef ROOSTATS_MarkovChain
#define ROOSTATS_MarkovChain
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROO_DATA_SET
#include "RooDataSet.h"
-#endif
-#ifndef ROO_DATA_HIST
#include "RooDataHist.h"
-#endif
-#ifndef ROOT_THnSparse
#include "THnSparse.h"
-#endif
//#include "RooArgSet.h"
//#include "RooMsgService.h"
//#include "RooRealVar.h"
diff --git a/roofit/roostats/inc/RooStats/MaxLikelihoodEstimateTestStat.h b/roofit/roostats/inc/RooStats/MaxLikelihoodEstimateTestStat.h
index f55b070a5235fc8f75dfb8eb5feb337a453bb48a..6d3ac854f4275a94096fd8d14c3dbb6f94b81a67 100644
--- a/roofit/roostats/inc/RooStats/MaxLikelihoodEstimateTestStat.h
+++ b/roofit/roostats/inc/RooStats/MaxLikelihoodEstimateTestStat.h
@@ -14,13 +14,9 @@
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROO_NLL_VAR
#include "RooNLLVar.h"
-#endif
#include "RooFitResult.h"
#include "RooStats/TestStatistic.h"
diff --git a/roofit/roostats/inc/RooStats/MetropolisHastings.h b/roofit/roostats/inc/RooStats/MetropolisHastings.h
index 37e703d863ea36c6cbcade5116f55cd7b58ca189..9abe6377767fe7f99229be9947a2e817ceb0386d 100644
--- a/roofit/roostats/inc/RooStats/MetropolisHastings.h
+++ b/roofit/roostats/inc/RooStats/MetropolisHastings.h
@@ -12,24 +12,12 @@
#ifndef ROOSTATS_MetropolisHastings
#define ROOSTATS_MetropolisHastings
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROOSTATS_ProposalFunction
#include "RooStats/ProposalFunction.h"
-#endif
-#ifndef ROOSTATS_MarkovChain
#include "RooStats/MarkovChain.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/MinNLLTestStat.h b/roofit/roostats/inc/RooStats/MinNLLTestStat.h
index 5b72da4e40318d58954394428d3e5c641171e36f..bf31b0229f3d3f3587e1e275ee2fc1f023694b66 100644
--- a/roofit/roostats/inc/RooStats/MinNLLTestStat.h
+++ b/roofit/roostats/inc/RooStats/MinNLLTestStat.h
@@ -15,9 +15,7 @@
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <vector>
diff --git a/roofit/roostats/inc/RooStats/ModelConfig.h b/roofit/roostats/inc/RooStats/ModelConfig.h
index 05a7138a4672c9ddb57ee66509f0179a01276d93..f5ec388a90c7f53e2384a6ed010b68af22050bc5 100644
--- a/roofit/roostats/inc/RooStats/ModelConfig.h
+++ b/roofit/roostats/inc/RooStats/ModelConfig.h
@@ -12,25 +12,15 @@
#define ROOSTATS_ModelConfig
-#ifndef ROO_ABS_PDF
#include "RooAbsPdf.h"
-#endif
-#ifndef ROO_ABS_DATA
#include "RooAbsData.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_WORKSPACE
#include "RooWorkspace.h"
-#endif
-#ifndef ROOT_TRef
#include "TRef.h"
-#endif
#include <string>
diff --git a/roofit/roostats/inc/RooStats/NeymanConstruction.h b/roofit/roostats/inc/RooStats/NeymanConstruction.h
index 8384cbdd739a126dd10a9d37807fa11e3337fe96..e94ddbfb6f34e1ea162be1b124da7c2b28a7879d 100644
--- a/roofit/roostats/inc/RooStats/NeymanConstruction.h
+++ b/roofit/roostats/inc/RooStats/NeymanConstruction.h
@@ -12,13 +12,9 @@
#define ROOSTATS_NeymanConstruction
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOSTATS_IntervalCalculator
#include "RooStats/IntervalCalculator.h"
-#endif
#include "RooStats/TestStatSampler.h"
#include "RooStats/ModelConfig.h"
diff --git a/roofit/roostats/inc/RooStats/NumEventsTestStat.h b/roofit/roostats/inc/RooStats/NumEventsTestStat.h
index 815f99b75eace10089d670e50507ceaf9d2995a9..ddba6ac2ae63bea98e5395691469e5bf2bed3df9 100644
--- a/roofit/roostats/inc/RooStats/NumEventsTestStat.h
+++ b/roofit/roostats/inc/RooStats/NumEventsTestStat.h
@@ -13,26 +13,16 @@
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROO_ABS_DATA
#include "RooAbsData.h"
-#endif
-#ifndef ROO_ABS_PDF
#include "RooAbsPdf.h"
-#endif
-#ifndef ROOSTATS_TestStatistic
#include "RooStats/TestStatistic.h"
-#endif
//#include "RooStats/DistributionCreator.h"
diff --git a/roofit/roostats/inc/RooStats/NumberCountingPdfFactory.h b/roofit/roostats/inc/RooStats/NumberCountingPdfFactory.h
index 29c37bd1a42f4bb23e9cbbbb8d505da4a71ab6ba..e7f34c43e41d270d35e0e5c12138bafb4abe2f3f 100644
--- a/roofit/roostats/inc/RooStats/NumberCountingPdfFactory.h
+++ b/roofit/roostats/inc/RooStats/NumberCountingPdfFactory.h
@@ -12,9 +12,7 @@
#ifndef RooStats_NumberCountingPdfFactory
#define RooStats_NumberCountingPdfFactory
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class RooWorkspace;
class RooRealVar;
diff --git a/roofit/roostats/inc/RooStats/PdfProposal.h b/roofit/roostats/inc/RooStats/PdfProposal.h
index df45ee801abd0940faf92b929bcac32ac97db6ac..dd0cfa439d25e439998c84fc1410a36d6893f0b8 100644
--- a/roofit/roostats/inc/RooStats/PdfProposal.h
+++ b/roofit/roostats/inc/RooStats/PdfProposal.h
@@ -12,29 +12,15 @@
#ifndef ROOSTATS_PdfProposal
#define ROOSTATS_PdfProposal
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOSTATS_ProposalFunction
#include "RooStats/ProposalFunction.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROO_DATA_SET
#include "RooDataSet.h"
-#endif
-#ifndef ROO_ABS_PDF
#include "RooAbsPdf.h"
-#endif
#include <map>
diff --git a/roofit/roostats/inc/RooStats/PointSetInterval.h b/roofit/roostats/inc/RooStats/PointSetInterval.h
index f055d256b8bfdc130bed8f83a5d92a97182c51a8..7e1de812fd75258fbab1d220eac0b4bbd7ec1661 100644
--- a/roofit/roostats/inc/RooStats/PointSetInterval.h
+++ b/roofit/roostats/inc/RooStats/PointSetInterval.h
@@ -11,15 +11,9 @@
#ifndef RooStats_PointSetInterval
#define RooStats_PointSetInterval
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_TREE_DATA
#include "RooAbsData.h"
-#endif
-#ifndef RooStats_ConfInterval
#include "RooStats/ConfInterval.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/ProfileLikelihoodCalculator.h b/roofit/roostats/inc/RooStats/ProfileLikelihoodCalculator.h
index 4c36e5dade5103d75aebce854661fcdf456e1aed..537f561b2b13731472e90ffde0183f0961325d04 100644
--- a/roofit/roostats/inc/RooStats/ProfileLikelihoodCalculator.h
+++ b/roofit/roostats/inc/RooStats/ProfileLikelihoodCalculator.h
@@ -11,9 +11,7 @@
#ifndef ROOSTATS_ProfileLikelihoodCalculator
#define ROOSTATS_ProfileLikelihoodCalculator
-#ifndef ROOSTATS_CombinedCalculator
#include "RooStats/CombinedCalculator.h"
-#endif
#include "RooStats/LikelihoodInterval.h"
diff --git a/roofit/roostats/inc/RooStats/ProfileLikelihoodTestStat.h b/roofit/roostats/inc/RooStats/ProfileLikelihoodTestStat.h
index a465dec0bd4e7b7781e97bd14725e63cdfc75fc8..f56fabb3264991e739262d40a6ebeb6e523ef7e2 100644
--- a/roofit/roostats/inc/RooStats/ProfileLikelihoodTestStat.h
+++ b/roofit/roostats/inc/RooStats/ProfileLikelihoodTestStat.h
@@ -13,30 +13,18 @@
#define ROOSTATS_ProfileLikelihoodTestStat
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOSTATS_TestStatistic
#include "RooStats/TestStatistic.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROO_NLL_VAR
#include "RooNLLVar.h"
-#endif
-#ifndef ROOTT_Math_MinimizerOptions
#include "Math/MinimizerOptions.h"
-#endif
-#ifndef ROOSTATS_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/ProofConfig.h b/roofit/roostats/inc/RooStats/ProofConfig.h
index 15102c6a5afe7a4804cab544d7210a604e018954..be76276d9eee2a400c6596dc430d5fbb8e4cde89 100644
--- a/roofit/roostats/inc/RooStats/ProofConfig.h
+++ b/roofit/roostats/inc/RooStats/ProofConfig.h
@@ -14,9 +14,7 @@
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include "RooWorkspace.h"
#include "RooStudyManager.h"
diff --git a/roofit/roostats/inc/RooStats/ProposalFunction.h b/roofit/roostats/inc/RooStats/ProposalFunction.h
index 443d3eb389777d9f94dd25114abb45654d82a109..8f0f90fb18d8277c9500bdc61ea5cad07600b665 100644
--- a/roofit/roostats/inc/RooStats/ProposalFunction.h
+++ b/roofit/roostats/inc/RooStats/ProposalFunction.h
@@ -15,22 +15,12 @@
#ifndef ROOSTATS_ProposalFunction
#define ROOSTATS_ProposalFunction
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
-#ifndef ROOT_TIterator
#include "TIterator.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/ProposalHelper.h b/roofit/roostats/inc/RooStats/ProposalHelper.h
index e97895b44a4027b3b1426c87a73e34671bc1c227..4349a643654c6d85d820242d5a07b489b174cbfd 100644
--- a/roofit/roostats/inc/RooStats/ProposalHelper.h
+++ b/roofit/roostats/inc/RooStats/ProposalHelper.h
@@ -12,30 +12,14 @@
#ifndef RooStats_ProposalHelper
#define RooStats_ProposalHelper
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOSTATS_ProposalFunction
#include "RooStats/ProposalFunction.h"
-#endif
-#ifndef ROOSTATS_UniformProposal
#include "RooStats/UniformProposal.h"
-#endif
-#ifndef ROOSTATS_PdfProposal
#include "RooStats/PdfProposal.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
diff --git a/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h b/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h
index 21e34c27fc505da5f79d1f437a9053f45b04299e..8c2e0ea1c0173a6e9a3f74400ffa2528ba5ee4d8 100644
--- a/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h
+++ b/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h
@@ -12,21 +12,13 @@
#define ROOSTATS_RatioOfProfiledLikelihoodsTestStat
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROO_NLL_VAR
#include "RooNLLVar.h"
-#endif
-#ifndef ROOSTATS_TestStatistic
#include "RooStats/TestStatistic.h"
-#endif
-#ifndef ROOSTATS_ProfileLikelihoodTestStat
#include "RooStats/ProfileLikelihoodTestStat.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/RooStatsUtils.h b/roofit/roostats/inc/RooStats/RooStatsUtils.h
index c226632001db2953193daae072e094003de4cb1d..71c71e9e8ff2fc005b8c5270a9d500975e5b20a4 100644
--- a/roofit/roostats/inc/RooStats/RooStatsUtils.h
+++ b/roofit/roostats/inc/RooStats/RooStatsUtils.h
@@ -12,17 +12,11 @@
#ifndef ROOSTATS_RooStatsUtils
#define ROOSTATS_RooStatsUtils
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_Math_DistFuncMathCore
-#include"Math/DistFuncMathCore.h"
-#endif
+#include "Math/DistFuncMathCore.h"
#include "RooArgSet.h"
#include "RooRealVar.h"
diff --git a/roofit/roostats/inc/RooStats/SPlot.h b/roofit/roostats/inc/RooStats/SPlot.h
index 3891fb6605e77c70c58ea7834b0854783f339bed..b56188e6bd5ffa1e7961d644afaaee9c7bd3e3b4 100644
--- a/roofit/roostats/inc/RooStats/SPlot.h
+++ b/roofit/roostats/inc/RooStats/SPlot.h
@@ -19,9 +19,7 @@ class RooRealVar;
class RooSimultaneous;
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
#include "RooFitResult.h"
#include "RooRealVar.h"
diff --git a/roofit/roostats/inc/RooStats/SamplingDistPlot.h b/roofit/roostats/inc/RooStats/SamplingDistPlot.h
index b18787d879f1d11e44b20b4ffdd287c49b97b9e4..7c62a1e390d152937ae8ffd63f8241b52167e909 100644
--- a/roofit/roostats/inc/RooStats/SamplingDistPlot.h
+++ b/roofit/roostats/inc/RooStats/SamplingDistPlot.h
@@ -20,13 +20,9 @@
#include "TF1.h"
#include "TLegend.h"
-#ifndef ROOSTATS_SamplingDistribution
#include "RooStats/SamplingDistribution.h"
-#endif
-#ifndef ROO_PLOT
#include "RooPlot.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/SamplingDistribution.h b/roofit/roostats/inc/RooStats/SamplingDistribution.h
index 66efb96985ccfaee5261956f1339f3e822835c93..b084029628833c526df0193fa399b62e47454ecd 100644
--- a/roofit/roostats/inc/RooStats/SamplingDistribution.h
+++ b/roofit/roostats/inc/RooStats/SamplingDistribution.h
@@ -16,9 +16,7 @@
#ifndef ROOSTATS_SamplingDistribution
#define ROOSTATS_SamplingDistribution
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
#include "Rtypes.h"
#include "RooDataSet.h"
diff --git a/roofit/roostats/inc/RooStats/SequentialProposal.h b/roofit/roostats/inc/RooStats/SequentialProposal.h
index 08a7242925d98c5ec82cf48b3f27338880c4dab3..48c6c6a68c0ccd31d652d74f621da64ba0b5dc87 100644
--- a/roofit/roostats/inc/RooStats/SequentialProposal.h
+++ b/roofit/roostats/inc/RooStats/SequentialProposal.h
@@ -11,15 +11,9 @@
#ifndef RooStats_SequentialProposal
#define RooStats_SequentialProposal
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOSTATS_ProposalFunction
#include "RooStats/ProposalFunction.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/SimpleInterval.h b/roofit/roostats/inc/RooStats/SimpleInterval.h
index 8ed233c6456b1c7ed2454031d40d78556051e8db..65befa8ef099a73bd41770488bb6ad0877b9c185 100644
--- a/roofit/roostats/inc/RooStats/SimpleInterval.h
+++ b/roofit/roostats/inc/RooStats/SimpleInterval.h
@@ -11,12 +11,8 @@
#ifndef RooStats_SimpleInterval
#define RooStats_SimpleInterval
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef RooStats_ConfInterval
#include "RooStats/ConfInterval.h"
-#endif
class RooRealVar;
diff --git a/roofit/roostats/inc/RooStats/SimpleLikelihoodRatioTestStat.h b/roofit/roostats/inc/RooStats/SimpleLikelihoodRatioTestStat.h
index 0321ba6616cedecd6ab5dc3bfe4065db2e604a89..a30c0c86b2ef17a5fc40d64fae9ab6a35f15dc07 100644
--- a/roofit/roostats/inc/RooStats/SimpleLikelihoodRatioTestStat.h
+++ b/roofit/roostats/inc/RooStats/SimpleLikelihoodRatioTestStat.h
@@ -11,21 +11,13 @@
#ifndef ROOSTATS_SimpleLikelihoodRatioTestStat
#define ROOSTATS_SimpleLikelihoodRatioTestStat
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROO_NLL_VAR
#include "RooNLLVar.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROOSTATS_TestStatistic
#include "RooStats/TestStatistic.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/inc/RooStats/TestStatSampler.h b/roofit/roostats/inc/RooStats/TestStatSampler.h
index 17414602ed71e1e2efeef52c5c85284911b3eb0f..3659ef13bb6905e40ed1032a97b2da3db6f2397e 100644
--- a/roofit/roostats/inc/RooStats/TestStatSampler.h
+++ b/roofit/roostats/inc/RooStats/TestStatSampler.h
@@ -12,9 +12,7 @@
#define ROOSTATS_TestStatSampler
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class RooAbsArg;
class RooAbsData;
diff --git a/roofit/roostats/inc/RooStats/TestStatistic.h b/roofit/roostats/inc/RooStats/TestStatistic.h
index ea82345dd2e402e86fd5c9aae788047f05076c52..f76be28d7290bb7e6b0ac0080e09a8eb73e2bdc8 100644
--- a/roofit/roostats/inc/RooStats/TestStatistic.h
+++ b/roofit/roostats/inc/RooStats/TestStatistic.h
@@ -14,9 +14,7 @@
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class RooArgSet;
class RooAbsData;
diff --git a/roofit/roostats/inc/RooStats/ToyMCSampler.h b/roofit/roostats/inc/RooStats/ToyMCSampler.h
index 65270e12f874c66e06d67e812f83954ed0034d77..f5451da24314268970cea07bf159450cbc3c545f 100644
--- a/roofit/roostats/inc/RooStats/ToyMCSampler.h
+++ b/roofit/roostats/inc/RooStats/ToyMCSampler.h
@@ -14,9 +14,7 @@
#define ROOSTATS_ToyMCSampler
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <vector>
#include <sstream>
diff --git a/roofit/roostats/inc/RooStats/ToyMCStudy.h b/roofit/roostats/inc/RooStats/ToyMCStudy.h
index 0c802b425b91a837364bbbafe4ce5bc8e972e1a1..3eedb6ab9de789f7572b913b287b2aab53ab9bf7 100644
--- a/roofit/roostats/inc/RooStats/ToyMCStudy.h
+++ b/roofit/roostats/inc/RooStats/ToyMCStudy.h
@@ -11,9 +11,7 @@
#ifndef ROOSTATS_ToyMCStudy
#define ROOSTATS_ToyMCStudy
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include "RooAbsStudy.h"
diff --git a/roofit/roostats/inc/RooStats/UniformProposal.h b/roofit/roostats/inc/RooStats/UniformProposal.h
index c94c13a3e5f498b8b97ce66e3340ec43a6eaa74f..15275742ab7fabeda53e8f958c31510d8cdc6493 100644
--- a/roofit/roostats/inc/RooStats/UniformProposal.h
+++ b/roofit/roostats/inc/RooStats/UniformProposal.h
@@ -12,26 +12,14 @@
#ifndef ROOSTATS_UniformProposal
#define ROOSTATS_UniformProposal
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOSTATS_ProposalFunction
#include "RooStats/ProposalFunction.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROOT_TIterator
#include "TIterator.h"
-#endif
namespace RooStats {
diff --git a/roofit/roostats/src/BernsteinCorrection.cxx b/roofit/roostats/src/BernsteinCorrection.cxx
index a3b21a41bda3892f467a99550dfb127735be5811..401e6ceede7fbbda9cdeeb7d568e7d030320102b 100644
--- a/roofit/roostats/src/BernsteinCorrection.cxx
+++ b/roofit/roostats/src/BernsteinCorrection.cxx
@@ -44,9 +44,7 @@ generating the toys (either via a histogram or via an independent model that is
*/
-#ifndef RooStats_BernsteinCorrection
#include "RooStats/BernsteinCorrection.h"
-#endif
#include "RooGlobalFunc.h"
#include "RooDataSet.h"
diff --git a/roofit/roostats/src/ConfidenceBelt.cxx b/roofit/roostats/src/ConfidenceBelt.cxx
index 1725f3d249397e7dd0ebbcf94683af33ad27bc0c..43af2087edea2aacf697d553944fca3f742ff0c7 100644
--- a/roofit/roostats/src/ConfidenceBelt.cxx
+++ b/roofit/roostats/src/ConfidenceBelt.cxx
@@ -29,9 +29,7 @@ store the interval.
*/
-#ifndef RooStats_ConfidenceBelt
#include "RooStats/ConfidenceBelt.h"
-#endif
#include "RooDataSet.h"
#include "RooDataHist.h"
diff --git a/roofit/roostats/src/FeldmanCousins.cxx b/roofit/roostats/src/FeldmanCousins.cxx
index 9bfa5445b8d352ef2f966ce64308a0302bc433e1..e41ab0879af9dd42b8bb5146d2bbb2746d94714c 100644
--- a/roofit/roostats/src/FeldmanCousins.cxx
+++ b/roofit/roostats/src/FeldmanCousins.cxx
@@ -10,17 +10,11 @@
*************************************************************************/
-#ifndef RooStats_FeldmanCousins
#include "RooStats/FeldmanCousins.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
-#ifndef RooStats_PointSetInterval
#include "RooStats/PointSetInterval.h"
-#endif
#include "RooStats/ModelConfig.h"
diff --git a/roofit/roostats/src/Heaviside.cxx b/roofit/roostats/src/Heaviside.cxx
index e4aca6d56cb1c3b95f30325cff73ef0133d7053f..d19bc21c57501e74374a13cdcad03bd70cc03e03 100644
--- a/roofit/roostats/src/Heaviside.cxx
+++ b/roofit/roostats/src/Heaviside.cxx
@@ -11,12 +11,8 @@
* This code was autogenerated by RooClassFactory *
*************************************************************************/
-#ifndef RooStats_Heaviside
#include "RooStats/Heaviside.h"
-#endif
-#ifndef ROO_ABS_REAL
#include "RooAbsReal.h"
-#endif
using namespace std;
diff --git a/roofit/roostats/src/HypoTestResult.cxx b/roofit/roostats/src/HypoTestResult.cxx
index 237bc1c447df2abe79663c47765946a646867e4c..55bb93ac0cba4e943c03e773d91b819f682db7f1 100644
--- a/roofit/roostats/src/HypoTestResult.cxx
+++ b/roofit/roostats/src/HypoTestResult.cxx
@@ -60,9 +60,7 @@ be larger than one.
#include "RooStats/SamplingDistribution.h"
#include "RooAbsReal.h"
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
#include <limits>
#define NaN numeric_limits<float>::quiet_NaN()
diff --git a/roofit/roostats/src/LikelihoodInterval.cxx b/roofit/roostats/src/LikelihoodInterval.cxx
index 6a500401d1232b10f9bf0eb86baf7c523261bf79..f93b858107d39e4db3e76b7c897b4227090f5dbe 100644
--- a/roofit/roostats/src/LikelihoodInterval.cxx
+++ b/roofit/roostats/src/LikelihoodInterval.cxx
@@ -45,9 +45,7 @@
*/
-#ifndef RooStats_LikelihoodInterval
#include "RooStats/LikelihoodInterval.h"
-#endif
#include "RooStats/RooStatsUtils.h"
#include "RooAbsReal.h"
diff --git a/roofit/roostats/src/MCMCCalculator.cxx b/roofit/roostats/src/MCMCCalculator.cxx
index f5809da6301b386a94d475241bc653bb214402e5..9366169e7f734b59aa2033533c7c7da28b5bfcef 100644
--- a/roofit/roostats/src/MCMCCalculator.cxx
+++ b/roofit/roostats/src/MCMCCalculator.cxx
@@ -32,51 +32,21 @@
will return an ConfInterval (MCMCInterval in this case).
*/
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROO_GLOBAL_FUNC
#include "RooGlobalFunc.h"
-#endif
-#ifndef ROO_ABS_REAL
#include "RooAbsReal.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_ARG_LIST
#include "RooArgList.h"
-#endif
-#ifndef ROOSTATS_ModelConfig
#include "RooStats/ModelConfig.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
-#ifndef ROOSTATS_MCMCCalculator
#include "RooStats/MCMCCalculator.h"
-#endif
-#ifndef ROOSTATS_MetropolisHastings
#include "RooStats/MetropolisHastings.h"
-#endif
-#ifndef ROOSTATS_MarkovChain
#include "RooStats/MarkovChain.h"
-#endif
-#ifndef RooStats_MCMCInterval
#include "RooStats/MCMCInterval.h"
-#endif
-#ifndef ROOT_TIterator
#include "TIterator.h"
-#endif
-#ifndef ROOSTATS_UniformProposal
#include "RooStats/UniformProposal.h"
-#endif
-#ifndef ROOSTATS_PdfProposal
#include "RooStats/PdfProposal.h"
-#endif
-#ifndef ROO_PROD_PDF
#include "RooProdPdf.h"
-#endif
ClassImp(RooStats::MCMCCalculator);
diff --git a/roofit/roostats/src/MCMCInterval.cxx b/roofit/roostats/src/MCMCInterval.cxx
index 5d6c81b500301c2a0d74f1cef871df3c6f64b915..0fd584adffb3a41856f8f33f4e1df9791602f978 100644
--- a/roofit/roostats/src/MCMCInterval.cxx
+++ b/roofit/roostats/src/MCMCInterval.cxx
@@ -55,71 +55,29 @@
*/
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
-#ifndef RooStats_MCMCInterval
#include "RooStats/MCMCInterval.h"
-#endif
-#ifndef ROOSTATS_MarkovChain
#include "RooStats/MarkovChain.h"
-#endif
-#ifndef RooStats_Heaviside
#include "RooStats/Heaviside.h"
-#endif
-#ifndef ROO_DATA_HIST
#include "RooDataHist.h"
-#endif
-#ifndef ROO_KEYS_PDF
#include "RooNDKeysPdf.h"
-#endif
-#ifndef ROO_PRODUCT
#include "RooProduct.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROO_ARG_LIST
#include "RooArgList.h"
-#endif
-#ifndef ROOT_TIterator
#include "TIterator.h"
-#endif
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
-#ifndef ROOT_TH1F
#include "TH1F.h"
-#endif
-#ifndef ROOT_TH2F
#include "TH2F.h"
-#endif
-#ifndef ROOT_TH3F
#include "TH3F.h"
-#endif
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
-#ifndef ROO_GLOBAL_FUNC
#include "RooGlobalFunc.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_THnSparse
#include "THnSparse.h"
-#endif
-#ifndef ROO_NUMBER
#include "RooNumber.h"
-#endif
//#ifndef ROOT_TFile
//#include "TFile.h"
//#endif
diff --git a/roofit/roostats/src/MCMCIntervalPlot.cxx b/roofit/roostats/src/MCMCIntervalPlot.cxx
index 68cd4248719bc3d8a04c59004d9a0c51250a1d40..cc2bad0a6db4eee20a0d72cecaa1290149b7df5f 100644
--- a/roofit/roostats/src/MCMCIntervalPlot.cxx
+++ b/roofit/roostats/src/MCMCIntervalPlot.cxx
@@ -29,54 +29,24 @@ plotted for the 1-D case.
*/
-#ifndef ROOSTATS_MCMCIntervalPlot
#include "RooStats/MCMCIntervalPlot.h"
-#endif
#include "RooStats/MCMCInterval.h"
#include "RooStats/MarkovChain.h"
-#ifndef ROOT_TROOT
#include "TROOT.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
-#ifndef ROOT_TLine
#include "TLine.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TGraph
#include "TGraph.h"
-#endif
-#ifndef ROOT_TPad
#include "TPad.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROO_PLOT
#include "RooPlot.h"
-#endif
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
-#ifndef ROOT_TH1F
#include "TH1F.h"
-#endif
-#ifndef ROO_ARG_LIST
#include "RooArgList.h"
-#endif
-#ifndef ROOT_TAxis
#include "TAxis.h"
-#endif
-#ifndef ROO_GLOBAL_FUNC
#include "RooGlobalFunc.h"
-#endif
#include <iostream>
diff --git a/roofit/roostats/src/MarkovChain.cxx b/roofit/roostats/src/MarkovChain.cxx
index 40002164be159c82edb525d87b44310dec0f2845..3120ab8bc263c4594ba9f60687a5844deb8b3446 100644
--- a/roofit/roostats/src/MarkovChain.cxx
+++ b/roofit/roostats/src/MarkovChain.cxx
@@ -18,34 +18,16 @@ MarkovChain.
*/
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOSTATS_MarkovChain
#include "RooStats/MarkovChain.h"
-#endif
-#ifndef ROO_DATA_SET
#include "RooDataSet.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
-#ifndef ROO_DATA_HIST
#include "RooDataHist.h"
-#endif
-#ifndef ROOT_THnSparse
#include "THnSparse.h"
-#endif
using namespace std;
diff --git a/roofit/roostats/src/MetropolisHastings.cxx b/roofit/roostats/src/MetropolisHastings.cxx
index 894a4f0b7d124a21d24c9995dbeeb6c6c330fd89..35f30e1a4eaa32eede8eff0389fc9cc1a0855865 100644
--- a/roofit/roostats/src/MetropolisHastings.cxx
+++ b/roofit/roostats/src/MetropolisHastings.cxx
@@ -42,53 +42,23 @@ uniformly over their intervals before construction of the MarkovChain begins.
#include "RooStats/MetropolisHastings.h"
-#ifndef ROOSTATS_MarkovChain
#include "RooStats/MarkovChain.h"
-#endif
-#ifndef RooStats_MCMCInterval
#include "RooStats/MCMCInterval.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
#include "RooStats/ProposalFunction.h"
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROO_NLL_VAR
#include "RooNLLVar.h"
-#endif
-#ifndef ROO_GLOBAL_FUNC
#include "RooGlobalFunc.h"
-#endif
-#ifndef ROO_DATA_SET
#include "RooDataSet.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_ARG_LIST
#include "RooArgList.h"
-#endif
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
-#ifndef ROO_RANDOM
#include "RooRandom.h"
-#endif
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
-#ifndef ROOT_TFile
#include "TFile.h"
-#endif
ClassImp(RooStats::MetropolisHastings);
diff --git a/roofit/roostats/src/ModelConfig.cxx b/roofit/roostats/src/ModelConfig.cxx
index f08937fee230532f52716926eb89ccb7e2cf335e..314684b2c6dbb551ea80d1b5ae5d08fcfb78de5f 100644
--- a/roofit/roostats/src/ModelConfig.cxx
+++ b/roofit/roostats/src/ModelConfig.cxx
@@ -21,13 +21,9 @@ ModelConfig requires a workspace to be set.
#include "TROOT.h"
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
#include <sstream>
diff --git a/roofit/roostats/src/NeymanConstruction.cxx b/roofit/roostats/src/NeymanConstruction.cxx
index f4065c672b484fcca995fbb21cbf2242991bbdaa..32437897ce7b602752318e63453bdd23eb9d70e4 100644
--- a/roofit/roostats/src/NeymanConstruction.cxx
+++ b/roofit/roostats/src/NeymanConstruction.cxx
@@ -48,17 +48,11 @@ construction by:
*/
-#ifndef RooStats_NeymanConstruction
#include "RooStats/NeymanConstruction.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
-#ifndef RooStats_PointSetInterval
#include "RooStats/PointSetInterval.h"
-#endif
#include "RooStats/SamplingDistribution.h"
#include "RooStats/ToyMCSampler.h"
diff --git a/roofit/roostats/src/NumberCountingPdfFactory.cxx b/roofit/roostats/src/NumberCountingPdfFactory.cxx
index dc44f07ee15fe9e319f5953ef51b8cbe74f83bbb..30bc1da338df46c60b3fe95b922809991232f184 100644
--- a/roofit/roostats/src/NumberCountingPdfFactory.cxx
+++ b/roofit/roostats/src/NumberCountingPdfFactory.cxx
@@ -32,13 +32,9 @@ For the future, perhaps this factory should be extended to include the efficienc
*/
-#ifndef RooStats_NumberCountingPdfFactory
#include "RooStats/NumberCountingPdfFactory.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
#include "RooRealVar.h"
#include "RooAddition.h"
diff --git a/roofit/roostats/src/NumberCountingUtils.cxx b/roofit/roostats/src/NumberCountingUtils.cxx
index 8d8883d5c26d29e397b227c23044b2af6000bbe2..087253db7438e8aea48c4d588e71a5e8233a5bbc 100644
--- a/roofit/roostats/src/NumberCountingUtils.cxx
+++ b/roofit/roostats/src/NumberCountingUtils.cxx
@@ -10,13 +10,9 @@
*************************************************************************/
-#ifndef RooStats_NumberCountingUtils
#include "RooStats/NumberCountingUtils.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
// // Without this macro the THtml doc can not be generated
// #if !defined(R__ALPHA) && !defined(R__SOLARIS) && !defined(R__ACC) && !defined(R__FBSD)
diff --git a/roofit/roostats/src/PdfProposal.cxx b/roofit/roostats/src/PdfProposal.cxx
index 52d15e09034dfa621d588d3f65a131a1cc0ca515..d9a577c6e767fafaa91377102a46054c044f6900 100644
--- a/roofit/roostats/src/PdfProposal.cxx
+++ b/roofit/roostats/src/PdfProposal.cxx
@@ -49,34 +49,16 @@ for future versions.
*/
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOSTATS_PdfProposal
#include "RooStats/PdfProposal.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_DATA_SET
#include "RooDataSet.h"
-#endif
-#ifndef ROO_ABS_PDF
#include "RooAbsPdf.h"
-#endif
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROOT_TIterator
#include "TIterator.h"
-#endif
#include <map>
diff --git a/roofit/roostats/src/PointSetInterval.cxx b/roofit/roostats/src/PointSetInterval.cxx
index 239573189ff7d5680b536f89c62a96ded9546f73..d97739554474c2c33ee579f083b4931297125d37 100644
--- a/roofit/roostats/src/PointSetInterval.cxx
+++ b/roofit/roostats/src/PointSetInterval.cxx
@@ -31,9 +31,7 @@ store the interval.
*/
-#ifndef RooStats_PointSetInterval
#include "RooStats/PointSetInterval.h"
-#endif
#include "RooRealVar.h"
#include "RooDataSet.h"
diff --git a/roofit/roostats/src/ProfileLikelihoodCalculator.cxx b/roofit/roostats/src/ProfileLikelihoodCalculator.cxx
index ebe54485c51bda22772ed5b6a02178688a4cdce1..dda8596b2fcd418a140ee565a2e2e639983465c9 100644
--- a/roofit/roostats/src/ProfileLikelihoodCalculator.cxx
+++ b/roofit/roostats/src/ProfileLikelihoodCalculator.cxx
@@ -51,13 +51,9 @@ p-value using an Asimov data set.
*/
-#ifndef RooStats_ProfileLikelihoodCalculator
#include "RooStats/ProfileLikelihoodCalculator.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
#include "RooStats/LikelihoodInterval.h"
#include "RooStats/HypoTestResult.h"
diff --git a/roofit/roostats/src/ProposalHelper.cxx b/roofit/roostats/src/ProposalHelper.cxx
index f5117a9fb878f28bb083103ddfced7a11e84f0f2..d09f20b471a621299847872559405ca6150c20a4 100644
--- a/roofit/roostats/src/ProposalHelper.cxx
+++ b/roofit/roostats/src/ProposalHelper.cxx
@@ -13,54 +13,22 @@
\ingroup Roostats
*/
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef RooStats_ProposalHelper
#include "RooStats/ProposalHelper.h"
-#endif
-#ifndef ROOSTATS_PdfProposal
#include "RooStats/PdfProposal.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_DATA_SET
#include "RooDataSet.h"
-#endif
-#ifndef ROO_ABS_PDF
#include "RooAbsPdf.h"
-#endif
-#ifndef ROO_ADD_PDF
#include "RooAddPdf.h"
-#endif
-#ifndef ROO_KEYS_PDF
#include "RooNDKeysPdf.h"
-#endif
-#ifndef ROO_UNIFORM
#include "RooUniform.h"
-#endif
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROOT_TIterator
#include "TIterator.h"
-#endif
-#ifndef ROO_MULTI_VAR_GAUSSIAN
#include "RooMultiVarGaussian.h"
-#endif
-#ifndef ROO_CONST_VAR
#include "RooConstVar.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#include <map>
diff --git a/roofit/roostats/src/SamplingDistPlot.cxx b/roofit/roostats/src/SamplingDistPlot.cxx
index bdfdd055e1feb906fa98de9f4a6def1275662cc3..aab451f5e60d71d92aee12fd4e87eb16a3c5eedf 100644
--- a/roofit/roostats/src/SamplingDistPlot.cxx
+++ b/roofit/roostats/src/SamplingDistPlot.cxx
@@ -30,9 +30,7 @@ objects.
#include <iostream>
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
#include <limits>
#define NaN std::numeric_limits<float>::quiet_NaN()
diff --git a/roofit/roostats/src/SamplingDistribution.cxx b/roofit/roostats/src/SamplingDistribution.cxx
index 7eef07a0d64ea47af226ffec311d7517da72d6dd..9370353cb9458ac901444de74630eb332ccbe95d 100644
--- a/roofit/roostats/src/SamplingDistribution.cxx
+++ b/roofit/roostats/src/SamplingDistribution.cxx
@@ -22,9 +22,7 @@ a weighted set of points (eg. for the FFT method).
The class supports merging.
*/
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
#include "RooStats/SamplingDistribution.h"
#include "RooNumber.h"
diff --git a/roofit/roostats/src/SimpleInterval.cxx b/roofit/roostats/src/SimpleInterval.cxx
index f06824eef104abe93c71f945e62c71f0e524925d..81cd05e55b6eb230549888938fb7b6de006cf6e3 100644
--- a/roofit/roostats/src/SimpleInterval.cxx
+++ b/roofit/roostats/src/SimpleInterval.cxx
@@ -25,9 +25,7 @@ It implements simple 1-dimensional intervals in a range [a,b].
In addition, you can ask it for the upper- or lower-bound.
*/
-#ifndef RooStats_SimpleInterval
#include "RooStats/SimpleInterval.h"
-#endif
#include "RooAbsReal.h"
#include "RooRealVar.h"
#include <string>
diff --git a/roofit/roostats/src/ToyMCImportanceSampler.cxx b/roofit/roostats/src/ToyMCImportanceSampler.cxx
index 48cbe3f0150006b64d59ef4a58b7d10130310928..01efecd72f70667e5acf75380a70d95a6fe4196a 100644
--- a/roofit/roostats/src/ToyMCImportanceSampler.cxx
+++ b/roofit/roostats/src/ToyMCImportanceSampler.cxx
@@ -19,9 +19,7 @@ Implementation based on a work by Cranmer, Kreiss, Read (in Preparation)
#include "RooStats/ToyMCImportanceSampler.h"
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
#include "RooCategory.h"
#include "TMath.h"
diff --git a/roofit/roostats/src/ToyMCSampler.cxx b/roofit/roostats/src/ToyMCSampler.cxx
index 5fcd560c72be30f7ceeb0ded66fb8b73c721c51a..b920ec939c8e5d3caad01bfbe376ea6e6d3ea25f 100644
--- a/roofit/roostats/src/ToyMCSampler.cxx
+++ b/roofit/roostats/src/ToyMCSampler.cxx
@@ -32,17 +32,11 @@ ToyMCStudy with the RooStudyManager.
#include "RooStats/ToyMCSampler.h"
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
-#ifndef ROO_DATA_HIST
#include "RooDataHist.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
#include "TCanvas.h"
#include "RooPlot.h"
diff --git a/roofit/roostats/src/ToyMCStudy.cxx b/roofit/roostats/src/ToyMCStudy.cxx
index b6f8b2e0e0fbed6f41154ac3d59bf7a5b9202270..2c9214eb65599eb9c5597c452ec1006ba83da6b2 100644
--- a/roofit/roostats/src/ToyMCStudy.cxx
+++ b/roofit/roostats/src/ToyMCStudy.cxx
@@ -21,9 +21,7 @@ This is also its intended use case.
#include "RooStats/ToyMCSampler.h"
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
#include "RooRandom.h"
#include "TRandom2.h"
diff --git a/roofit/roostats/src/UniformProposal.cxx b/roofit/roostats/src/UniformProposal.cxx
index b23918e0015f61dc5e3c17f2bb2c4669595328d9..c02963a8b73111f09bcd8df99097b04ddf6f82f6 100644
--- a/roofit/roostats/src/UniformProposal.cxx
+++ b/roofit/roostats/src/UniformProposal.cxx
@@ -21,28 +21,14 @@ converge as quickly as other proposal functions.
*/
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef RooStats_RooStatsUtils
#include "RooStats/RooStatsUtils.h"
-#endif
-#ifndef ROOSTATS_UniformProposal
#include "RooStats/UniformProposal.h"
-#endif
-#ifndef ROO_ARG_SET
#include "RooArgSet.h"
-#endif
-#ifndef ROO_MSG_SERVICE
#include "RooMsgService.h"
-#endif
-#ifndef ROO_REAL_VAR
#include "RooRealVar.h"
-#endif
-#ifndef ROOT_TIterator
#include "TIterator.h"
-#endif
using namespace std;
diff --git a/sql/mysql/inc/TMySQLResult.h b/sql/mysql/inc/TMySQLResult.h
index 4e868e765f63e30c7562f1743e742e0dac44758b..e3b50fd0096dc3b5135bb1698c49e1ad7fd7dc6f 100644
--- a/sql/mysql/inc/TMySQLResult.h
+++ b/sql/mysql/inc/TMySQLResult.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TMySQLResult
#define ROOT_TMySQLResult
-#ifndef ROOT_TSQLResult
#include "TSQLResult.h"
-#endif
#include <mysql.h>
diff --git a/sql/mysql/inc/TMySQLRow.h b/sql/mysql/inc/TMySQLRow.h
index 1eb77b947bc6cdfeab675f455b0a130cd19df528..1b93580d68f8abaaa1ef4b9cc9e98357cc7f0dbb 100644
--- a/sql/mysql/inc/TMySQLRow.h
+++ b/sql/mysql/inc/TMySQLRow.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TMySQLRow
#define ROOT_TMySQLRow
-#ifndef ROOT_TSQLRow
#include "TSQLRow.h"
-#endif
#include <mysql.h>
diff --git a/sql/mysql/inc/TMySQLServer.h b/sql/mysql/inc/TMySQLServer.h
index a9f72a33f36d7be89d7f9776ed5110ef79c538e1..b455d68ead4d1d88a40ac13054e54f7397c8fd25 100644
--- a/sql/mysql/inc/TMySQLServer.h
+++ b/sql/mysql/inc/TMySQLServer.h
@@ -44,9 +44,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSQLServer
#include "TSQLServer.h"
-#endif
#include <mysql.h>
diff --git a/sql/mysql/inc/TMySQLStatement.h b/sql/mysql/inc/TMySQLStatement.h
index f7dbe7ae5beb3f233a02394ede095dcd670a9f5a..0997a192f409e24b3f86e96aae16836be86e14b9 100644
--- a/sql/mysql/inc/TMySQLStatement.h
+++ b/sql/mysql/inc/TMySQLStatement.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TMySQLStatement
#define ROOT_TMySQLStatement
-#ifndef ROOT_TSQLStatement
#include "TSQLStatement.h"
-#endif
#include <mysql.h>
diff --git a/sql/odbc/inc/TODBCResult.h b/sql/odbc/inc/TODBCResult.h
index e5723e10338753d4cec72172b8193d78a7df9ecd..50ac550fa9e687ae7e450325ba095b8fce322aae 100644
--- a/sql/odbc/inc/TODBCResult.h
+++ b/sql/odbc/inc/TODBCResult.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TODBCResult
#define ROOT_TODBCResult
-#ifndef ROOT_TSQLResult
#include "TSQLResult.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#ifdef __CLING__
diff --git a/sql/odbc/inc/TODBCRow.h b/sql/odbc/inc/TODBCRow.h
index afe4fdf993d1cc2567131c2126a041767d2a8896..5d47b92a166bf16c2c404676bd593be99d75827a 100644
--- a/sql/odbc/inc/TODBCRow.h
+++ b/sql/odbc/inc/TODBCRow.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TODBCRow
#define ROOT_TODBCRow
-#ifndef ROOT_TSQLRow
#include "TSQLRow.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#ifdef __CLING__
typedef void * SQLHSTMT;
diff --git a/sql/odbc/inc/TODBCServer.h b/sql/odbc/inc/TODBCServer.h
index 6a74f1251b6ddcb7b815fd44095b55cdeedbe5a2..1880471ecaf1b77c1639e46a1f81de67b377ef38 100644
--- a/sql/odbc/inc/TODBCServer.h
+++ b/sql/odbc/inc/TODBCServer.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TODBCServer
#define ROOT_TODBCServer
-#ifndef ROOT_TSQLServer
#include "TSQLServer.h"
-#endif
#ifdef __CLING__
typedef void * SQLHENV;
diff --git a/sql/odbc/inc/TODBCStatement.h b/sql/odbc/inc/TODBCStatement.h
index 5398ce203bded02568af6dbad2ff9169110b9f26..674aa7b5dcda151574314e20870193cd8a3f584f 100644
--- a/sql/odbc/inc/TODBCStatement.h
+++ b/sql/odbc/inc/TODBCStatement.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TODBCStatement
#define ROOT_TODBCStatement
-#ifndef ROOT_TSQLStatement
#include "TSQLStatement.h"
-#endif
#ifdef __CLING__
diff --git a/sql/oracle/inc/TOracleResult.h b/sql/oracle/inc/TOracleResult.h
index 490621251515ce61239d946f8f9422b5837bca7d..98a93e361f8a4518cde97594e471e54b7aa78108 100644
--- a/sql/oracle/inc/TOracleResult.h
+++ b/sql/oracle/inc/TOracleResult.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TOracleResult
#define ROOT_TOracleResult
-#ifndef ROOT_TSQLResult
#include "TSQLResult.h"
-#endif
#include <vector>
diff --git a/sql/oracle/inc/TOracleRow.h b/sql/oracle/inc/TOracleRow.h
index 8b06721a4d1f36aea3aa112ec6d11a1b6da3b5c6..eaecd8c4050271408ab5abec7b746ede1d3d9d59 100644
--- a/sql/oracle/inc/TOracleRow.h
+++ b/sql/oracle/inc/TOracleRow.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TOracleRow
#define ROOT_TOracleRow
-#ifndef ROOT_TSQLRow
#include "TSQLRow.h"
-#endif
#if !defined(__CINT__)
#include <occi.h>
diff --git a/sql/oracle/inc/TOracleServer.h b/sql/oracle/inc/TOracleServer.h
index ae1ec23373e070c94d8ab9ba4b19eabae789782e..dbbd7b25582fe068af22c9bd4a083e04927048da 100644
--- a/sql/oracle/inc/TOracleServer.h
+++ b/sql/oracle/inc/TOracleServer.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TOracleServer
#define ROOT_TOracleServer
-#ifndef ROOT_TSQLServer
#include "TSQLServer.h"
-#endif
#if !defined(__CINT__)
#ifndef R__WIN32
diff --git a/sql/oracle/inc/TOracleStatement.h b/sql/oracle/inc/TOracleStatement.h
index 0e9f96f23523c6dc872f96a3edc07f265be9c297..a8fce53aed7113a23a048e0dd465c3db8b38c2a8 100644
--- a/sql/oracle/inc/TOracleStatement.h
+++ b/sql/oracle/inc/TOracleStatement.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TOracleStatement
#define ROOT_TOracleStatement
-#ifndef ROOT_TSQLStatement
#include "TSQLStatement.h"
-#endif
#if !defined(__CINT__)
#include <occi.h>
diff --git a/sql/pgsql/inc/TPgSQLResult.h b/sql/pgsql/inc/TPgSQLResult.h
index 7979a0e8cc88d3d305839e752195c33248d10c53..841277c489a880201e3ee7fbf1958144a8b09206 100644
--- a/sql/pgsql/inc/TPgSQLResult.h
+++ b/sql/pgsql/inc/TPgSQLResult.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TPgSQLResult
#define ROOT_TPgSQLResult
-#ifndef ROOT_TSQLResult
#include "TSQLResult.h"
-#endif
#if !defined(__CINT__)
#include <libpq-fe.h>
diff --git a/sql/pgsql/inc/TPgSQLRow.h b/sql/pgsql/inc/TPgSQLRow.h
index 61e01646eba4340741a4cef39634c5bda46a57a1..9ea75ef04234a2272f2f3fde994311d69d860db6 100644
--- a/sql/pgsql/inc/TPgSQLRow.h
+++ b/sql/pgsql/inc/TPgSQLRow.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TPgSQLRow
#define ROOT_TPgSQLRow
-#ifndef ROOT_TSQLRow
#include "TSQLRow.h"
-#endif
#if !defined(__CINT__)
#include <libpq-fe.h>
diff --git a/sql/pgsql/inc/TPgSQLServer.h b/sql/pgsql/inc/TPgSQLServer.h
index 7e102ad8efa5c3c70a0b9397133739fcc82681bc..886d55807a8e384ae42f4f3ccb3c072c89f18fcd 100644
--- a/sql/pgsql/inc/TPgSQLServer.h
+++ b/sql/pgsql/inc/TPgSQLServer.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TPgSQLServer
#define ROOT_TPgSQLServer
-#ifndef ROOT_TSQLServer
#include "TSQLServer.h"
-#endif
#include <map>
#include <string>
diff --git a/sql/pgsql/inc/TPgSQLStatement.h b/sql/pgsql/inc/TPgSQLStatement.h
index 7a6c44bc6e39784fb662ce62070631fc7699492f..3d8bbd1353c09a29c7d61b4a37c87f7197bfc9ee 100644
--- a/sql/pgsql/inc/TPgSQLStatement.h
+++ b/sql/pgsql/inc/TPgSQLStatement.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TPgSQLStatement
#define ROOT_TPgSQLStatement
-#ifndef ROOT_TSQLStatement
#include "TSQLStatement.h"
-#endif
#include <libpq-fe.h>
#include <pg_config.h> // to get PG_VERSION_NUM
diff --git a/sql/sapdb/inc/TSapDBResult.h b/sql/sapdb/inc/TSapDBResult.h
index 3dfae3469dae761f6b9061b3afe7a98a363fd858..05557808d357f6b6e4d72b356259ea6c14f6f08b 100644
--- a/sql/sapdb/inc/TSapDBResult.h
+++ b/sql/sapdb/inc/TSapDBResult.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSapDBResult
#define ROOT_TSapDBResult
-#ifndef ROOT_TSQLResult
#include "TSQLResult.h"
-#endif
#if !defined(__CINT__)
#include <sys/time.h>
diff --git a/sql/sapdb/inc/TSapDBRow.h b/sql/sapdb/inc/TSapDBRow.h
index e6751bbc42c55ae119ed918ee44c7f0b1664c24d..55766a167b244a30525bee76be1c014378fdaa3a 100644
--- a/sql/sapdb/inc/TSapDBRow.h
+++ b/sql/sapdb/inc/TSapDBRow.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSapDBRow
#define ROOT_TSapDBRow
-#ifndef ROOT_TSQLRow
#include "TSQLRow.h"
-#endif
#if !defined(__CINT__)
#include <sys/time.h>
diff --git a/sql/sapdb/inc/TSapDBServer.h b/sql/sapdb/inc/TSapDBServer.h
index b8e9b3445cb69209e7ef7dda9eea3be2ce375fd4..15c050cc88488ca331b0bf3be55a662e3f112fd9 100644
--- a/sql/sapdb/inc/TSapDBServer.h
+++ b/sql/sapdb/inc/TSapDBServer.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSapDBServer
#define ROOT_TSapDBServer
-#ifndef ROOT_TSQLServer
#include "TSQLServer.h"
-#endif
#include <ctime>
#include <WINDOWS.H>
diff --git a/sql/sqlite/inc/TSQLiteResult.h b/sql/sqlite/inc/TSQLiteResult.h
index 3530defcb14dfb18033869ac86656c95c9329f69..4d9197ad32f5b675349e9dac64032927cf3d89b6 100644
--- a/sql/sqlite/inc/TSQLiteResult.h
+++ b/sql/sqlite/inc/TSQLiteResult.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSQLiteResult
#define ROOT_TSQLiteResult
-#ifndef ROOT_TSQLResult
#include "TSQLResult.h"
-#endif
#if !defined(__CINT__)
#include <sqlite3.h>
diff --git a/sql/sqlite/inc/TSQLiteRow.h b/sql/sqlite/inc/TSQLiteRow.h
index c82ff5d7d29d9e427ea9d54b7df94eb18e5a1dff..4946a0928340e2cfb9a17004dcf90357bdd4bc74 100644
--- a/sql/sqlite/inc/TSQLiteRow.h
+++ b/sql/sqlite/inc/TSQLiteRow.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSQLiteRow
#define ROOT_TSQLiteRow
-#ifndef ROOT_TSQLRow
#include "TSQLRow.h"
-#endif
#if !defined(__CINT__)
#include <sqlite3.h>
diff --git a/sql/sqlite/inc/TSQLiteServer.h b/sql/sqlite/inc/TSQLiteServer.h
index 264d196cecac3cbb3cd4eb17b9d6e52410caf643..a6259967a3ea6c376b65c89fdaa9f8d61eea9e4f 100644
--- a/sql/sqlite/inc/TSQLiteServer.h
+++ b/sql/sqlite/inc/TSQLiteServer.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSQLiteServer
#define ROOT_TSQLiteServer
-#ifndef ROOT_TSQLServer
#include "TSQLServer.h"
-#endif
#if !defined(__CINT__)
#include <sqlite3.h>
diff --git a/sql/sqlite/inc/TSQLiteStatement.h b/sql/sqlite/inc/TSQLiteStatement.h
index 864d0d04f1773dc03b2edef101c8cba9daf6ed79..9aac90a5d41b6b29cd93c4caecf552c12ccf2858 100644
--- a/sql/sqlite/inc/TSQLiteStatement.h
+++ b/sql/sqlite/inc/TSQLiteStatement.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TSQLiteStatement
#define ROOT_TSQLiteStatement
-#ifndef ROOT_TSQLStatement
#include "TSQLStatement.h"
-#endif
#include <sqlite3.h>
diff --git a/test/RootIDE/TGRootIDE.h b/test/RootIDE/TGRootIDE.h
index 93ed3a812d2288665a13d87d30aebb7236731814..2caeabc9d2e834ced8c9c6c35962b2738eacd988 100644
--- a/test/RootIDE/TGRootIDE.h
+++ b/test/RootIDE/TGRootIDE.h
@@ -19,12 +19,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGTextEdit
#include "TGTextEdit.h"
-#endif
class TGToolBar;
class TTimer;
diff --git a/test/RootShower/GButtonFrame.h b/test/RootShower/GButtonFrame.h
index 8681db6911bab846de25888559c1eebe2808e76b..7d943e9b4330979b2e93ba99911454e3666b197d 100644
--- a/test/RootShower/GButtonFrame.h
+++ b/test/RootShower/GButtonFrame.h
@@ -19,9 +19,7 @@
#ifndef GBUTTONFRAME_H
#define GBUTTONFRAME_H
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGButton;
diff --git a/test/RootShower/GTitleFrame.h b/test/RootShower/GTitleFrame.h
index 1f2cad8c86360592e3fde3a9d2012381d1a7ffe0..72247b9ea0eed00f3f562132ea175ead53686cd0 100644
--- a/test/RootShower/GTitleFrame.h
+++ b/test/RootShower/GTitleFrame.h
@@ -19,9 +19,7 @@
#ifndef GTITLEFRAME_H
#define GTITLEFRAME_H
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TGLabel;
class TGButton;
diff --git a/test/RootShower/MyDetector.cxx b/test/RootShower/MyDetector.cxx
index 111e48c92b787026134067d9d5348b976a1b1490..ec319adeb8b62e4ac651669ee25e25fbc3ff80e1 100644
--- a/test/RootShower/MyDetector.cxx
+++ b/test/RootShower/MyDetector.cxx
@@ -11,9 +11,7 @@
#include "TROOT.h"
#include "TMath.h"
-#ifndef MYDETECTOR_H
#include "MyDetector.h"
-#endif
//______________________________________________________________________________
//
diff --git a/test/RootShower/RSAbout.h b/test/RootShower/RSAbout.h
index 724082ee5dd67bd8194f5cfcdbd91eab15f6bf21..02f16f554eab9a511445ea6dd8d71e8225b581c3 100644
--- a/test/RootShower/RSAbout.h
+++ b/test/RootShower/RSAbout.h
@@ -16,25 +16,15 @@
#ifndef ROOTSHOWERABOUT_H
#define ROOTSHOWERABOUT_H
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
-#ifndef ROOT_TGPicture
#include "TGPicture.h"
-#endif
-#ifndef ROOT_TGIcon
#include "TGIcon.h"
-#endif
-#ifndef ROOT_TGLabel
#include "TGLabel.h"
-#endif
class RootShowerAbout : public TGTransientFrame {
diff --git a/test/RootShower/RSHelpText.cxx b/test/RootShower/RSHelpText.cxx
index 6e387adcd1f2a5a4921038133afd3fc7975e68c4..0792025fda3c524d63ecfaa937f934a3d0f67f4b 100644
--- a/test/RootShower/RSHelpText.cxx
+++ b/test/RootShower/RSHelpText.cxx
@@ -7,9 +7,7 @@
* For the licensing terms see the LICENSE file. *
*************************************************************************/
-#ifndef ROOTSHOWERHELPTEXT_H
#include "RSHelpText.h"
-#endif
const char gPhysicsHelpText[] =
"\n Some physics recalls...\n\n"
diff --git a/test/RootShower/RSMsgBox.h b/test/RootShower/RSMsgBox.h
index 38a620f63240db197877a6e147ada7ad0b6220d8..3ccf8c433499fef30d1cf080fb971bbea533889b 100644
--- a/test/RootShower/RSMsgBox.h
+++ b/test/RootShower/RSMsgBox.h
@@ -16,25 +16,15 @@
#ifndef ROOTSHOWERMSGBOX_H
#define ROOTSHOWERMSGBOX_H
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
-#ifndef ROOT_TGPicture
#include "TGPicture.h"
-#endif
-#ifndef ROOT_TGIcon
#include "TGIcon.h"
-#endif
-#ifndef ROOT_TGLabel
#include "TGLabel.h"
-#endif
class RootShowerMsgBox : public TGTransientFrame {
diff --git a/test/RootShower/RootShower.cxx b/test/RootShower/RootShower.cxx
index c7ad6ad4984b3b12f1564243c6ff705d5e99839e..09f00da0dd4e48235c65d650f5f57c630abe81e1 100644
--- a/test/RootShower/RootShower.cxx
+++ b/test/RootShower/RootShower.cxx
@@ -58,9 +58,7 @@
#include <TPluginManager.h>
#include <TVirtualGL.h>
-#ifndef _CONSTANTS_H_
#include "constants.h"
-#endif
enum RootShowerMessageTypes {
M_FILE_OPEN,
diff --git a/test/RootShower/RootShower.h b/test/RootShower/RootShower.h
index c4fcece5a19a8ce4c98549192f3418cb31ccb1b3..8b31ed45137cb5a3e5c875ba7662bf5c9adcbe3c 100644
--- a/test/RootShower/RootShower.h
+++ b/test/RootShower/RootShower.h
@@ -16,15 +16,9 @@
#ifndef ROOTSHOWER_H
#define ROOTSHOWER_H
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TDatime
#include "TDatime.h"
-#endif
-#ifndef ROOT_TCanvas
#include "TCanvas.h"
-#endif
class TGMenuBar;
class TGPopupMenu;
diff --git a/test/RootShower/SettingsDlg.h b/test/RootShower/SettingsDlg.h
index 117203dd1c1ceae8a3cabf0de6153b023f63d5d4..b2dc4241d7bb7c271c796d9dedba9d9d205ee15f 100644
--- a/test/RootShower/SettingsDlg.h
+++ b/test/RootShower/SettingsDlg.h
@@ -16,25 +16,15 @@
#ifndef SETTINGSDIALOG_H
#define SETTINGSDIALOG_H
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TGButton
#include "TGButton.h"
-#endif
-#ifndef ROOT_TGTextEntry
#include "TGTextEntry.h"
-#endif
-#ifndef ROOT_TGListBox
#include <TGListBox.h>
-#endif
-#ifndef ROOT_TGTab
#include <TGTab.h>
-#endif
class SettingsDialog : public TGTransientFrame {
diff --git a/test/guiviewer.h b/test/guiviewer.h
index 11f442892787767c738b44ce8ee9416654c4961d..9ef8de032484d22b58848ad9bcabd9bd119d4f22 100644
--- a/test/guiviewer.h
+++ b/test/guiviewer.h
@@ -1,9 +1,7 @@
// @(#)root/test:$Id$
// Author: Brett Viren 04/15/2001
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TList;
class TCanvas;
diff --git a/test/ios/RootBrowser/FileUtils.h b/test/ios/RootBrowser/FileUtils.h
index 8ea7bd5f6b3be9f3f51eb4f8c9dd5ba51beaf4d3..eafb6eeb1062463bdc4369a90c9c778d53f3c255 100644
--- a/test/ios/RootBrowser/FileUtils.h
+++ b/test/ios/RootBrowser/FileUtils.h
@@ -14,12 +14,8 @@
#include <string>
#include <set>
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TDirectoryFile;
diff --git a/test/stressTMVA.cxx b/test/stressTMVA.cxx
index 23f522cb8fb5b61576c7aa9cb88c1d42d637ed9e..026d18ce475ed71836c2da44f4254bfef5c44a10 100644
--- a/test/stressTMVA.cxx
+++ b/test/stressTMVA.cxx
@@ -823,9 +823,7 @@ void utDataSet::testMethods()
#include <vector>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
diff --git a/tmva/pymva/inc/TMVA/MethodPyGTB.h b/tmva/pymva/inc/TMVA/MethodPyGTB.h
index 2cfcee233e530462f6309197aeef18a61cf0e76a..89df42c22be6987c59512332600cd2d3e61db037 100644
--- a/tmva/pymva/inc/TMVA/MethodPyGTB.h
+++ b/tmva/pymva/inc/TMVA/MethodPyGTB.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_PyMethodBase
#include "TMVA/PyMethodBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/pymva/inc/TMVA/MethodPyRandomForest.h b/tmva/pymva/inc/TMVA/MethodPyRandomForest.h
index 9b75e2d07877c4c4dbb9ddcde33fe79e835f757b..ee8471dfa65cf369570bd03cde05492995410bae 100644
--- a/tmva/pymva/inc/TMVA/MethodPyRandomForest.h
+++ b/tmva/pymva/inc/TMVA/MethodPyRandomForest.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_PyMethodBase
#include "TMVA/PyMethodBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/rmva/inc/TMVA/MethodC50.h b/tmva/rmva/inc/TMVA/MethodC50.h
index f4b93ffb04de4f5965ebe47ff694639f4a6d302c..b6fb5a848e7a37044e587bd518e378c6878628bf 100644
--- a/tmva/rmva/inc/TMVA/MethodC50.h
+++ b/tmva/rmva/inc/TMVA/MethodC50.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_RMethodBase
#include "TMVA/RMethodBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/rmva/inc/TMVA/MethodRSNNS.h b/tmva/rmva/inc/TMVA/MethodRSNNS.h
index d8362ebfa107689491373e9f1975bf6aef7f3050..627947ff3ab83925dacb0ec8a6302eadfc600282 100644
--- a/tmva/rmva/inc/TMVA/MethodRSNNS.h
+++ b/tmva/rmva/inc/TMVA/MethodRSNNS.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_RMethodBase
#include "TMVA/RMethodBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/rmva/inc/TMVA/MethodRSVM.h b/tmva/rmva/inc/TMVA/MethodRSVM.h
index e0bb95fff9933fd00a145c2a6a48064ac4aa5b03..ea5377e9e88df40f45cf44a55ab1df3cb6d69274 100644
--- a/tmva/rmva/inc/TMVA/MethodRSVM.h
+++ b/tmva/rmva/inc/TMVA/MethodRSVM.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_RMethodBase
#include "TMVA/RMethodBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/rmva/inc/TMVA/MethodRXGB.h b/tmva/rmva/inc/TMVA/MethodRXGB.h
index 684ec9225011df1eae4e5adbb7a4dee3672a2b24..a27a7d56ad15668d2956e8f3d78189e528060c3f 100644
--- a/tmva/rmva/inc/TMVA/MethodRXGB.h
+++ b/tmva/rmva/inc/TMVA/MethodRXGB.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_RMethodBase
#include "TMVA/RMethodBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/rmva/inc/TMVA/RMethodBase.h b/tmva/rmva/inc/TMVA/RMethodBase.h
index c2a831d3d76a7dff68f9252b87267b6187a32f58..06eed27b95460c461dfbce54b038e29e023254d0 100644
--- a/tmva/rmva/inc/TMVA/RMethodBase.h
+++ b/tmva/rmva/inc/TMVA/RMethodBase.h
@@ -22,13 +22,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_R_TRInterface
-#include<TRInterface.h>
-#endif
+#include <TRInterface.h>
class TGraph;
class TTree;
diff --git a/tmva/tmva/inc/TMVA/BDTEventWrapper.h b/tmva/tmva/inc/TMVA/BDTEventWrapper.h
index 3905d5b7d6fddbb5d2421245c6b373bbd5313629..f05c306bca452b44ef18d32e96cb5cdac0a68dcb 100644
--- a/tmva/tmva/inc/TMVA/BDTEventWrapper.h
+++ b/tmva/tmva/inc/TMVA/BDTEventWrapper.h
@@ -23,9 +23,7 @@
#define ROOT_TMVA_BDTEventWrapper
#include "RtypesCore.h"
-#ifndef ROOT_Event
#include "Event.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/BinarySearchTree.h b/tmva/tmva/inc/TMVA/BinarySearchTree.h
index 724b1c1a7b4da86c7377a988b93aa7a45c2eb101..bfa1d8941adf7a02b3fa4d3bd5e45a0f65f87292 100644
--- a/tmva/tmva/inc/TMVA/BinarySearchTree.h
+++ b/tmva/tmva/inc/TMVA/BinarySearchTree.h
@@ -44,18 +44,10 @@
#include "time.h"
#endif
-#ifndef ROOT_TMVA_Volume
#include "TMVA/Volume.h"
-#endif
-#ifndef ROOT_TMVA_BinaryTree
#include "TMVA/BinaryTree.h"
-#endif
-#ifndef ROOT_TMVA_BinarySearchTreeNode
#include "TMVA/BinarySearchTreeNode.h"
-#endif
-#ifndef ROOT_TMVA_VariableInfo
#include "TMVA/VariableInfo.h"
-#endif
class TString;
class TTree;
diff --git a/tmva/tmva/inc/TMVA/BinarySearchTreeNode.h b/tmva/tmva/inc/TMVA/BinarySearchTreeNode.h
index 439253f4c59e79acdca37e08ac190cbad2de18d0..0f7c0c31e5f98a2c81f2ff85458b791534910313 100644
--- a/tmva/tmva/inc/TMVA/BinarySearchTreeNode.h
+++ b/tmva/tmva/inc/TMVA/BinarySearchTreeNode.h
@@ -39,13 +39,9 @@
#include <iosfwd>
#include <vector>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TMVA_Node
#include "TMVA/Node.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/BinaryTree.h b/tmva/tmva/inc/TMVA/BinaryTree.h
index 301066dbd17e7c177fe8691dc5eef831c8e80f75..390eaaf086b4bf1b6a0c1821f00dc49b0aef928a 100644
--- a/tmva/tmva/inc/TMVA/BinaryTree.h
+++ b/tmva/tmva/inc/TMVA/BinaryTree.h
@@ -30,9 +30,7 @@
#ifndef ROOT_TMVA_BinaryTree
#define ROOT_TMVA_BinaryTree
-#ifndef ROOT_TMVA_Version
#include "TMVA/Version.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
@@ -43,13 +41,9 @@
//////////////////////////////////////////////////////////////////////////
#include <iosfwd>
-#ifndef ROOT_TROOT
#include "TROOT.h"
-#endif
-#ifndef ROOT_TMVA_Node
#include "TMVA/Node.h"
-#endif
// -----------------------------------------------------------------------------
diff --git a/tmva/tmva/inc/TMVA/CCPruner.h b/tmva/tmva/inc/TMVA/CCPruner.h
index d3ba1d1a38fcf49aa53a4bc31b509c598271422f..768a6559adf9a25a96ab4ad9f633a6749ec465a8 100644
--- a/tmva/tmva/inc/TMVA/CCPruner.h
+++ b/tmva/tmva/inc/TMVA/CCPruner.h
@@ -45,17 +45,13 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_DecisionTree
#include "TMVA/DecisionTree.h"
-#endif
/* #ifndef ROOT_TMVA_DecisionTreeNode */
/* #include "TMVA/DecisionTreeNode.h" */
/* #endif */
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
namespace TMVA {
class DataSet;
diff --git a/tmva/tmva/inc/TMVA/CCTreeWrapper.h b/tmva/tmva/inc/TMVA/CCTreeWrapper.h
index 2d0351a5e05d4749202ab179ec652fa3d7f7e3a9..9861f9223874ba4a850bd7c72ed157fc2782c81c 100644
--- a/tmva/tmva/inc/TMVA/CCTreeWrapper.h
+++ b/tmva/tmva/inc/TMVA/CCTreeWrapper.h
@@ -24,21 +24,11 @@
#ifndef ROOT_TMVA_CCTreeWrapper
#define ROOT_TMVA_CCTreeWrapper
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_SeparationBase
#include "TMVA/SeparationBase.h"
-#endif
-#ifndef ROOT_TMVA_DecisionTree
#include "TMVA/DecisionTree.h"
-#endif
-#ifndef ROOT_TMVA_DataSet
#include "TMVA/DataSet.h"
-#endif
-#ifndef ROOT_TMVA_Version
#include "TMVA/Version.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/ClassInfo.h b/tmva/tmva/inc/TMVA/ClassInfo.h
index 07970fd37286be9c3a83a6c35636ebb62981e994..7d65a6646ad8107c6e91eaf8218fc30f020317bc 100644
--- a/tmva/tmva/inc/TMVA/ClassInfo.h
+++ b/tmva/tmva/inc/TMVA/ClassInfo.h
@@ -37,18 +37,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TCut
#include "TCut.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/ClassifierFactory.h b/tmva/tmva/inc/TMVA/ClassifierFactory.h
index ff5fb01d7567d62037e0c43d7fa1d776ea0f268e..a3a5ba82953798b460a8f45359d4692c6f8747ef 100644
--- a/tmva/tmva/inc/TMVA/ClassifierFactory.h
+++ b/tmva/tmva/inc/TMVA/ClassifierFactory.h
@@ -44,9 +44,7 @@
#include <vector>
// Local
-#ifndef ROOT_TString
#include "TString.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/Config.h b/tmva/tmva/inc/TMVA/Config.h
index b8cc04182459905dacb43abebd8416ee53a7596d..48734c8a156c5b0444f92de3d0ab442568f54dd8 100644
--- a/tmva/tmva/inc/TMVA/Config.h
+++ b/tmva/tmva/inc/TMVA/Config.h
@@ -39,12 +39,8 @@
#if __cplusplus > 199711L
#include <atomic>
#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/Configurable.h b/tmva/tmva/inc/TMVA/Configurable.h
index c6174d8e09d00d2c152b912b0f8b0469baa09b94..ea53faa4c0aa76709ee28c79d1d24f1de35863ce 100644
--- a/tmva/tmva/inc/TMVA/Configurable.h
+++ b/tmva/tmva/inc/TMVA/Configurable.h
@@ -35,16 +35,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TMVA_Option
#include "TMVA/Option.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/ConvergenceTest.h b/tmva/tmva/inc/TMVA/ConvergenceTest.h
index d0e9bbbcaaa9db87df4663c99bbec43a1691ce15..c70c56e5da5b0a2e337de4b9f207edb2c6ae708c 100644
--- a/tmva/tmva/inc/TMVA/ConvergenceTest.h
+++ b/tmva/tmva/inc/TMVA/ConvergenceTest.h
@@ -39,9 +39,7 @@
#include <deque>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/CostComplexityPruneTool.h b/tmva/tmva/inc/TMVA/CostComplexityPruneTool.h
index 98017850ece991ee2f9bbf7437739df16f8a65a4..5e764940eaaf220f2c002a2f9469b967fcb5d31c 100644
--- a/tmva/tmva/inc/TMVA/CostComplexityPruneTool.h
+++ b/tmva/tmva/inc/TMVA/CostComplexityPruneTool.h
@@ -50,21 +50,11 @@
// subtree, defined to be the subtree with the best quality index for the validation sample. //
////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_SeparationBase
#include "TMVA/SeparationBase.h"
-#endif
-#ifndef ROOT_TMVA_GiniIndex
#include "TMVA/GiniIndex.h"
-#endif
-#ifndef ROOT_TMVA_DecisionTree
#include "TMVA/DecisionTree.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_IPruneTool
#include "TMVA/IPruneTool.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/CrossEntropy.h b/tmva/tmva/inc/TMVA/CrossEntropy.h
index b650717e632f6af2a25682966db8489034b71e7f..b154fd4361f57a94e08907fb6f98094ec9c922f0 100644
--- a/tmva/tmva/inc/TMVA/CrossEntropy.h
+++ b/tmva/tmva/inc/TMVA/CrossEntropy.h
@@ -36,9 +36,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_SeparationBase
#include "TMVA/SeparationBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/CrossValidation.h b/tmva/tmva/inc/TMVA/CrossValidation.h
index 093bf324dcf35c1b8f5197ae5f8054722d23d07b..0bc37c1b1db7ea72951147a6aa4ce6d102f5c17c 100644
--- a/tmva/tmva/inc/TMVA/CrossValidation.h
+++ b/tmva/tmva/inc/TMVA/CrossValidation.h
@@ -4,53 +4,29 @@
#ifndef ROOT_TMVA_CrossValidation
#define ROOT_TMVA_CrossValidation
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMultiGraph
#include "TMultiGraph.h"
-#endif
-#ifndef ROOT_TMVA_IMethod
#include "TMVA/IMethod.h"
-#endif
-#ifndef ROOT_TMVA_Configurable
#include "TMVA/Configurable.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_DataSet
#include "TMVA/DataSet.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_Results
#include <TMVA/Results.h>
-#endif
-#ifndef ROOT_TMVA_Factory
#include <TMVA/Factory.h>
-#endif
-#ifndef ROOT_TMVA_DataLoader
#include <TMVA/DataLoader.h>
-#endif
-#ifndef ROOT_TMVA_OptionMap
#include <TMVA/OptionMap.h>
-#endif
-#ifndef ROOT_TMVA_Envelope
#include <TMVA/Envelope.h>
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/DataInputHandler.h b/tmva/tmva/inc/TMVA/DataInputHandler.h
index e0dea901daf49126202c16ac81055d5f834892b4..cc0f77bb70962ffef384c1f314859bd2dbf3dcf1 100644
--- a/tmva/tmva/inc/TMVA/DataInputHandler.h
+++ b/tmva/tmva/inc/TMVA/DataInputHandler.h
@@ -41,16 +41,10 @@
#include <string>
#include <fstream>
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TCut
#include "TCut.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/DataLoader.h b/tmva/tmva/inc/TMVA/DataLoader.h
index 2c881ccd8fa8852f0ddc55cf43c8f615179d5683..a980e7e3c58dbe6ff59787c46d82841e97d5ff4d 100644
--- a/tmva/tmva/inc/TMVA/DataLoader.h
+++ b/tmva/tmva/inc/TMVA/DataLoader.h
@@ -32,19 +32,11 @@
#include <string>
#include <vector>
#include <map>
-#ifndef ROOT_TCut
#include "TCut.h"
-#endif
-#ifndef ROOT_TMVA_Factory
#include "TMVA/Factory.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_DataSet
#include "TMVA/DataSet.h"
-#endif
class TFile;
class TTree;
diff --git a/tmva/tmva/inc/TMVA/DataSet.h b/tmva/tmva/inc/TMVA/DataSet.h
index 4b8fe877207e142c73a87a4a10b18bc992bf8e00..f0acdd2e9ef546e2ea860d61269c467eac7da3fb 100644
--- a/tmva/tmva/inc/TMVA/DataSet.h
+++ b/tmva/tmva/inc/TMVA/DataSet.h
@@ -41,18 +41,10 @@
#include <map>
#include <string>
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
//#ifndef ROOT_TCut
//#include "TCut.h"
//#endif
@@ -62,16 +54,10 @@
//#ifndef ROOT_TPrincipal
//#include "TPrincipal.h"
//#endif
-#ifndef ROOT_TRandom3
#include "TRandom3.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_VariableInfo
#include "TMVA/VariableInfo.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/DataSetFactory.h b/tmva/tmva/inc/TMVA/DataSetFactory.h
index e139aa73af5e74d55abda9db7c20a39d6ecb48de..20525272ae9e655e787b7bb3c1d006a1013b2e19 100644
--- a/tmva/tmva/inc/TMVA/DataSetFactory.h
+++ b/tmva/tmva/inc/TMVA/DataSetFactory.h
@@ -40,37 +40,17 @@
#include <vector>
#include <stdlib.h>
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TCut
#include "TCut.h"
-#endif
-#ifndef ROOT_TTreeFormula
#include "TTreeFormula.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TPrincipal
#include "TPrincipal.h"
-#endif
-#ifndef ROOT_TRandom3
#include "TRandom3.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_VariableInfo
#include "TMVA/VariableInfo.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/DataSetInfo.h b/tmva/tmva/inc/TMVA/DataSetInfo.h
index 8977b86fdab0720169b4bad79aadf1eb0b4d1785..9ceaa37240702e8684f6b7c737427ec932220a1d 100644
--- a/tmva/tmva/inc/TMVA/DataSetInfo.h
+++ b/tmva/tmva/inc/TMVA/DataSetInfo.h
@@ -37,34 +37,16 @@
#include <iosfwd>
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TCut
#include "TCut.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_VariableInfo
#include "TMVA/VariableInfo.h"
-#endif
-#ifndef ROOT_TMVA_ClassInfo
#include "TMVA/ClassInfo.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
class TH2;
diff --git a/tmva/tmva/inc/TMVA/DataSetManager.h b/tmva/tmva/inc/TMVA/DataSetManager.h
index 4f60d86b0923e6fcac367023aaaacdc743d862bd..f25dbd79f260456d583d1ac5cadbf179c279f53e 100644
--- a/tmva/tmva/inc/TMVA/DataSetManager.h
+++ b/tmva/tmva/inc/TMVA/DataSetManager.h
@@ -36,12 +36,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/DecisionTree.h b/tmva/tmva/inc/TMVA/DecisionTree.h
index 04b4df5a3e3e44181dc97605853eb98b01d21cfe..548e484abb1b4d0f62750e13d05d05563c2b9bc0 100644
--- a/tmva/tmva/inc/TMVA/DecisionTree.h
+++ b/tmva/tmva/inc/TMVA/DecisionTree.h
@@ -40,28 +40,14 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_DecisionTreeNode
#include "TMVA/DecisionTreeNode.h"
-#endif
-#ifndef ROOT_TMVA_BinaryTree
#include "TMVA/BinaryTree.h"
-#endif
-#ifndef ROOT_TMVA_BinarySearchTree
#include "TMVA/BinarySearchTree.h"
-#endif
-#ifndef ROOT_TMVA_SeparationBase
#include "TMVA/SeparationBase.h"
-#endif
-#ifndef ROOT_TMVA_RegressionVariance
#include "TMVA/RegressionVariance.h"
-#endif
#include "TMVA/DataSetInfo.h"
class TRandom3;
diff --git a/tmva/tmva/inc/TMVA/DecisionTreeNode.h b/tmva/tmva/inc/TMVA/DecisionTreeNode.h
index 63f5a53d0a90c8f1681382d6a4d5af02cdb6cd7f..899547eb0fffa79b3b1caeb4b45a07c63d259da5 100644
--- a/tmva/tmva/inc/TMVA/DecisionTreeNode.h
+++ b/tmva/tmva/inc/TMVA/DecisionTreeNode.h
@@ -38,13 +38,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_Node
#include "TMVA/Node.h"
-#endif
-#ifndef ROOT_TMVA_Version
#include "TMVA/Version.h"
-#endif
#include <iostream>
#include <vector>
diff --git a/tmva/tmva/inc/TMVA/Envelope.h b/tmva/tmva/inc/TMVA/Envelope.h
index ae6f663316e19eeeba3a5d7027a5c85c93d6ee8a..5e9876dd239d0fe9ad90e99dc0e0063fe4c43787 100644
--- a/tmva/tmva/inc/TMVA/Envelope.h
+++ b/tmva/tmva/inc/TMVA/Envelope.h
@@ -15,29 +15,17 @@
#include<iostream>
#include <memory>
-#ifndef ROOT_TROOT
-#include<TROOT.h>
-#endif
+#include <TROOT.h>
-#ifndef ROOT_TStopwatch
-#include<TStopwatch.h>
-#endif
+#include <TStopwatch.h>
-#ifndef ROOT_TMVA_OptionMap
-#include<TMVA/OptionMap.h>
-#endif
+#include <TMVA/OptionMap.h>
-#ifndef ROOT_TMVA_Config
#include "TMVA/Config.h"
-#endif
-#ifndef ROOT_TMVA_Tools
#include "TMVA/Tools.h"
-#endif
-#ifndef ROOT_TMVA_DataLoader
#include "TMVA/DataLoader.h"
-#endif
#ifndef ROOT_TMVA_ROCCurve
#include "TMVA/DataLoader.h"
diff --git a/tmva/tmva/inc/TMVA/Event.h b/tmva/tmva/inc/TMVA/Event.h
index 544e1ee376bf3993ac4a477989da2bb1ddfa4871..2b5bd78bcce796a9b1187ad6d4e14b5e8f081863 100644
--- a/tmva/tmva/inc/TMVA/Event.h
+++ b/tmva/tmva/inc/TMVA/Event.h
@@ -34,19 +34,11 @@
#include <iosfwd>
#include <vector>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_ThreadLocalStorage
#include "ThreadLocalStorage.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TCut;
diff --git a/tmva/tmva/inc/TMVA/ExpectedErrorPruneTool.h b/tmva/tmva/inc/TMVA/ExpectedErrorPruneTool.h
index 754182f912c9426c1051aea1121a2b8a40b6c2b2..baa333f0a17ec1ec9a4cbc54920889bd66246ffb 100644
--- a/tmva/tmva/inc/TMVA/ExpectedErrorPruneTool.h
+++ b/tmva/tmva/inc/TMVA/ExpectedErrorPruneTool.h
@@ -44,13 +44,9 @@
#include <vector>
#include <map>
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
-#ifndef ROOT_TMVA_IPruneTool
#include "TMVA/IPruneTool.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/Factory.h b/tmva/tmva/inc/TMVA/Factory.h
index 4da425a532f26c0daffc6ee97c47cac59d896a76..4bf2d846bc33913219937f9b3f98e29f74854ed8 100644
--- a/tmva/tmva/inc/TMVA/Factory.h
+++ b/tmva/tmva/inc/TMVA/Factory.h
@@ -53,19 +53,11 @@
#include <string>
#include <vector>
#include <map>
-#ifndef ROOT_TCut
#include "TCut.h"
-#endif
-#ifndef ROOT_TMVA_Configurable
#include "TMVA/Configurable.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_DataSet
#include "TMVA/DataSet.h"
-#endif
class TFile;
class TTree;
diff --git a/tmva/tmva/inc/TMVA/FitterBase.h b/tmva/tmva/inc/TMVA/FitterBase.h
index 1b7e967fe3f81733fa5bf3278f4c16f7213403ba..be7525e007f32d5a0b702c04a3df04febfc8288f 100644
--- a/tmva/tmva/inc/TMVA/FitterBase.h
+++ b/tmva/tmva/inc/TMVA/FitterBase.h
@@ -37,16 +37,10 @@
//////////////////////////////////////////////////////////////////////////
#include<vector>
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_Configurable
#include "TMVA/Configurable.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/GeneticAlgorithm.h b/tmva/tmva/inc/TMVA/GeneticAlgorithm.h
index 8c4f597b1c5be969da98bf709a84e941726de508..17a0cd51cee342af4d4cdaf40f87f0baf1711523 100644
--- a/tmva/tmva/inc/TMVA/GeneticAlgorithm.h
+++ b/tmva/tmva/inc/TMVA/GeneticAlgorithm.h
@@ -37,15 +37,9 @@
#include <deque>
#include <iosfwd>
-#ifndef ROOT_TMVA_IFitterTarget
#include "TMVA/IFitterTarget.h"
-#endif
-#ifndef ROOT_TMVA_GeneticPopulation
#include "TMVA/GeneticPopulation.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/GeneticFitter.h b/tmva/tmva/inc/TMVA/GeneticFitter.h
index 991023a90c18541f15611de50f8506c79bf4890c..599269ecc0487fe064d947dec287ae65d0092a66 100644
--- a/tmva/tmva/inc/TMVA/GeneticFitter.h
+++ b/tmva/tmva/inc/TMVA/GeneticFitter.h
@@ -33,9 +33,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_FitterBase
#include "TMVA/FitterBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/GeneticGenes.h b/tmva/tmva/inc/TMVA/GeneticGenes.h
index ffac2ffc13aebd66c32ca43ef3cceca7752e1f0d..52079d5e0a191879c59de30f03cf33826d36d076 100644
--- a/tmva/tmva/inc/TMVA/GeneticGenes.h
+++ b/tmva/tmva/inc/TMVA/GeneticGenes.h
@@ -33,9 +33,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <vector>
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/GeneticPopulation.h b/tmva/tmva/inc/TMVA/GeneticPopulation.h
index 3032866818d96f4fc701edf8657e3ccc30cd020c..4185c74d5543f2854828252a125148c9226eb130 100644
--- a/tmva/tmva/inc/TMVA/GeneticPopulation.h
+++ b/tmva/tmva/inc/TMVA/GeneticPopulation.h
@@ -36,15 +36,9 @@
#include <string>
#include <vector>
-#ifndef ROOT_TMVA_GeneticGenes
#include "TMVA/GeneticGenes.h"
-#endif
-#ifndef ROOT_TMVA_Interval
#include "TMVA/Interval.h"
-#endif
-#ifndef ROOT_TMVA_GeneticRange
#include "TMVA/GeneticRange.h"
-#endif
class TH1F;
diff --git a/tmva/tmva/inc/TMVA/GeneticRange.h b/tmva/tmva/inc/TMVA/GeneticRange.h
index 1a92569cedcbd640752be6802fe632bad85e507c..7882209747dc1aa09299596a503b9da2ebbc04ab 100644
--- a/tmva/tmva/inc/TMVA/GeneticRange.h
+++ b/tmva/tmva/inc/TMVA/GeneticRange.h
@@ -33,9 +33,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_Interval
#include "TMVA/Interval.h"
-#endif
class TRandom3;
diff --git a/tmva/tmva/inc/TMVA/GiniIndex.h b/tmva/tmva/inc/TMVA/GiniIndex.h
index 314fc5132f0c401f74005bb6e0cd9dedbd480119..5e044d2c0dcf98cecb318a9cacb497d914a253c2 100644
--- a/tmva/tmva/inc/TMVA/GiniIndex.h
+++ b/tmva/tmva/inc/TMVA/GiniIndex.h
@@ -56,9 +56,7 @@
// Gini(Sample) = 2s*b/(s+b)^2 //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_SeparationBase
#include "TMVA/SeparationBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/GiniIndexWithLaplace.h b/tmva/tmva/inc/TMVA/GiniIndexWithLaplace.h
index cec0b8170afffab2199cdf06f273d92dae7eb7cc..acf559f1a040102a912fcbb9f77164a5739fd7e4 100644
--- a/tmva/tmva/inc/TMVA/GiniIndexWithLaplace.h
+++ b/tmva/tmva/inc/TMVA/GiniIndexWithLaplace.h
@@ -52,9 +52,7 @@
// GiniLaplace(Sample) = 2(s*b+s+b+1)/(s+b+2)^2 //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_SeparationBase
#include "TMVA/SeparationBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/HyperParameterOptimisation.h b/tmva/tmva/inc/TMVA/HyperParameterOptimisation.h
index 956393ba79f1da00241ca45f657789b2a143a81c..69a1772bdf1cb647d9796386318c3a24ce3006dd 100644
--- a/tmva/tmva/inc/TMVA/HyperParameterOptimisation.h
+++ b/tmva/tmva/inc/TMVA/HyperParameterOptimisation.h
@@ -6,44 +6,22 @@
#define ROOT_TMVA_HyperParameterOptimisation
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMultiGraph
#include "TMultiGraph.h"
-#endif
-#ifndef ROOT_TMVA_IMethod
#include "TMVA/IMethod.h"
-#endif
-#ifndef ROOT_TMVA_Configurable
#include "TMVA/Configurable.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_DataSet
#include "TMVA/DataSet.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_Results
-#include<TMVA/Results.h>
-#endif
+#include <TMVA/Results.h>
-#ifndef ROOT_TMVA_Factory
-#include<TMVA/Factory.h>
-#endif
+#include <TMVA/Factory.h>
-#ifndef ROOT_TMVA_DataLoader
-#include<TMVA/DataLoader.h>
-#endif
+#include <TMVA/DataLoader.h>
-#ifndef ROOT_TMVA_Envelope
-#include<TMVA/Envelope.h>
-#endif
+#include <TMVA/Envelope.h>
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/IFitterTarget.h b/tmva/tmva/inc/TMVA/IFitterTarget.h
index 8b74c14a075a6708d400e65748eb9021bf6c9f20..3b1076a611f70af2b8f8fa1998320ba6b0827de9 100644
--- a/tmva/tmva/inc/TMVA/IFitterTarget.h
+++ b/tmva/tmva/inc/TMVA/IFitterTarget.h
@@ -36,9 +36,7 @@
#include <vector>
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/IMethod.h b/tmva/tmva/inc/TMVA/IMethod.h
index f64ffc83726a0a719477a0ab6571784175eff73a..61e3812d7f099edc662de22e23b8aeadd541b0ce 100644
--- a/tmva/tmva/inc/TMVA/IMethod.h
+++ b/tmva/tmva/inc/TMVA/IMethod.h
@@ -38,19 +38,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#include <iosfwd>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
class TString;
diff --git a/tmva/tmva/inc/TMVA/IPruneTool.h b/tmva/tmva/inc/TMVA/IPruneTool.h
index e0e7219e77a449935cddb7099a5739803fb31135..d02ee62f2a254590e7afc532532efc8a3a5d68e6 100644
--- a/tmva/tmva/inc/TMVA/IPruneTool.h
+++ b/tmva/tmva/inc/TMVA/IPruneTool.h
@@ -25,13 +25,9 @@
#include <iosfwd>
#include <vector>
-#ifndef ROOT_TMVA_SeparationBase
#include "TMVA/SeparationBase.h"
-#endif
-#ifndef ROOT_TMVA_DecisionTree
#include "TMVA/DecisionTree.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/Interval.h b/tmva/tmva/inc/TMVA/Interval.h
index 81c940c50bc0870ae46f4792c554b6084d82ffdf..00077e7a7455be9ca293409b5982192e89481b7d 100644
--- a/tmva/tmva/inc/TMVA/Interval.h
+++ b/tmva/tmva/inc/TMVA/Interval.h
@@ -50,9 +50,7 @@
// //
// //
//////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TRandom3;
diff --git a/tmva/tmva/inc/TMVA/KDEKernel.h b/tmva/tmva/inc/TMVA/KDEKernel.h
index 5eb8ee5ac842389150378ec8a8c3fcccd9974694..722f9f6c2b5064c5e4de7f546cb7fa43dd0a4209 100644
--- a/tmva/tmva/inc/TMVA/KDEKernel.h
+++ b/tmva/tmva/inc/TMVA/KDEKernel.h
@@ -37,9 +37,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TH1;
class TH1F;
diff --git a/tmva/tmva/inc/TMVA/LDA.h b/tmva/tmva/inc/TMVA/LDA.h
index c7e924742bf0f5edbd343c964f9e878430e9a4a9..3499ceaad92550dbc38e0806c47300818e59feb4 100644
--- a/tmva/tmva/inc/TMVA/LDA.h
+++ b/tmva/tmva/inc/TMVA/LDA.h
@@ -32,12 +32,8 @@
#include <vector>
// ROOT
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TMatrixFfwd
#include "TMatrixFfwd.h"
-#endif
typedef std::vector<std::vector<Float_t> > LDAEvents;
diff --git a/tmva/tmva/inc/TMVA/LogInterval.h b/tmva/tmva/inc/TMVA/LogInterval.h
index a8d9119301765046ba87d52304a4fc9e21702065..9cd41259c2ffb94d7fff5f699578e0b4ebba8f5f 100644
--- a/tmva/tmva/inc/TMVA/LogInterval.h
+++ b/tmva/tmva/inc/TMVA/LogInterval.h
@@ -68,13 +68,9 @@
// i=10 --> 1024 //
// //
//////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef TMVA_Interval
#include "Interval.h"
-#endif
diff --git a/tmva/tmva/inc/TMVA/LossFunction.h b/tmva/tmva/inc/TMVA/LossFunction.h
index 3ccbf697592ecf08cd47199b0aaf25f88593733e..71604115325b74eff8cc963a869ad2f070a33dbf 100644
--- a/tmva/tmva/inc/TMVA/LossFunction.h
+++ b/tmva/tmva/inc/TMVA/LossFunction.h
@@ -35,9 +35,7 @@
#include <vector>
#include <map>
#include "TMVA/Event.h"
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MCFitter.h b/tmva/tmva/inc/TMVA/MCFitter.h
index 755e56e8f91b2df57df74dd18493393cf4f814fe..381e872a4af3e2f3ec3613ae1b7bada6064e7c6b 100644
--- a/tmva/tmva/inc/TMVA/MCFitter.h
+++ b/tmva/tmva/inc/TMVA/MCFitter.h
@@ -36,9 +36,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_FitterBase
#include "TMVA/FitterBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MethodANNBase.h b/tmva/tmva/inc/TMVA/MethodANNBase.h
index 06b2b8ab85b63a38486869970df1e058e1d57187..f0cae60684d4d53ebb92c9922aaa786d48522e83 100644
--- a/tmva/tmva/inc/TMVA/MethodANNBase.h
+++ b/tmva/tmva/inc/TMVA/MethodANNBase.h
@@ -42,35 +42,17 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
#include <vector>
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TRandom3
#include "TRandom3.h"
-#endif
-#ifndef ROOT_TMatrix
#include "TMatrix.h"
-#endif
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_TActivation
#include "TMVA/TActivation.h"
-#endif
-#ifndef ROOT_TMVA_TNeuron
#include "TMVA/TNeuron.h"
-#endif
-#ifndef ROOT_TMVA_TNeuronInput
#include "TMVA/TNeuronInput.h"
-#endif
class TH1;
class TH1F;
diff --git a/tmva/tmva/inc/TMVA/MethodBDT.h b/tmva/tmva/inc/TMVA/MethodBDT.h
index 17f4bd1d719fb35279050a09b6e1df163713ffcc..468051500a5e471218e16fab0fe8a377cc288ab8 100644
--- a/tmva/tmva/inc/TMVA/MethodBDT.h
+++ b/tmva/tmva/inc/TMVA/MethodBDT.h
@@ -40,21 +40,11 @@
//////////////////////////////////////////////////////////////////////////
#include <vector>
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_DecisionTree
#include "TMVA/DecisionTree.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
#include "TMVA/LossFunction.h"
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MethodBase.h b/tmva/tmva/inc/TMVA/MethodBase.h
index c7f9a99f2caacf482bb89e4ad2aa1e970a4e8dde..df55dd4c7f41629359c6c69f46424ae0e2403777 100644
--- a/tmva/tmva/inc/TMVA/MethodBase.h
+++ b/tmva/tmva/inc/TMVA/MethodBase.h
@@ -46,35 +46,17 @@
#include <map>
#include "assert.h"
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_IMethod
#include "TMVA/IMethod.h"
-#endif
-#ifndef ROOT_TMVA_Configurable
#include "TMVA/Configurable.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_DataSet
#include "TMVA/DataSet.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_TransformationHandler
#include "TMVA/TransformationHandler.h"
-#endif
-#ifndef ROOT_TMVA_Results
-#include<TMVA/Results.h>
-#endif
+#include <TMVA/Results.h>
-#ifndef ROOT_TFile
-#include<TFile.h>
-#endif
+#include <TFile.h>
class TGraph;
class TTree;
diff --git a/tmva/tmva/inc/TMVA/MethodBayesClassifier.h b/tmva/tmva/inc/TMVA/MethodBayesClassifier.h
index 4ac57210ac11158add5367c800ea29bac485a3f6..267b5b3926bbe5afb472b886e6f7caa03111ad10 100644
--- a/tmva/tmva/inc/TMVA/MethodBayesClassifier.h
+++ b/tmva/tmva/inc/TMVA/MethodBayesClassifier.h
@@ -36,12 +36,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MethodBoost.h b/tmva/tmva/inc/TMVA/MethodBoost.h
index 35d001d5870b23536223efab9042fb1c102d1b0b..4b51e80f3585433cf03e2a7ab05bceb8258385a5 100644
--- a/tmva/tmva/inc/TMVA/MethodBoost.h
+++ b/tmva/tmva/inc/TMVA/MethodBoost.h
@@ -43,13 +43,9 @@
#include <iosfwd>
#include <vector>
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_MethodCompositeBase
#include "TMVA/MethodCompositeBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MethodCFMlpANN.h b/tmva/tmva/inc/TMVA/MethodCFMlpANN.h
index 4deeb926141a5b65e73a7172f678c0dd9d38d921..bea3bdfce27bafc3ed69b5be77102be27901874b 100644
--- a/tmva/tmva/inc/TMVA/MethodCFMlpANN.h
+++ b/tmva/tmva/inc/TMVA/MethodCFMlpANN.h
@@ -85,15 +85,9 @@
#include <iosfwd>
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_MethodCFMlpANN_Utils
#include "TMVA/MethodCFMlpANN_Utils.h"
-#endif
-#ifndef ROOT_TMatrixF
#include "TMatrixF.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MethodCFMlpANN_Utils.h b/tmva/tmva/inc/TMVA/MethodCFMlpANN_Utils.h
index cc4109745fdfa98504516ce9c88621fc4c0e913e..745437f9e62667a4f2fa8e432239cd9b3a94b51d 100644
--- a/tmva/tmva/inc/TMVA/MethodCFMlpANN_Utils.h
+++ b/tmva/tmva/inc/TMVA/MethodCFMlpANN_Utils.h
@@ -35,16 +35,10 @@
#ifndef ROOT_TMVA_MethodCFMlpANN_Utils
#define ROOT_TMVA_MethodCFMlpANN_Utils
-#ifndef ROOT_TMVA_MethodCFMlpANN_def
#include "TMVA/MethodCFMlpANN_def.h"
-#endif
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <cstdlib>
//////////////////////////////////////////////////////////////////////////
diff --git a/tmva/tmva/inc/TMVA/MethodCategory.h b/tmva/tmva/inc/TMVA/MethodCategory.h
index 7c510dd33aded1a1175e9e52aa2408f3b8547c58..97c7533340aa6c06fb7ba40c2317e180cfc4f6b2 100644
--- a/tmva/tmva/inc/TMVA/MethodCategory.h
+++ b/tmva/tmva/inc/TMVA/MethodCategory.h
@@ -42,13 +42,9 @@
#include <iosfwd>
#include <vector>
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_MethodCompositeBase
#include "TMVA/MethodCompositeBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MethodCompositeBase.h b/tmva/tmva/inc/TMVA/MethodCompositeBase.h
index 7d792a443bfea0bab0972ed48b15038471b0d93b..11ae4cc9b9f6b2d242b5ba7c8672dc437d6453b5 100644
--- a/tmva/tmva/inc/TMVA/MethodCompositeBase.h
+++ b/tmva/tmva/inc/TMVA/MethodCompositeBase.h
@@ -42,9 +42,7 @@
#include <iosfwd>
#include <vector>
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
namespace TMVA {
class IMethod;
diff --git a/tmva/tmva/inc/TMVA/MethodCuts.h b/tmva/tmva/inc/TMVA/MethodCuts.h
index 96cc192bbc3150a4e9fba933f54570ca387d6af1..dc053f4db4bda8240ebedc9dd757bf762e4e96b3 100644
--- a/tmva/tmva/inc/TMVA/MethodCuts.h
+++ b/tmva/tmva/inc/TMVA/MethodCuts.h
@@ -46,25 +46,11 @@
#include <vector>
#include <map>
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_BinarySearchTree
#include "TMVA/BinarySearchTree.h"
-#endif
-#ifndef ROOT_TMVA_PDF
#include "TMVA/PDF.h"
-#endif
-#ifndef ROOT_TMVA_TMatrixDfwd
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#endif
-#ifndef ROOT_TMVA_IFitterTarget
-#ifndef ROOT_IFitterTarget
#include "IFitterTarget.h"
-#endif
-#endif
class TRandom;
diff --git a/tmva/tmva/inc/TMVA/MethodDNN.h b/tmva/tmva/inc/TMVA/MethodDNN.h
index a0240d811b2b5bbe8697ceaf8dd8c22e29b471bd..806c2f3e5df571fafd32440195777d27a32b6614 100644
--- a/tmva/tmva/inc/TMVA/MethodDNN.h
+++ b/tmva/tmva/inc/TMVA/MethodDNN.h
@@ -39,24 +39,12 @@
//////////////////////////////////////////////////////////////////////////
#include <vector>
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TRandom3
#include "TRandom3.h"
-#endif
-#ifndef ROOT_TH1F
#include "TH1F.h"
-#endif
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef TMVA_NEURAL_NET
#include "TMVA/NeuralNet.h"
-#endif
#include "TMVA/Tools.h"
diff --git a/tmva/tmva/inc/TMVA/MethodDT.h b/tmva/tmva/inc/TMVA/MethodDT.h
index cf6f74709581881e3b6fefa6596df8dea8cb1d8d..d0fab2d1ed46b6a7f2b60b3ffc475ecbfdb38992 100644
--- a/tmva/tmva/inc/TMVA/MethodDT.h
+++ b/tmva/tmva/inc/TMVA/MethodDT.h
@@ -36,24 +36,12 @@
//////////////////////////////////////////////////////////////////////////
#include <vector>
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_DecisionTree
#include "TMVA/DecisionTree.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
namespace TMVA {
class MethodBoost;
diff --git a/tmva/tmva/inc/TMVA/MethodFDA.h b/tmva/tmva/inc/TMVA/MethodFDA.h
index f6ebb004c8e1a18390d5605faf1e7bfa39342ef7..e33915242efe32e1ccbf7182cf29120802fd1f1c 100644
--- a/tmva/tmva/inc/TMVA/MethodFDA.h
+++ b/tmva/tmva/inc/TMVA/MethodFDA.h
@@ -46,12 +46,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_IFitterTarget
#include "TMVA/IFitterTarget.h"
-#endif
class TFormula;
diff --git a/tmva/tmva/inc/TMVA/MethodFisher.h b/tmva/tmva/inc/TMVA/MethodFisher.h
index 085185f06b558d545b7cd166c840c5e308833441..da560e790c0f18311b35d44dd07d212b6c1e0f90 100644
--- a/tmva/tmva/inc/TMVA/MethodFisher.h
+++ b/tmva/tmva/inc/TMVA/MethodFisher.h
@@ -44,12 +44,8 @@
#include <vector>
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
class TH1D;
diff --git a/tmva/tmva/inc/TMVA/MethodHMatrix.h b/tmva/tmva/inc/TMVA/MethodHMatrix.h
index e15a4c25375cd05560d198f35da7ffa8d66a122c..930ae5bc0fb8b2fe47f3f84c53ef927ce4f46228 100644
--- a/tmva/tmva/inc/TMVA/MethodHMatrix.h
+++ b/tmva/tmva/inc/TMVA/MethodHMatrix.h
@@ -43,19 +43,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_TMatrixDfwd
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#endif
-#ifndef ROOT_TMVA_TVectorD
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MethodKNN.h b/tmva/tmva/inc/TMVA/MethodKNN.h
index edf093dd89be58cae319c95663379e4a2e855611..8d099fa262fb83347771b17210fd6ddcd604dd5e 100644
--- a/tmva/tmva/inc/TMVA/MethodKNN.h
+++ b/tmva/tmva/inc/TMVA/MethodKNN.h
@@ -38,17 +38,11 @@
#include <map>
// Local
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_ModulekNN
#include "TMVA/ModulekNN.h"
-#endif
// SVD and linear discriminant code
-#ifndef ROOT_TMVA_LDA
#include "TMVA/LDA.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/MethodLD.h b/tmva/tmva/inc/TMVA/MethodLD.h
index 960ef54f8cf746038f84f395bbd3c9bc11ffdae6..3c39578d1262e84e63e09a18ee4549c7e52cb1e0 100644
--- a/tmva/tmva/inc/TMVA/MethodLD.h
+++ b/tmva/tmva/inc/TMVA/MethodLD.h
@@ -42,12 +42,8 @@
#include <vector>
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MethodLikelihood.h b/tmva/tmva/inc/TMVA/MethodLikelihood.h
index 87303dcfbac938e88aa602370ee8499578110adf..0c21160f1c72a65e643aa6c7f9de40185c4f12a8 100644
--- a/tmva/tmva/inc/TMVA/MethodLikelihood.h
+++ b/tmva/tmva/inc/TMVA/MethodLikelihood.h
@@ -50,12 +50,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_PDF
#include "TMVA/PDF.h"
-#endif
class TH1D;
diff --git a/tmva/tmva/inc/TMVA/MethodMLP.h b/tmva/tmva/inc/TMVA/MethodMLP.h
index b8419ddc595f9d4840506f8f0a54e0c84f168499..00ed1a0f7735cd83ea9d99c34479a9cb45ff3259 100644
--- a/tmva/tmva/inc/TMVA/MethodMLP.h
+++ b/tmva/tmva/inc/TMVA/MethodMLP.h
@@ -47,43 +47,19 @@
//////////////////////////////////////////////////////////////////////////
#include <vector>
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TRandom3
#include "TRandom3.h"
-#endif
-#ifndef ROOT_TH1F
#include "TH1F.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TMVA_IFitterTarget
#include "TMVA/IFitterTarget.h"
-#endif
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_MethodANNBase
#include "TMVA/MethodANNBase.h"
-#endif
-#ifndef ROOT_TMVA_TNeuron
#include "TMVA/TNeuron.h"
-#endif
-#ifndef ROOT_TMVA_TActivation
#include "TMVA/TActivation.h"
-#endif
-#ifndef ROOT_TMVA_ConvergenceTest
#include "TMVA/ConvergenceTest.h"
-#endif
#define MethodMLP_UseMinuit__
#undef MethodMLP_UseMinuit__
diff --git a/tmva/tmva/inc/TMVA/MethodPDEFoam.h b/tmva/tmva/inc/TMVA/MethodPDEFoam.h
index c432ef524d175e2cfa1ded019c1895cbe4ec728e..f9b07e46de47db3f7f883537674fe1b7fe721aa6 100644
--- a/tmva/tmva/inc/TMVA/MethodPDEFoam.h
+++ b/tmva/tmva/inc/TMVA/MethodPDEFoam.h
@@ -41,58 +41,26 @@
// //
//////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoam
#include "TMVA/PDEFoam.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamDecisionTree
#include "TMVA/PDEFoamDecisionTree.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamEvent
#include "TMVA/PDEFoamEvent.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamDiscriminant
#include "TMVA/PDEFoamDiscriminant.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamTarget
#include "TMVA/PDEFoamTarget.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamMultiTarget
#include "TMVA/PDEFoamMultiTarget.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamDensityBase
#include "TMVA/PDEFoamDensityBase.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamTargetDensity
#include "TMVA/PDEFoamTargetDensity.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamEventDensity
#include "TMVA/PDEFoamEventDensity.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamDiscriminantDensity
#include "TMVA/PDEFoamDiscriminantDensity.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamDecisionTreeDensity
#include "TMVA/PDEFoamDecisionTreeDensity.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamKernelBase
#include "TMVA/PDEFoamKernelBase.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamKernelTrivial
#include "TMVA/PDEFoamKernelTrivial.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamKernelLinN
#include "TMVA/PDEFoamKernelLinN.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamKernelGauss
#include "TMVA/PDEFoamKernelGauss.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MethodPDERS.h b/tmva/tmva/inc/TMVA/MethodPDERS.h
index b0a7c7aea5bc14dbc5bc8e34e0aa61093ab8f2b7..b3c60af1889b696484b7727e410b93666e9217e6 100644
--- a/tmva/tmva/inc/TMVA/MethodPDERS.h
+++ b/tmva/tmva/inc/TMVA/MethodPDERS.h
@@ -47,17 +47,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_BinarySearchTree
#include "TMVA/BinarySearchTree.h"
-#endif
-#ifndef ROOT_TMVA_TVector
-#ifndef ROOT_TVector
#include "TVector.h"
-#endif
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MethodRuleFit.h b/tmva/tmva/inc/TMVA/MethodRuleFit.h
index fc610927a23aa431120bf12bf58658c492ec5a17..3676e394c2f17fa1a55f05ce19fad5793795ec5a 100644
--- a/tmva/tmva/inc/TMVA/MethodRuleFit.h
+++ b/tmva/tmva/inc/TMVA/MethodRuleFit.h
@@ -34,21 +34,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
-#ifndef ROOT_TMVA_DecisionTree
#include "TMVA/DecisionTree.h"
-#endif
-#ifndef ROOT_TMVA_RuleFit
#include "TMVA/RuleFit.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MethodSVM.h b/tmva/tmva/inc/TMVA/MethodSVM.h
index da9d072f9460565dc950098f28867b0051b6fb94..0579e85dbe20fba65ba7cf12131916e0b58b389f 100644
--- a/tmva/tmva/inc/TMVA/MethodSVM.h
+++ b/tmva/tmva/inc/TMVA/MethodSVM.h
@@ -41,22 +41,12 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_TMatrixD
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#endif
#ifndef ROOT_TMVA_TVectorD
-#ifndef ROOT_TVectorD
#include "TVectorD.h"
-#endif
-#ifndef ROOT_TMVA_SVKernelFunction
#include "TMVA/SVKernelFunction.h"
#endif
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/MethodTMlpANN.h b/tmva/tmva/inc/TMVA/MethodTMlpANN.h
index e0b69ec27a927ffe269607b7f6764425b37ab2b7..7c8cadba130fc3d3fc6f4abaaa5848257e990648 100644
--- a/tmva/tmva/inc/TMVA/MethodTMlpANN.h
+++ b/tmva/tmva/inc/TMVA/MethodTMlpANN.h
@@ -40,9 +40,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
class TMultiLayerPerceptron;
diff --git a/tmva/tmva/inc/TMVA/MinuitFitter.h b/tmva/tmva/inc/TMVA/MinuitFitter.h
index 5c922f4394fba5862fe1a07f165fd262ae0e8455..6f42234b72fdad3e74e2795020b5048f7c2396c8 100644
--- a/tmva/tmva/inc/TMVA/MinuitFitter.h
+++ b/tmva/tmva/inc/TMVA/MinuitFitter.h
@@ -33,12 +33,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_FitterBase
#include "TMVA/FitterBase.h"
-#endif
-#ifndef ROOT_TMVA_IFitterTarget
#include "TMVA/IFitterTarget.h"
-#endif
class TFitter;
diff --git a/tmva/tmva/inc/TMVA/MinuitWrapper.h b/tmva/tmva/inc/TMVA/MinuitWrapper.h
index 65c00c673d15291bc53845db1f3b49eea77d8f8a..fc57be36ffe6d767de1121e63237c2999c25ea69 100644
--- a/tmva/tmva/inc/TMVA/MinuitWrapper.h
+++ b/tmva/tmva/inc/TMVA/MinuitWrapper.h
@@ -33,12 +33,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMinuit
#include "TMinuit.h"
-#endif
-#ifndef ROOT_TMVA_IFitterTarget
#include "TMVA/IFitterTarget.h"
-#endif
class TMinuit;
diff --git a/tmva/tmva/inc/TMVA/MisClassificationError.h b/tmva/tmva/inc/TMVA/MisClassificationError.h
index d164f7f057659389f9329a3fed8f891c66461478..62807e8269e887f5b0ad27b71cf13956925df6ff 100644
--- a/tmva/tmva/inc/TMVA/MisClassificationError.h
+++ b/tmva/tmva/inc/TMVA/MisClassificationError.h
@@ -39,9 +39,7 @@
// criterion: 1-max(p, 1-p) //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_SeparationBase
#include "TMVA/SeparationBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/ModulekNN.h b/tmva/tmva/inc/TMVA/ModulekNN.h
index 5412185332aa80f4fc9008c082756a2db796e695..978dbb8a36cf2beb68f6562d291d9815d7353647 100644
--- a/tmva/tmva/inc/TMVA/ModulekNN.h
+++ b/tmva/tmva/inc/TMVA/ModulekNN.h
@@ -42,18 +42,10 @@
#include <vector>
// ROOT
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TRandom
#include "TRandom3.h"
-#endif
-#ifndef ROOT_ThreadLocalStorage
#include "ThreadLocalStorage.h"
-#endif
-#ifndef ROOT_TMVA_NodekNN
#include "TMVA/NodekNN.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/MsgLogger.h b/tmva/tmva/inc/TMVA/MsgLogger.h
index 65e7964d4480a70461b918ab1d3fb1c3008612ef..a2431060640217c90c00d1b4ef772b00637d470d 100644
--- a/tmva/tmva/inc/TMVA/MsgLogger.h
+++ b/tmva/tmva/inc/TMVA/MsgLogger.h
@@ -48,13 +48,9 @@
#endif
// ROOT include(s)
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
// Local include(s):
diff --git a/tmva/tmva/inc/TMVA/Node.h b/tmva/tmva/inc/TMVA/Node.h
index 9d40cd5f69475bbb942149d8b30677a24c24b70c..0c6768d4edd6ac80a6decba14aef3b56a2eff74a 100644
--- a/tmva/tmva/inc/TMVA/Node.h
+++ b/tmva/tmva/inc/TMVA/Node.h
@@ -37,13 +37,9 @@
//////////////////////////////////////////////////////////////////////////
#include <iosfwd>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TMVA_Version
#include "TMVA/Version.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/NodekNN.h b/tmva/tmva/inc/TMVA/NodekNN.h
index 333031c08edd8e2f292f4d1b6f78791a4fb9563d..b8b2a4ece2809a3b03e36ca7a5e305d393ffd572 100644
--- a/tmva/tmva/inc/TMVA/NodekNN.h
+++ b/tmva/tmva/inc/TMVA/NodekNN.h
@@ -33,9 +33,7 @@
#include <iostream>
// ROOT
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
/*! \class TMVA::kNN:Node
\ingroup TMVA
diff --git a/tmva/tmva/inc/TMVA/OptimizeConfigParameters.h b/tmva/tmva/inc/TMVA/OptimizeConfigParameters.h
index 4809597dc6264403ec13fa43a2cc4911e55207e3..57353e9187f01c88af467d9a802873ae7f554a57 100644
--- a/tmva/tmva/inc/TMVA/OptimizeConfigParameters.h
+++ b/tmva/tmva/inc/TMVA/OptimizeConfigParameters.h
@@ -25,36 +25,20 @@
#define ROOT_TMVA_OptimizeConfigParameters
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_Interval
#include "TMVA/Interval.h"
-#endif
-#ifndef ROOT_TMVA_DataSet
#include "TMVA/DataSet.h"
-#endif
-#ifndef ROOT_TMVA_IFitterTarget
-#ifndef ROOT_IFitterTarget
#include "IFitterTarget.h"
-#endif
-#endif
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/Option.h b/tmva/tmva/inc/TMVA/Option.h
index 5bd9b376da8d23651bea25d8b30ac7eb46a9d754..d1d0fe544d80015fb109915ebfc9bbb821b870d2 100644
--- a/tmva/tmva/inc/TMVA/Option.h
+++ b/tmva/tmva/inc/TMVA/Option.h
@@ -41,18 +41,10 @@
#include <sstream>
#include <vector>
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/OptionMap.h b/tmva/tmva/inc/TMVA/OptionMap.h
index c00683b9cabd3a964d7a8a96676e32bd02d156d9..0875b1ecc5578b055862feec177262a002d05119 100644
--- a/tmva/tmva/inc/TMVA/OptionMap.h
+++ b/tmva/tmva/inc/TMVA/OptionMap.h
@@ -15,21 +15,13 @@
#include<iostream>
#include<map>
-#ifndef ROOT_TNamed
-#include<TNamed.h>
-#endif
+#include <TNamed.h>
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
-#ifndef ROOT_TObjString
#include "TObjString.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/PDEFoam.h b/tmva/tmva/inc/TMVA/PDEFoam.h
index ea22ca0807b4253b21047b57f8276a042b9b7782..e081d6e4b9572f85460f2eeb9a65c059dc6f1bff 100644
--- a/tmva/tmva/inc/TMVA/PDEFoam.h
+++ b/tmva/tmva/inc/TMVA/PDEFoam.h
@@ -31,33 +31,15 @@
#include <iosfwd>
#include <cassert>
-#ifndef ROOT_TH2D
#include "TH2D.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TObjString
#include "TObjString.h"
-#endif
-#ifndef ROOT_TVectorT
#include "TVectorT.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_VariableInfo
#include "TMVA/VariableInfo.h"
-#endif
-#ifndef ROOT_TMVA_Timer
#include "TMVA/Timer.h"
-#endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TRandom3
#include "TRandom3.h"
-#endif
namespace TMVA {
class PDEFoamCell;
@@ -86,15 +68,9 @@ namespace TMVA {
kRms, kRmsOvMean, kCellVolume };
}
-#ifndef ROOT_TMVA_PDEFoamDensityBase
#include "TMVA/PDEFoamDensityBase.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamVect
#include "TMVA/PDEFoamVect.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamCell
#include "TMVA/PDEFoamCell.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/PDEFoamCell.h b/tmva/tmva/inc/TMVA/PDEFoamCell.h
index a0dd727749af180cdd0ba467d7ebb73add08f183..1938d6a24cd580549181cce1df84b5fdd63240e4 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamCell.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamCell.h
@@ -31,16 +31,10 @@
#ifndef ROOT_TMVA_PDEFoamCell
#define ROOT_TMVA_PDEFoamCell
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TRef
#include "TRef.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamVect
#include "TMVA/PDEFoamVect.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/PDEFoamDecisionTree.h b/tmva/tmva/inc/TMVA/PDEFoamDecisionTree.h
index b9d14810572b11d37e874da4ce73f507492c6e65..606caa4fce0161ffb4d2be81a6d9e103f2d4f6b2 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamDecisionTree.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamDecisionTree.h
@@ -30,12 +30,8 @@
#ifndef ROOT_TMVA_PDEFoamDecisionTree
#define ROOT_TMVA_PDEFoamDecisionTree
-#ifndef ROOT_TMVA_PDEFoamDiscriminant
#include "TMVA/PDEFoamDiscriminant.h"
-#endif
-#ifndef ROOT_TMVA_SeparationBase
#include "TMVA/SeparationBase.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamDecisionTreeDensity.h b/tmva/tmva/inc/TMVA/PDEFoamDecisionTreeDensity.h
index f6ab9b45c12cb05abb48086f889565af02ab1565..7b722c0544a1bf4ea5c07af4a213aac382441f47 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamDecisionTreeDensity.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamDecisionTreeDensity.h
@@ -34,16 +34,10 @@
#include <vector>
-#ifndef ROOT_TH2
#include "TH2.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamDensityBase
#include "TMVA/PDEFoamDensityBase.h"
-#endif
-#ifndef ROOT_TMVA_Volume
#include "TMVA/Volume.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamDensityBase.h b/tmva/tmva/inc/TMVA/PDEFoamDensityBase.h
index e962ce633c2d91e8c5cbace1967ef42ff4242b9e..b3601864886a652574b9255d7f2492484f9aa075 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamDensityBase.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamDensityBase.h
@@ -32,19 +32,11 @@
#ifndef ROOT_TMVA_PDEFoamDensityBase
#define ROOT_TMVA_PDEFoamDensityBase
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TMVA_BinarySearchTree
#include "TMVA/BinarySearchTree.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamDiscriminant.h b/tmva/tmva/inc/TMVA/PDEFoamDiscriminant.h
index 60847dc3f50c9b159900aa6eecb8d0162d28869c..e69f2023c78a170dcaf62fe896879820775219db 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamDiscriminant.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamDiscriminant.h
@@ -30,9 +30,7 @@
#ifndef ROOT_TMVA_PDEFoamDiscriminant
#define ROOT_TMVA_PDEFoamDiscriminant
-#ifndef ROOT_TMVA_PDEFoam
#include "TMVA/PDEFoam.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamDiscriminantDensity.h b/tmva/tmva/inc/TMVA/PDEFoamDiscriminantDensity.h
index 8438bddcff8da3a4b39ed1884d518cbcd0822e59..0cb0df1d7dcf99d721b869986e40a46b15b2ff7d 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamDiscriminantDensity.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamDiscriminantDensity.h
@@ -32,9 +32,7 @@
#ifndef ROOT_TMVA_PDEFoamDiscriminantDensity
#define ROOT_TMVA_PDEFoamDiscriminantDensity
-#ifndef ROOT_TMVA_PDEFoamDensityBase
#include "TMVA/PDEFoamDensityBase.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamEvent.h b/tmva/tmva/inc/TMVA/PDEFoamEvent.h
index f9b5f9dba251dbe949e2697df91c2f4eca601918..70538fecb49b3db7f70dfcb453300bae2e82e98b 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamEvent.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamEvent.h
@@ -30,9 +30,7 @@
#ifndef ROOT_TMVA_PDEFoamEvent
#define ROOT_TMVA_PDEFoamEvent
-#ifndef ROOT_TMVA_PDEFoam
#include "TMVA/PDEFoam.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamEventDensity.h b/tmva/tmva/inc/TMVA/PDEFoamEventDensity.h
index 6b20519237c88da23a320dfd88e19f88c43ad0cc..a97edf766766d29ca5b182b89cbe2e49683cf536 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamEventDensity.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamEventDensity.h
@@ -32,9 +32,7 @@
#ifndef ROOT_TMVA_PDEFoamEventDensity
#define ROOT_TMVA_PDEFoamEventDensity
-#ifndef ROOT_TMVA_PDEFoamDensityBase
#include "TMVA/PDEFoamDensityBase.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamKernelBase.h b/tmva/tmva/inc/TMVA/PDEFoamKernelBase.h
index 239f71c552a4b36b60dcdf8b8e7aef976e13c9df..a55b7ffe7a494057e76cf611994089b1b426259f 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamKernelBase.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamKernelBase.h
@@ -28,13 +28,9 @@
#ifndef ROOT_TMVA_PDEFoamKernelBase
#define ROOT_TMVA_PDEFoamKernelBase
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoam
#include "TMVA/PDEFoam.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamKernelGauss.h b/tmva/tmva/inc/TMVA/PDEFoamKernelGauss.h
index 5a9ff9bf39834cb8a9083caf4060f9fa475295c5..f32230046c89e5c4b6a23c2df9add1cd5974dba7 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamKernelGauss.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamKernelGauss.h
@@ -28,12 +28,8 @@
#ifndef ROOT_TMVA_PDEFoamKernelGauss
#define ROOT_TMVA_PDEFoamKernelGauss
-#ifndef ROOT_TMVA_PDEFoam
#include "TMVA/PDEFoam.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamKernelBase
#include "TMVA/PDEFoamKernelBase.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamKernelLinN.h b/tmva/tmva/inc/TMVA/PDEFoamKernelLinN.h
index fd15012ba1057151a50593b3a0392390fa83e4d6..2f245bc1106954d62de735e227caaaabf1875040 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamKernelLinN.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamKernelLinN.h
@@ -28,12 +28,8 @@
#ifndef ROOT_TMVA_PDEFoamKernelLinN
#define ROOT_TMVA_PDEFoamKernelLinN
-#ifndef ROOT_TMVA_PDEFoam
#include "TMVA/PDEFoam.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamKernelBase
#include "TMVA/PDEFoamKernelBase.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamKernelTrivial.h b/tmva/tmva/inc/TMVA/PDEFoamKernelTrivial.h
index 1112391f6fe6c4e295e977a3a37344e522912603..073229f61bf56d94be0c7ef2968234748bdbb731 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamKernelTrivial.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamKernelTrivial.h
@@ -28,12 +28,8 @@
#ifndef ROOT_TMVA_PDEFoamKernelTrivial
#define ROOT_TMVA_PDEFoamKernelTrivial
-#ifndef ROOT_TMVA_PDEFoam
#include "TMVA/PDEFoam.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamKernelBase
#include "TMVA/PDEFoamKernelBase.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamMultiTarget.h b/tmva/tmva/inc/TMVA/PDEFoamMultiTarget.h
index f82e74e0cc5883512e4c81283c94bf6d5adb0b7f..7bf3bcd1c29d2044a49bfd1bcf3c683cb44954bb 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamMultiTarget.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamMultiTarget.h
@@ -32,9 +32,7 @@
#ifndef ROOT_TMVA_PDEFoamMultiTarget
#define ROOT_TMVA_PDEFoamMultiTarget
-#ifndef ROOT_TMVA_PDEFoamEvent
#include "TMVA/PDEFoamEvent.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamTarget.h b/tmva/tmva/inc/TMVA/PDEFoamTarget.h
index 75ff080bdcaac41e53e8024412e9e0864d3dc085..1eca36ce4d0a15ce5e8a5e248486b52cc1179944 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamTarget.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamTarget.h
@@ -30,9 +30,7 @@
#ifndef ROOT_TMVA_PDEFoamTarget
#define ROOT_TMVA_PDEFoamTarget
-#ifndef ROOT_TMVA_PDEFoam
#include "TMVA/PDEFoam.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamTargetDensity.h b/tmva/tmva/inc/TMVA/PDEFoamTargetDensity.h
index dd8bd2d1804f97bbb5823c5c0cba160a9ad4a26e..f9ef04a12e97d5f3242a3810b9eac937b2537043 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamTargetDensity.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamTargetDensity.h
@@ -32,9 +32,7 @@
#ifndef ROOT_TMVA_PDEFoamTargetDensity
#define ROOT_TMVA_PDEFoamTargetDensity
-#ifndef ROOT_TMVA_PDEFoamDensityBase
#include "TMVA/PDEFoamDensityBase.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/PDEFoamVect.h b/tmva/tmva/inc/TMVA/PDEFoamVect.h
index 7bdeec4a9036a77b4d66c38e9b8da5f2aa27c44a..a356eadc3dc3f65ada120a4df9d823665b44c240 100644
--- a/tmva/tmva/inc/TMVA/PDEFoamVect.h
+++ b/tmva/tmva/inc/TMVA/PDEFoamVect.h
@@ -29,9 +29,7 @@
#ifndef ROOT_TMVA_PDEFoamVect
#define ROOT_TMVA_PDEFoamVect
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/PDF.h b/tmva/tmva/inc/TMVA/PDF.h
index ba67e2beeb719f552a2241a16ffb5b696dabfd57..5292a0b294066b70437a2b51a946dd2fbc809fa7 100644
--- a/tmva/tmva/inc/TMVA/PDF.h
+++ b/tmva/tmva/inc/TMVA/PDF.h
@@ -43,18 +43,10 @@
#include <iosfwd>
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
-#ifndef ROOT_ThreadLocalStorage
#include "ThreadLocalStorage.h"
-#endif
-#ifndef ROOT_TMVA_KDEKernel
#include "TMVA/KDEKernel.h"
-#endif
-#ifndef ROOT_TMVA_Configurable
#include "TMVA/Configurable.h"
-#endif
class TSpline;
class TGraph;
diff --git a/tmva/tmva/inc/TMVA/Ranking.h b/tmva/tmva/inc/TMVA/Ranking.h
index bd4799f205375d3dd09b58b11a0eedadacafc95a..c6bc6db3e905d53d9c0e66a51bd3821a03787159 100644
--- a/tmva/tmva/inc/TMVA/Ranking.h
+++ b/tmva/tmva/inc/TMVA/Ranking.h
@@ -38,9 +38,7 @@
#include <vector>
-#ifndef ROOT_TString
#include "TString.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/Reader.h b/tmva/tmva/inc/TMVA/Reader.h
index 14955ce63cd062e030121aabc3441d0f8d488c09..5022a5da90d7ee27d2c5c5edde9a3378e09c56a2 100644
--- a/tmva/tmva/inc/TMVA/Reader.h
+++ b/tmva/tmva/inc/TMVA/Reader.h
@@ -43,21 +43,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_Configurable
#include "TMVA/Configurable.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_DataSetInfo
#include "TMVA/DataSetInfo.h"
-#endif
-#ifndef ROOT_TMVA_DataInputHandler
#include "TMVA/DataInputHandler.h"
-#endif
-#ifndef ROOT_TMVA_DataSetManager
#include "TMVA/DataSetManager.h"
-#endif
#include <vector>
#include <map>
diff --git a/tmva/tmva/inc/TMVA/RegressionVariance.h b/tmva/tmva/inc/TMVA/RegressionVariance.h
index 240a281b069fc9f3123661f0ef664a40924140be..7063ea57c0421bc4ccf08ff9e5b99890e79cf701 100644
--- a/tmva/tmva/inc/TMVA/RegressionVariance.h
+++ b/tmva/tmva/inc/TMVA/RegressionVariance.h
@@ -57,13 +57,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/Results.h b/tmva/tmva/inc/TMVA/Results.h
index e70e697c4c6e6d48eab46b9652e2a18105f73a1c..09c674f35d26a0b6c5b3dcf9cd3e3fe78ad6c02f 100644
--- a/tmva/tmva/inc/TMVA/Results.h
+++ b/tmva/tmva/inc/TMVA/Results.h
@@ -40,16 +40,10 @@
#include <vector>
#include <map>
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_DataSetInfo
#include "TMVA/DataSetInfo.h"
-#endif
class TH1;
class TH2;
diff --git a/tmva/tmva/inc/TMVA/ResultsClassification.h b/tmva/tmva/inc/TMVA/ResultsClassification.h
index b8f16a61f55cc8e2d1e6169e9cd92ae5b8b3fd4f..79da8f1b5bf496065be6dfb740b4d7a2c223d1fe 100644
--- a/tmva/tmva/inc/TMVA/ResultsClassification.h
+++ b/tmva/tmva/inc/TMVA/ResultsClassification.h
@@ -39,9 +39,7 @@
#include <vector>
-#ifndef ROOT_TMVA_Results
#include "TMVA/Results.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/ResultsMulticlass.h b/tmva/tmva/inc/TMVA/ResultsMulticlass.h
index e2537a3d3a6a6836e8a9563968e97a6d12ba1db2..d5ca46840c997b143e0d9ee26b2d493145dade57 100644
--- a/tmva/tmva/inc/TMVA/ResultsMulticlass.h
+++ b/tmva/tmva/inc/TMVA/ResultsMulticlass.h
@@ -41,22 +41,12 @@
#include <vector>
-#ifndef ROOT_TH1F
#include "TH1F.h"
-#endif
-#ifndef ROOT_TH2F
#include "TH2F.h"
-#endif
-#ifndef ROOT_TMVA_Results
#include "TMVA/Results.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_IFitterTarget
#include "IFitterTarget.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/ResultsRegression.h b/tmva/tmva/inc/TMVA/ResultsRegression.h
index b2ed92d4f07f0fe2a6850e782175d50f3760a67b..3407b5172f867ed64c4cfb80e1bdc4bb6aa4f7b9 100644
--- a/tmva/tmva/inc/TMVA/ResultsRegression.h
+++ b/tmva/tmva/inc/TMVA/ResultsRegression.h
@@ -39,19 +39,11 @@
#include <vector>
-#ifndef ROOT_TH1F
#include "TH1F.h"
-#endif
-#ifndef ROOT_TH2F
#include "TH2F.h"
-#endif
-#ifndef ROOT_TMVA_Results
#include "TMVA/Results.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/RootFinder.h b/tmva/tmva/inc/TMVA/RootFinder.h
index 3ed60ce071ee4b87daaf9d56e9720bde981e517c..2816acae3fdbc2709c7c31952ebec77df9b1cc18 100644
--- a/tmva/tmva/inc/TMVA/RootFinder.h
+++ b/tmva/tmva/inc/TMVA/RootFinder.h
@@ -38,9 +38,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/Rule.h b/tmva/tmva/inc/TMVA/Rule.h
index e1db09192019f5d0ba08a3cee536bcbe8a457b44..e14852f6da2b2925f3d87b339cdf43b644961b2a 100644
--- a/tmva/tmva/inc/TMVA/Rule.h
+++ b/tmva/tmva/inc/TMVA/Rule.h
@@ -31,19 +31,11 @@
#ifndef ROOT_TMVA_Rule
#define ROOT_TMVA_Rule
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
-#ifndef ROOT_TMVA_DecisionTree
#include "TMVA/DecisionTree.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_RuleCut
#include "TMVA/RuleCut.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/RuleCut.h b/tmva/tmva/inc/TMVA/RuleCut.h
index 6768c4e5728982a19c1b2c1945e5024fab96f20b..bfa49e0b453f6b716ad41d82b4cce594687be588 100644
--- a/tmva/tmva/inc/TMVA/RuleCut.h
+++ b/tmva/tmva/inc/TMVA/RuleCut.h
@@ -24,9 +24,7 @@
#ifndef ROOT_TMVA_RuleCut
#define ROOT_TMVA_RuleCut
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/RuleEnsemble.h b/tmva/tmva/inc/TMVA/RuleEnsemble.h
index 293c1406d2168cfa9423b281d1001049e134bcfc..ea10e8458aac3dd68f46b7842027fd64cc8155fb 100644
--- a/tmva/tmva/inc/TMVA/RuleEnsemble.h
+++ b/tmva/tmva/inc/TMVA/RuleEnsemble.h
@@ -34,23 +34,13 @@
// #include "TMathBase.h"
// #endif
// #else
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
// #endif
-#ifndef ROOT_TMVA_DecisionTree
#include "TMVA/DecisionTree.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_Rule
#include "TMVA/Rule.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
class TH1F;
diff --git a/tmva/tmva/inc/TMVA/RuleFit.h b/tmva/tmva/inc/TMVA/RuleFit.h
index f3b8f492e658d925bad86444df917d3131428cfd..7b60e4168221c70ded1537bee52b297a6941c152 100644
--- a/tmva/tmva/inc/TMVA/RuleFit.h
+++ b/tmva/tmva/inc/TMVA/RuleFit.h
@@ -29,18 +29,10 @@
#include <algorithm>
-#ifndef ROOT_TMVA_DecisionTree
#include "TMVA/DecisionTree.h"
-#endif
-#ifndef ROOT_TMVA_RuleEnsemble
#include "TMVA/RuleEnsemble.h"
-#endif
-#ifndef ROOT_TMVA_RuleFitParams
#include "TMVA/RuleFitParams.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/RuleFitParams.h b/tmva/tmva/inc/TMVA/RuleFitParams.h
index cea0bd1fcd5bc3b6f2498016bdb53f693520fffc..33a2c5c2625f8548eb3c9224f71a0d01dd64aedc 100644
--- a/tmva/tmva/inc/TMVA/RuleFitParams.h
+++ b/tmva/tmva/inc/TMVA/RuleFitParams.h
@@ -34,18 +34,14 @@
#define ROOT_TMVA_RuleFitParams
// #if ROOT_VERSION_CODE >= 364802
-#ifndef ROOT_TMathBase
#include "TMathBase.h"
-#endif
// #else
// #ifndef ROOT_TMath
// #include "TMath.h"
// #endif
// #endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
class TTree;
diff --git a/tmva/tmva/inc/TMVA/SVEvent.h b/tmva/tmva/inc/TMVA/SVEvent.h
index ddfcdf0cdf7291ee011e87ef4f70f7233db26b0d..3750c3c5f4c96e275559de88e69b4a53fde195a1 100644
--- a/tmva/tmva/inc/TMVA/SVEvent.h
+++ b/tmva/tmva/inc/TMVA/SVEvent.h
@@ -31,9 +31,7 @@
#include <vector>
#include <iostream>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
namespace TMVA
{
diff --git a/tmva/tmva/inc/TMVA/SVKernelFunction.h b/tmva/tmva/inc/TMVA/SVKernelFunction.h
index 1fb22f37e227c73d013e570b06d502875a19e638..fb734daee2c7e16b3534002f88e57dd41512d701 100644
--- a/tmva/tmva/inc/TMVA/SVKernelFunction.h
+++ b/tmva/tmva/inc/TMVA/SVKernelFunction.h
@@ -28,9 +28,7 @@
#ifndef ROOT_TMVA_SVKernelFunction
#define ROOT_TMVA_SVKernelFunction
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/SVKernelMatrix.h b/tmva/tmva/inc/TMVA/SVKernelMatrix.h
index c8093e55da9f6d0624978fe77fe9d32da251bbac..291135a2c748ad94bf7a09f573369dcd80d264ad 100644
--- a/tmva/tmva/inc/TMVA/SVKernelMatrix.h
+++ b/tmva/tmva/inc/TMVA/SVKernelMatrix.h
@@ -28,9 +28,7 @@
#ifndef ROOT_TMVA_SVKernelMatrix
#define ROOT_TMVA_SVKernelMatrix
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <vector>
diff --git a/tmva/tmva/inc/TMVA/SVWorkingSet.h b/tmva/tmva/inc/TMVA/SVWorkingSet.h
index ee4605d28cf01886f09dbf6dc4183a20b32c9f40..eafb0ab57b8193bd27d9ca5c10a3af6b193fe1b9 100644
--- a/tmva/tmva/inc/TMVA/SVWorkingSet.h
+++ b/tmva/tmva/inc/TMVA/SVWorkingSet.h
@@ -30,9 +30,7 @@
#include <vector>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/SdivSqrtSplusB.h b/tmva/tmva/inc/TMVA/SdivSqrtSplusB.h
index 05a08691857c14ce91cee79df007699d7c3754a8..5fc1750e65212ef54a5669a36a31a9b90e14c92e 100644
--- a/tmva/tmva/inc/TMVA/SdivSqrtSplusB.h
+++ b/tmva/tmva/inc/TMVA/SdivSqrtSplusB.h
@@ -37,9 +37,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_SeparationBase
#include "TMVA/SeparationBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/SeparationBase.h b/tmva/tmva/inc/TMVA/SeparationBase.h
index 4ca356c5451f10aa061a5529230820f4f8747d35..92316c07268406ec4040aae8e4e12ad953ad15dd 100644
--- a/tmva/tmva/inc/TMVA/SeparationBase.h
+++ b/tmva/tmva/inc/TMVA/SeparationBase.h
@@ -69,17 +69,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
#include <limits>
diff --git a/tmva/tmva/inc/TMVA/SimulatedAnnealing.h b/tmva/tmva/inc/TMVA/SimulatedAnnealing.h
index 4701027c8f41b731c3865cdc413fcc92da997071..555125834a9acd672bf1c9d6a9af5c2cb62d26d0 100644
--- a/tmva/tmva/inc/TMVA/SimulatedAnnealing.h
+++ b/tmva/tmva/inc/TMVA/SimulatedAnnealing.h
@@ -39,9 +39,7 @@
#include <vector>
#include <list>
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
class TRandom;
diff --git a/tmva/tmva/inc/TMVA/SimulatedAnnealingFitter.h b/tmva/tmva/inc/TMVA/SimulatedAnnealingFitter.h
index f1be0895951b86999b4d45880e639dcbc4b76c3b..26d0b52a39cd4c12a3f0490463fa462b56471ccb 100644
--- a/tmva/tmva/inc/TMVA/SimulatedAnnealingFitter.h
+++ b/tmva/tmva/inc/TMVA/SimulatedAnnealingFitter.h
@@ -37,9 +37,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_FitterBase
#include "TMVA/FitterBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TActivation.h b/tmva/tmva/inc/TMVA/TActivation.h
index 36b126319a595b6fb2ce9570609f824ff46a7447..75c3e4ce457fe1477c7e1cc3f3d32f8f52798b00 100644
--- a/tmva/tmva/inc/TMVA/TActivation.h
+++ b/tmva/tmva/inc/TMVA/TActivation.h
@@ -34,12 +34,8 @@
#include <iosfwd>
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TActivationChooser.h b/tmva/tmva/inc/TMVA/TActivationChooser.h
index 03c876468ccc05e37cbfc46281edc4b9835c0f89..96b91466b06c742ae7b9919341e7d8ea8a436bb6 100644
--- a/tmva/tmva/inc/TMVA/TActivationChooser.h
+++ b/tmva/tmva/inc/TMVA/TActivationChooser.h
@@ -34,9 +34,7 @@
//////////////////////////////////////////////////////////////////////////
#include <vector>
-#ifndef ROOT_TString
#include "TString.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TActivationIdentity.h b/tmva/tmva/inc/TMVA/TActivationIdentity.h
index 0f6f44c711dfc17c2cb1ff854b8a69977814e768..b1025f655f1005b37711330a5635bb86a4f36d9a 100644
--- a/tmva/tmva/inc/TMVA/TActivationIdentity.h
+++ b/tmva/tmva/inc/TMVA/TActivationIdentity.h
@@ -32,16 +32,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFormula
#include "TFormula.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_TActivation
#include "TMVA/TActivation.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TActivationRadial.h b/tmva/tmva/inc/TMVA/TActivationRadial.h
index 18fa90de49aa2b01f4e29da24ff30041ff659fac..74f40026a97caccdf6e9b36d719820bf1d1c6d06 100644
--- a/tmva/tmva/inc/TMVA/TActivationRadial.h
+++ b/tmva/tmva/inc/TMVA/TActivationRadial.h
@@ -32,16 +32,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFormula
#include "TFormula.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_TActivation
#include "TMVA/TActivation.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TActivationReLU.h b/tmva/tmva/inc/TMVA/TActivationReLU.h
index 54a5b926c06206db19566485568e5dc50f898403..5a8b9ce7846a949b4b89e11b32d18a324ca15d8c 100644
--- a/tmva/tmva/inc/TMVA/TActivationReLU.h
+++ b/tmva/tmva/inc/TMVA/TActivationReLU.h
@@ -32,16 +32,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFormula
#include "TFormula.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_TActivation
#include "TMVA/TActivation.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TActivationSigmoid.h b/tmva/tmva/inc/TMVA/TActivationSigmoid.h
index dbc29c827b6182abd08b68565018593849cdf159..b3ccf78b7974bd29068db1b87e7ca09848d700f1 100644
--- a/tmva/tmva/inc/TMVA/TActivationSigmoid.h
+++ b/tmva/tmva/inc/TMVA/TActivationSigmoid.h
@@ -32,16 +32,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFormula
#include "TFormula.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_TActivation
#include "TMVA/TActivation.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TActivationTanh.h b/tmva/tmva/inc/TMVA/TActivationTanh.h
index dad53168c4b436fffb6d31a1cab0bd9e868817ab..901e7b8089a402b8e2a550b29628bde567c48c06 100644
--- a/tmva/tmva/inc/TMVA/TActivationTanh.h
+++ b/tmva/tmva/inc/TMVA/TActivationTanh.h
@@ -32,16 +32,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFormula
#include "TFormula.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_TActivation
#include "TMVA/TActivation.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TNeuron.h b/tmva/tmva/inc/TMVA/TNeuron.h
index f3283be56d0231e70347ff112157e8eedc04e90e..c10bd6aa87b8fc956c7c033ce62f578b85a2b7ec 100644
--- a/tmva/tmva/inc/TMVA/TNeuron.h
+++ b/tmva/tmva/inc/TMVA/TNeuron.h
@@ -34,25 +34,13 @@
#include <iostream>
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TFormula
#include "TFormula.h"
-#endif
-#ifndef ROOT_TMVA_TSynapse
#include "TMVA/TSynapse.h"
-#endif
-#ifndef ROOT_TMVA_TActivation
#include "TMVA/TActivation.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TNeuronInput.h b/tmva/tmva/inc/TMVA/TNeuronInput.h
index 9c14f9d8fa7f37edc23d3a02ce9bbc4f28b65319..f232754ce0613c55588b8c1dda1be94ff03a58b8 100644
--- a/tmva/tmva/inc/TMVA/TNeuronInput.h
+++ b/tmva/tmva/inc/TMVA/TNeuronInput.h
@@ -32,12 +32,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TNeuronInputAbs.h b/tmva/tmva/inc/TMVA/TNeuronInputAbs.h
index 64783d20e6351c7773567aed2b86e328e98c5ca7..c786df0b523d746126a8719c0eb6948057e6df0e 100644
--- a/tmva/tmva/inc/TMVA/TNeuronInputAbs.h
+++ b/tmva/tmva/inc/TMVA/TNeuronInputAbs.h
@@ -41,29 +41,19 @@
// things from the ROOT version of TMVA
// #if ROOT_VERSION_CODE >= 364802
-#ifndef ROOT_TMathBase
#include "TMathBase.h"
-#endif
// #else
// #ifndef ROOT_TMath
// #include "TMath.h"
// #endif
// #endif
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_TNeuronInput
#include "TMVA/TNeuronInput.h"
-#endif
-#ifndef ROOT_TMVA_TNeuron
#include "TMVA/TNeuron.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TNeuronInputSqSum.h b/tmva/tmva/inc/TMVA/TNeuronInputSqSum.h
index d56d8abbc86390060acdecab11c5b85e340a309c..4652b393fa98341ab1621ce75ca40a444e714e11 100644
--- a/tmva/tmva/inc/TMVA/TNeuronInputSqSum.h
+++ b/tmva/tmva/inc/TMVA/TNeuronInputSqSum.h
@@ -35,19 +35,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_TNeuronInput
#include "TMVA/TNeuronInput.h"
-#endif
-#ifndef ROOT_TMVA_TNeuron
#include "TMVA/TNeuron.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TNeuronInputSum.h b/tmva/tmva/inc/TMVA/TNeuronInputSum.h
index 318d75612c64ff6ae3608923dd50ff3e76775c92..b849d34a58fe69be87889266b14384b85a65631a 100644
--- a/tmva/tmva/inc/TMVA/TNeuronInputSum.h
+++ b/tmva/tmva/inc/TMVA/TNeuronInputSum.h
@@ -33,19 +33,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_TNeuronInput
#include "TMVA/TNeuronInput.h"
-#endif
-#ifndef ROOT_TMVA_TNeuron
#include "TMVA/TNeuron.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TSpline1.h b/tmva/tmva/inc/TMVA/TSpline1.h
index 50f681885216f083c74d460a4481f205051cb688..acfb7e68266a362ee1fc7d3a47f06e252fdc0b9b 100644
--- a/tmva/tmva/inc/TMVA/TSpline1.h
+++ b/tmva/tmva/inc/TMVA/TSpline1.h
@@ -36,9 +36,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSpline
#include "TSpline.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TSpline2.h b/tmva/tmva/inc/TMVA/TSpline2.h
index 98d0c520a14c511897dced85f31ba6bae9388d12..463c5f8af10f9210222f408d524e5d37abed029f 100644
--- a/tmva/tmva/inc/TMVA/TSpline2.h
+++ b/tmva/tmva/inc/TMVA/TSpline2.h
@@ -36,9 +36,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSpline
#include "TSpline.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/TSynapse.h b/tmva/tmva/inc/TMVA/TSynapse.h
index 520867fe30597960dc187a61b098ce7537f86803..3b43b36a241452ba3aacf15a9e405ecde676b01c 100644
--- a/tmva/tmva/inc/TMVA/TSynapse.h
+++ b/tmva/tmva/inc/TMVA/TSynapse.h
@@ -32,12 +32,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TFormula
#include "TFormula.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/Timer.h b/tmva/tmva/inc/TMVA/Timer.h
index 1192e09938044c227bf9bd88d8f5aac5bce0ec22..ea956501237a5ebaad68f10c71f2a7a39983c8f7 100644
--- a/tmva/tmva/inc/TMVA/Timer.h
+++ b/tmva/tmva/inc/TMVA/Timer.h
@@ -39,12 +39,8 @@
#ifndef ROOT_time
#include "time.h"
#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TStopwatch
#include "TStopwatch.h"
-#endif
// ensure that clock_t is always defined
#if defined(__SUNPRO_CC) && defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE - 0 == 500 )
diff --git a/tmva/tmva/inc/TMVA/Tools.h b/tmva/tmva/inc/TMVA/Tools.h
index 80d19b0ed1f9d175e1352e8e7cfd4cf8e181354e..2093e8d021a46a8c5d1f245069a81472146caa03 100644
--- a/tmva/tmva/inc/TMVA/Tools.h
+++ b/tmva/tmva/inc/TMVA/Tools.h
@@ -45,33 +45,19 @@
#include <atomic>
#endif
-#ifndef ROOT_TXMLEngine
#include "TXMLEngine.h"
-#endif
-#ifndef ROOT_TMatrixDSymfwd
#include "TMatrixDSymfwd.h"
-#endif
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TVectorDfwd
#include "TVectorDfwd.h"
-#endif
-#ifndef ROOT_TVectorDfwd
#include "TVectorDfwd.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_VariableTransformBase
#include "TMVA/VariableTransformBase.h"
-#endif
#include "TString.h"
diff --git a/tmva/tmva/inc/TMVA/TransformationHandler.h b/tmva/tmva/inc/TMVA/TransformationHandler.h
index 367d072d3a1c1f784b87ba82835cc393458d5492..58589df9a70a2f374e8cd70030a677051b80a056 100644
--- a/tmva/tmva/inc/TMVA/TransformationHandler.h
+++ b/tmva/tmva/inc/TMVA/TransformationHandler.h
@@ -39,16 +39,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_DataSetInfo
#include "TMVA/DataSetInfo.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/Types.h b/tmva/tmva/inc/TMVA/Types.h
index 1bdbe86309008a9b402ceeea857f312e7b186f21..cc0f9f81d399f4091a3f15cd74914939aff0eb35 100644
--- a/tmva/tmva/inc/TMVA/Types.h
+++ b/tmva/tmva/inc/TMVA/Types.h
@@ -42,13 +42,9 @@
#include <atomic>
#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/VariableDecorrTransform.h b/tmva/tmva/inc/TMVA/VariableDecorrTransform.h
index 0aab1de5784bc278d553bc333e31d5cb22a086c8..ce7fa8c0f34b8449eb5249dd76d243f7a9a26235 100644
--- a/tmva/tmva/inc/TMVA/VariableDecorrTransform.h
+++ b/tmva/tmva/inc/TMVA/VariableDecorrTransform.h
@@ -36,17 +36,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TMatrixDSymfwd
#include "TMatrixDSymfwd.h"
-#endif
-#ifndef ROOT_TMVA_VariableTransformBase
#include "TMVA/VariableTransformBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/VariableGaussTransform.h b/tmva/tmva/inc/TMVA/VariableGaussTransform.h
index 5ab7d34a18e164c57a33090345e067b31541bfb5..acea4be472b2cd0aa5b71d4aac55da0f235edc3c 100644
--- a/tmva/tmva/inc/TMVA/VariableGaussTransform.h
+++ b/tmva/tmva/inc/TMVA/VariableGaussTransform.h
@@ -29,9 +29,7 @@
#ifndef ROOT_TMVA_VariableGaussTransform
#define ROOT_TMVA_VariableGaussTransform
-#ifndef ROOT_TMVA_PDF
#include "TMVA/PDF.h"
-#endif
//////////////////////////////////////////////////////////////////////////
// //
@@ -43,25 +41,13 @@
#include <vector>
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
-#ifndef ROOT_TGraph
#include "TGraph.h"
-#endif
-#ifndef ROOT_TSpline
#include "TSpline.h"
-#endif
-#ifndef ROOT_TDirectory
#include "TDirectory.h"
-#endif
-#ifndef ROOT_Event
#include "Event.h"
-#endif
-#ifndef ROOT_TMVA_VariableTransformBase
#include "TMVA/VariableTransformBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/VariableIdentityTransform.h b/tmva/tmva/inc/TMVA/VariableIdentityTransform.h
index 25f9f3979622c8d13cdf0355ff5b77ca1263e6fa..f9ede20575f109a46e0e0a65bac9841479ebb1d0 100644
--- a/tmva/tmva/inc/TMVA/VariableIdentityTransform.h
+++ b/tmva/tmva/inc/TMVA/VariableIdentityTransform.h
@@ -36,9 +36,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_VariableTransformBase
#include "TMVA/VariableTransformBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/VariableImportance.h b/tmva/tmva/inc/TMVA/VariableImportance.h
index a964c7dcd4f9ae8767b60fd494b26530eaeccd56..4c41d240631ae3ff3e1ca21b853fc94a455d26ae 100644
--- a/tmva/tmva/inc/TMVA/VariableImportance.h
+++ b/tmva/tmva/inc/TMVA/VariableImportance.h
@@ -6,33 +6,19 @@
#define ROOT_TMVA_VariableImportance
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_Configurable
#include "TMVA/Configurable.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_Factory
-#include<TMVA/Factory.h>
-#endif
+#include <TMVA/Factory.h>
-#ifndef ROOT_TMVA_DataLoader
-#include<TMVA/DataLoader.h>
-#endif
+#include <TMVA/DataLoader.h>
-#ifndef ROOT_TMVA_OptionMap
-#include<TMVA/OptionMap.h>
-#endif
+#include <TMVA/OptionMap.h>
-#ifndef ROOT_TMVA_Envelope
-#include<TMVA/Envelope.h>
-#endif
+#include <TMVA/Envelope.h>
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/VariableInfo.h b/tmva/tmva/inc/TMVA/VariableInfo.h
index 8b84d2d8215a98e0e688314d64c20895bcf80d1a..b862c811dfb6320c41ff265a8d537a7c9bffb69a 100644
--- a/tmva/tmva/inc/TMVA/VariableInfo.h
+++ b/tmva/tmva/inc/TMVA/VariableInfo.h
@@ -37,18 +37,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/VariableNormalizeTransform.h b/tmva/tmva/inc/TMVA/VariableNormalizeTransform.h
index e71f4ed674c756fc4078148fa18b50a1e5bd9fc7..a3e6960d20b7236f59f4c691e00def29cc5a5b7a 100644
--- a/tmva/tmva/inc/TMVA/VariableNormalizeTransform.h
+++ b/tmva/tmva/inc/TMVA/VariableNormalizeTransform.h
@@ -37,13 +37,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMatrixDfwd
#include "TMatrixDfwd.h"
-#endif
-#ifndef ROOT_TMVA_VariableTransformBase
#include "TMVA/VariableTransformBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/VariablePCATransform.h b/tmva/tmva/inc/TMVA/VariablePCATransform.h
index 22b2630f8f1f3d192392d4a90663d30e233cf4ef..987bcdc24bebe8e9409bfa747d4ce87090f584f3 100644
--- a/tmva/tmva/inc/TMVA/VariablePCATransform.h
+++ b/tmva/tmva/inc/TMVA/VariablePCATransform.h
@@ -37,13 +37,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TPrincipal
#include "TPrincipal.h"
-#endif
-#ifndef ROOT_TMVA_VariableTransformBase
#include "TMVA/VariableTransformBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/VariableRearrangeTransform.h b/tmva/tmva/inc/TMVA/VariableRearrangeTransform.h
index 4190249c5512f48951d02367cb2372186233fa96..433c2a90fd79ccf75c78139cd9847de36cdc2472 100644
--- a/tmva/tmva/inc/TMVA/VariableRearrangeTransform.h
+++ b/tmva/tmva/inc/TMVA/VariableRearrangeTransform.h
@@ -34,9 +34,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TMVA_VariableTransformBase
#include "TMVA/VariableTransformBase.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/VariableTransformBase.h b/tmva/tmva/inc/TMVA/VariableTransformBase.h
index 63d43dcced28359049948a4d161ad1abd5865593..ca9cd7fa9273f4f5802130ed1fedf4fbe0bc9e71 100644
--- a/tmva/tmva/inc/TMVA/VariableTransformBase.h
+++ b/tmva/tmva/inc/TMVA/VariableTransformBase.h
@@ -39,28 +39,14 @@
#include <vector>
-#ifndef ROOT_TH1
#include "TH1.h"
-#endif
-#ifndef ROOT_TDirectory
#include "TDirectory.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_VariableInfo
#include "TMVA/VariableInfo.h"
-#endif
-#ifndef ROOT_TMVA_DataSetInfo
#include "TMVA/DataSetInfo.h"
-#endif
namespace TMVA {
diff --git a/tmva/tmva/inc/TMVA/Volume.h b/tmva/tmva/inc/TMVA/Volume.h
index 61a57b7a244665cd4531f6aa20168e6dce77b4ef..b0b2c1a0a1a893e5d5494d1eb61c4e03af407241 100644
--- a/tmva/tmva/inc/TMVA/Volume.h
+++ b/tmva/tmva/inc/TMVA/Volume.h
@@ -40,9 +40,7 @@
//////////////////////////////////////////////////////////////////////////
#include <vector>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
//#include "time.h"
namespace TMVA {
diff --git a/tmva/tmva/src/BDTEventWrapper.cxx b/tmva/tmva/src/BDTEventWrapper.cxx
index e6e3486f8ebb8213d671c472ce44138719708209..63171c886b52ee94e6c994a7f7ff5741dfd0b301 100644
--- a/tmva/tmva/src/BDTEventWrapper.cxx
+++ b/tmva/tmva/src/BDTEventWrapper.cxx
@@ -20,9 +20,7 @@
* (http://tmva.sourceforge.net/LICENSE) *
**********************************************************************************/
-#ifndef ROOT_TMVA_BDTEventWrapper
#include "TMVA/BDTEventWrapper.h"
-#endif
/*! \class TMVA::BDTEventWrapper
\ingroup TMVA
diff --git a/tmva/tmva/src/BinarySearchTree.cxx b/tmva/tmva/src/BinarySearchTree.cxx
index 88ea60065e37475f33e91f6fc2ee25c5fc14a911..2b84c9311afee103b6fb578975235b8a75fec696 100644
--- a/tmva/tmva/src/BinarySearchTree.cxx
+++ b/tmva/tmva/src/BinarySearchTree.cxx
@@ -54,21 +54,11 @@ A simple Binary search tree including a volume search method.
#include "TObjString.h"
#include "TTree.h"
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
-#ifndef ROOT_TMVA_MethodBase
#include "TMVA/MethodBase.h"
-#endif
-#ifndef ROOT_TMVA_Tools
#include "TMVA/Tools.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_BinarySearchTree
#include "TMVA/BinarySearchTree.h"
-#endif
#include "TMVA/BinaryTree.h"
#include "TMVA/Types.h"
diff --git a/tmva/tmva/src/ClassInfo.cxx b/tmva/tmva/src/ClassInfo.cxx
index 291265fed58d68874b5a45168c46faaca721f3f8..63025738903e6e6ab1ed7bf10a3fbe03453e33d5 100644
--- a/tmva/tmva/src/ClassInfo.cxx
+++ b/tmva/tmva/src/ClassInfo.cxx
@@ -36,12 +36,8 @@ Class that contains all the information of a class.
#include <vector>
-#ifndef ROOT_TCut
#include "TCut.h"
-#endif
-#ifndef ROOT_TMatrix
#include "TMatrixD.h"
-#endif
#include "TMVA/MsgLogger.h"
#include "TMVA/Types.h"
diff --git a/tmva/tmva/src/DataInputHandler.cxx b/tmva/tmva/src/DataInputHandler.cxx
index 45ff9ec03c69844b15d18c5edbaee323043e06e5..4523f241fafc0edd9f26782da270fe834fc1ebf7 100644
--- a/tmva/tmva/src/DataInputHandler.cxx
+++ b/tmva/tmva/src/DataInputHandler.cxx
@@ -42,9 +42,7 @@ Class that contains all the data information.
#include "TROOT.h"
#include "TTree.h"
-#ifndef ROOT_TMVA_Configurable
#include "TMVA/Configurable.h"
-#endif
#include <vector>
#include <iostream>
diff --git a/tmva/tmva/src/DataSet.cxx b/tmva/tmva/src/DataSet.cxx
index f1064598fb173775b52978211925788266fd3e19..16274f43341d0b627d0cc04a35d5ec1cfe1cd878 100644
--- a/tmva/tmva/src/DataSet.cxx
+++ b/tmva/tmva/src/DataSet.cxx
@@ -37,30 +37,14 @@ Class that contains all the data information
#include <stdexcept>
#include <algorithm>
-#ifndef ROOT_TMVA_DataSetInfo
#include "TMVA/DataSetInfo.h"
-#endif
-#ifndef ROOT_TMVA_DataSet
#include "TMVA/DataSet.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
-#ifndef ROOT_TMVA_ResultsRegression
#include "TMVA/ResultsRegression.h"
-#endif
-#ifndef ROOT_TMVA_ResultsClassification
#include "TMVA/ResultsClassification.h"
-#endif
-#ifndef ROOT_TMVA_ResultsMulticlass
#include "TMVA/ResultsMulticlass.h"
-#endif
-#ifndef ROOT_TMVA_Configurable
#include "TMVA/Configurable.h"
-#endif
#include "TMVA/Types.h"
#include "TMVA/Results.h"
diff --git a/tmva/tmva/src/DataSetFactory.cxx b/tmva/tmva/src/DataSetFactory.cxx
index f80acf0fc896cd14979b0efe58e3c3bd7706ed3f..a5cf98955f838bd90022e3995f8007b87b87d937 100644
--- a/tmva/tmva/src/DataSetFactory.cxx
+++ b/tmva/tmva/src/DataSetFactory.cxx
@@ -57,33 +57,15 @@ Class that contains all the data information
#include "TMath.h"
#include "TROOT.h"
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
-#ifndef ROOT_TMVA_Configurable
#include "TMVA/Configurable.h"
-#endif
-#ifndef ROOT_TMVA_VariableIdentityTransform
#include "TMVA/VariableIdentityTransform.h"
-#endif
-#ifndef ROOT_TMVA_VariableDecorrTransform
#include "TMVA/VariableDecorrTransform.h"
-#endif
-#ifndef ROOT_TMVA_VariablePCATransform
#include "TMVA/VariablePCATransform.h"
-#endif
-#ifndef ROOT_TMVA_DataSet
#include "TMVA/DataSet.h"
-#endif
-#ifndef ROOT_TMVA_DataSetInfo
#include "TMVA/DataSetInfo.h"
-#endif
-#ifndef ROOT_TMVA_DataInputHandler
#include "TMVA/DataInputHandler.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
#include "TMVA/Types.h"
#include "TMVA/VariableInfo.h"
diff --git a/tmva/tmva/src/DataSetInfo.cxx b/tmva/tmva/src/DataSetInfo.cxx
index cc6eb8e09a145cc0a866b84146fe6726845f6953..4bacec09ee04a782f5d5cfaaaf5d6fb0db861596 100644
--- a/tmva/tmva/src/DataSetInfo.cxx
+++ b/tmva/tmva/src/DataSetInfo.cxx
@@ -45,24 +45,12 @@ Class that contains all the data information.
#include "TROOT.h"
#include "TObjString.h"
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
-#ifndef ROOT_TMVA_Tools
#include "TMVA/Tools.h"
-#endif
-#ifndef ROOT_TMVA_DataSet
#include "TMVA/DataSet.h"
-#endif
-#ifndef ROOT_TMVA_DataSetInfo
#include "TMVA/DataSetInfo.h"
-#endif
-#ifndef ROOT_TMVA_DataSetManager
#include "TMVA/DataSetManager.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
#include "TMVA/Types.h"
#include "TMVA/VariableInfo.h"
diff --git a/tmva/tmva/src/DataSetManager.cxx b/tmva/tmva/src/DataSetManager.cxx
index 5b937a5edf5172cc82159e342dfa871a23ccc6c3..c7ba8f8dc532b283bdcfb2a71f126162e87697de 100644
--- a/tmva/tmva/src/DataSetManager.cxx
+++ b/tmva/tmva/src/DataSetManager.cxx
@@ -35,21 +35,11 @@ Class that contains all the data information.
#include <iostream>
using std::endl;
-#ifndef ROOT_TMVA_DataSetManager
#include "TMVA/DataSetManager.h"
-#endif
-#ifndef ROOT_TMVA_DataSetFactory
#include "TMVA/DataSetFactory.h"
-#endif
-#ifndef ROOT_TMVA_DataSet
#include "TMVA/DataSet.h"
-#endif
-#ifndef ROOT_TMVA_DataSetInfo
#include "TMVA/DataSetInfo.h"
-#endif
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
#include "TMVA/Types.h"
diff --git a/tmva/tmva/src/FitterBase.cxx b/tmva/tmva/src/FitterBase.cxx
index 7c87288de15210a84803629d5f7c6d36baf9f40a..1f6f1c343a271ee46d72ec9bc4d17fafa74ff924 100644
--- a/tmva/tmva/src/FitterBase.cxx
+++ b/tmva/tmva/src/FitterBase.cxx
@@ -33,12 +33,8 @@ Base class for TMVA fitters. Also defines generalised fitting interface
*/
#include "TMVA/FitterBase.h"
-#ifndef ROOT_TMVA_Interval
#include "TMVA/Interval.h"
-#endif
-#ifndef ROOT_TMVA_IFitterTarget
#include "TMVA/IFitterTarget.h"
-#endif
#include "TMVA/Configurable.h"
#include "TMVA/MsgLogger.h"
diff --git a/tmva/tmva/src/LDA.cxx b/tmva/tmva/src/LDA.cxx
index 50ea02351aef352a82b4c458fb78dc1af1df9b12..e150d6fc610e9ce1bf94406be77192bb39b37bb7 100644
--- a/tmva/tmva/src/LDA.cxx
+++ b/tmva/tmva/src/LDA.cxx
@@ -34,22 +34,12 @@
// C/C++
#include <iostream>
-#ifndef ROOT_TDecompSVD
#include "TDecompSVD.h"
-#endif
-#ifndef ROOT_TMatrixF
#include "TMatrixF.h"
-#endif
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
-#ifndef ROOT_TMVA_Types
#include "TMVA/Types.h"
-#endif
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
/////////////////////////////////////////////////////////////////////////////////
/// constructor
diff --git a/tmva/tmva/src/MethodSVM.cxx b/tmva/tmva/src/MethodSVM.cxx
index ba3c2259750eda1dee956bf9c9cef5b884fa69fb..40ef1b9978c6fe0248ebbef21494d20dac572377 100644
--- a/tmva/tmva/src/MethodSVM.cxx
+++ b/tmva/tmva/src/MethodSVM.cxx
@@ -44,24 +44,14 @@ SMO Platt's SVM classifier with Keerthi & Shavade improvements
#include "TMVA/MethodSVM.h"
-#ifndef ROOT_TMVA_Tools
#include "TMVA/Tools.h"
-#endif
-#ifndef ROOT_TMVA_Timer
#include "TMVA/Timer.h"
-#endif
-#ifndef ROOT_TMVA_SVWorkingSet
#include "TMVA/SVWorkingSet.h"
-#endif
-#ifndef ROOT_TMVA_SVEvent
#include "TMVA/SVEvent.h"
-#endif
-#ifndef ROOT_TMVA_SVKernelFunction
#include "TMVA/SVKernelFunction.h"
-#endif
#include "TMVA/ClassifierFactory.h"
#include "TMVA/Configurable.h"
diff --git a/tmva/tmva/src/MethodTMlpANN.cxx b/tmva/tmva/src/MethodTMlpANN.cxx
index 3f82c5e48cc7b58f82aaa7e3d78b33728830e79e..4a734b17dc7c0fead5d2d4cbf68d5aa5bea1abf3 100644
--- a/tmva/tmva/src/MethodTMlpANN.cxx
+++ b/tmva/tmva/src/MethodTMlpANN.cxx
@@ -56,9 +56,7 @@ for details on this ANN.
#include "TMVA/VariableInfo.h"
#include "TMVA/ClassifierFactory.h"
-#ifndef ROOT_TMVA_Tools
#include "TMVA/Tools.h"
-#endif
#include "Riostream.h"
#include "TLeaf.h"
diff --git a/tmva/tmva/src/PDEFoamDecisionTree.cxx b/tmva/tmva/src/PDEFoamDecisionTree.cxx
index 0b5528fdb419b9c6063eb0ec501de368a0f6889c..0cc4d5dfd9749b880ebc2cac12c781bffbfc4ab3 100644
--- a/tmva/tmva/src/PDEFoamDecisionTree.cxx
+++ b/tmva/tmva/src/PDEFoamDecisionTree.cxx
@@ -45,12 +45,8 @@ PDEFoamDecisionTreeDensity density estimator, which returns the
events in a cell without sampling.
*/
-#ifndef ROOT_TMVA_PDEFoamDecisionTree
#include "TMVA/PDEFoamDecisionTree.h"
-#endif
-#ifndef ROOT_TMVA_PDEFoamDecisionTreeDensity
#include "TMVA/PDEFoamDecisionTreeDensity.h"
-#endif
#include "TMVA/MsgLogger.h"
#include "TMVA/PDEFoamCell.h"
diff --git a/tmva/tmva/src/PDEFoamKernelGauss.cxx b/tmva/tmva/src/PDEFoamKernelGauss.cxx
index 0f6f49e0b7f7d8492a7eb0b8d5454cc7ff799b33..fdebfcccfe8367e8ac0b53f64ee38b6998ca31c4 100644
--- a/tmva/tmva/src/PDEFoamKernelGauss.cxx
+++ b/tmva/tmva/src/PDEFoamKernelGauss.cxx
@@ -38,9 +38,7 @@ weighting all cell values with a gauss function.
#include "TMVA/PDEFoamKernelBase.h"
#include "TMVA/Types.h"
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
#include "Rtypes.h"
diff --git a/tmva/tmva/src/PDEFoamTarget.cxx b/tmva/tmva/src/PDEFoamTarget.cxx
index 4d4b0d433e505ebe67bd510bacba8da2b87e8d52..331733e5c26356bcabedc64793ab294cbdcd8566 100644
--- a/tmva/tmva/src/PDEFoamTarget.cxx
+++ b/tmva/tmva/src/PDEFoamTarget.cxx
@@ -45,9 +45,7 @@ phase space point during the foam build-up.
#include "TMVA/PDEFoamKernelBase.h"
#include "TMVA/Types.h"
-#ifndef ROOT_TMath
#include "TMath.h"
-#endif
#include "Rtypes.h"
diff --git a/tmva/tmva/src/ROCCalc.cxx b/tmva/tmva/src/ROCCalc.cxx
index 50a3f9a1eb58a6c5958a56cdfe065f706517402c..fa327225c628a354a4c6780ff4ea977aa2c8fe22 100644
--- a/tmva/tmva/src/ROCCalc.cxx
+++ b/tmva/tmva/src/ROCCalc.cxx
@@ -28,27 +28,13 @@
#include "TMVA/Config.h"
-#ifndef ROOT_TMVA_Tools
#include "TMVA/Tools.h"
-#endif
-#ifndef ROOT_TMVA_ROCCalc
#include "TMVA/ROCCalc.h"
-#endif
-#ifndef ROOT_TMVA_Config
#include "TMVA/Config.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_Version
#include "TMVA/Version.h"
-#endif
-#ifndef ROOT_TMVA_PDF
#include "TMVA/PDF.h"
-#endif
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
#include "TMVA/PDF.h"
#include "TMVA/TSpline1.h"
diff --git a/tmva/tmva/src/ROCCurve.cxx b/tmva/tmva/src/ROCCurve.cxx
index f8cd0114936ee1165e94499683ff745d1fb23176..bcfc00eb0b6f9db5a67233436da2267f32b192eb 100644
--- a/tmva/tmva/src/ROCCurve.cxx
+++ b/tmva/tmva/src/ROCCurve.cxx
@@ -24,24 +24,12 @@
\ingroup TMVA
*/
-#ifndef ROOT_TMVA_Tools
#include "TMVA/Tools.h"
-#endif
-#ifndef ROOT_TMVA_ROCCurve
#include "TMVA/ROCCurve.h"
-#endif
-#ifndef ROOT_TMVA_Config
#include "TMVA/Config.h"
-#endif
-#ifndef ROOT_TMVA_Version
#include "TMVA/Version.h"
-#endif
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
-#ifndef ROOT_TGraph
#include "TGraph.h"
-#endif
#include<vector>
#include <cassert>
diff --git a/tmva/tmva/src/TActivationChooser.cxx b/tmva/tmva/src/TActivationChooser.cxx
index d205d992cc99c9abf1e8dacc3b368c62167781ad..c2335693c9b73147ac26a95b8d8381e6ebf39c7b 100644
--- a/tmva/tmva/src/TActivationChooser.cxx
+++ b/tmva/tmva/src/TActivationChooser.cxx
@@ -31,27 +31,13 @@ Class for easily choosing activation functions
#include <vector>
#include "TString.h"
-#ifndef ROOT_TMVA_TActivation
#include "TMVA/TActivation.h"
-#endif
-#ifndef ROOT_TMVA_TActivationIdentity
#include "TMVA/TActivationIdentity.h"
-#endif
-#ifndef ROOT_TMVA_TActivationSigmoid
#include "TMVA/TActivationSigmoid.h"
-#endif
-#ifndef ROOT_TMVA_TActivationTanh
#include "TMVA/TActivationTanh.h"
-#endif
-#ifndef ROOT_TMVA_TActivationReLU
#include "TMVA/TActivationReLU.h"
-#endif
-#ifndef ROOT_TMVA_TActivationRadial
#include "TMVA/TActivationRadial.h"
-#endif
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
#include "TMVA/Types.h"
diff --git a/tmva/tmva/src/TNeuron.cxx b/tmva/tmva/src/TNeuron.cxx
index 3b68ed4b3aeb764269e288182228904006027a71..1bb38a42fd2acd38ea4549288bd242aa88016c74 100644
--- a/tmva/tmva/src/TNeuron.cxx
+++ b/tmva/tmva/src/TNeuron.cxx
@@ -28,18 +28,10 @@ Neuron class used by TMVA artificial neural network methods
#include "TMVA/TNeuron.h"
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
-#ifndef ROOT_TMVA_TActivation
#include "TMVA/TActivation.h"
-#endif
-#ifndef ROOT_TMVA_Tools
#include "TMVA/Tools.h"
-#endif
-#ifndef ROOT_TMVA_TNeuronInput
#include "TMVA/TNeuronInput.h"
-#endif
#include "TMVA/Types.h"
#include "TH1D.h"
diff --git a/tmva/tmva/src/TSynapse.cxx b/tmva/tmva/src/TSynapse.cxx
index 6e7c9397403830fd364b7c4a79fd2e0650851c7e..7f0f5b4c6c9692da087f1e2a949944167e8d2e80 100644
--- a/tmva/tmva/src/TSynapse.cxx
+++ b/tmva/tmva/src/TSynapse.cxx
@@ -28,13 +28,9 @@ Synapse class used by TMVA artificial neural network methods
#include "TMVA/TSynapse.h"
-#ifndef ROOT_TMVA_TNeuron
#include "TMVA/TNeuron.h"
-#endif
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
#include "TMVA/Types.h"
diff --git a/tmva/tmva/src/Tools.cxx b/tmva/tmva/src/Tools.cxx
index 85f9bee155000e05083c9f7fc02a8bab4312df23..fdb91e609e261736aedd84a0e346362605711c63 100644
--- a/tmva/tmva/src/Tools.cxx
+++ b/tmva/tmva/src/Tools.cxx
@@ -35,21 +35,11 @@ Global auxiliary applications and data treatment routines.
#include "TMVA/Tools.h"
-#ifndef ROOT_TMVA_Config
#include "TMVA/Config.h"
-#endif
-#ifndef ROOT_TMVA_Event
#include "TMVA/Event.h"
-#endif
-#ifndef ROOT_TMVA_Version
#include "TMVA/Version.h"
-#endif
-#ifndef ROOT_TMVA_PDF
#include "TMVA/PDF.h"
-#endif
-#ifndef ROOT_TMVA_MsgLogger
#include "TMVA/MsgLogger.h"
-#endif
#include "TMVA/Types.h"
#include "TObjString.h"
diff --git a/tree/tree/inc/TBasket.h b/tree/tree/inc/TBasket.h
index 2b9c93faf3d313bbc8ca579e05322abf170ee04b..a9816dda91450ae0d06a21509c00fb34a42befed 100644
--- a/tree/tree/inc/TBasket.h
+++ b/tree/tree/inc/TBasket.h
@@ -26,9 +26,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TKey
#include "TKey.h"
-#endif
class TFile;
diff --git a/tree/tree/inc/TBranch.h b/tree/tree/inc/TBranch.h
index 8994d9967f04280319133fb42f990dadab25b9c0..1e7eb32e1e541e4291294fe275eaffb2ed9da3b5 100644
--- a/tree/tree/inc/TBranch.h
+++ b/tree/tree/inc/TBranch.h
@@ -25,21 +25,13 @@
#include <memory>
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TDataType
#include "TDataType.h"
-#endif
class TTree;
class TBasket;
diff --git a/tree/tree/inc/TBranchBrowsable.h b/tree/tree/inc/TBranchBrowsable.h
index 5934030c63085d7bc23ac856f5d004976f45e0b5..ad743902b5865ad7e5c1377f99bbb052d2c7ee72 100644
--- a/tree/tree/inc/TBranchBrowsable.h
+++ b/tree/tree/inc/TBranchBrowsable.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TBranchBrowsable
#define ROOT_TBranchBrowsable
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
#include <list>
diff --git a/tree/tree/inc/TBranchClones.h b/tree/tree/inc/TBranchClones.h
index 652a019d969635683706a749c7555cb8fdcbdfbe..1f8a4785ae6b347e4c541fb12452916bfe36d1b3 100644
--- a/tree/tree/inc/TBranchClones.h
+++ b/tree/tree/inc/TBranchClones.h
@@ -21,9 +21,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBranch
#include "TBranch.h"
-#endif
class TClonesArray;
class TTreeCloner;
diff --git a/tree/tree/inc/TBranchElement.h b/tree/tree/inc/TBranchElement.h
index d9147784e5e768146610287e52612c9e9f661a03..6b1f13bd4d07d84c01c995f3c6279392a870d5ab 100644
--- a/tree/tree/inc/TBranchElement.h
+++ b/tree/tree/inc/TBranchElement.h
@@ -21,21 +21,13 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBranch
#include "TBranch.h"
-#endif
-#ifndef ROOT_TClassRef
#include "TClassRef.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TError
#include "TError.h"
-#endif
#include <vector>
diff --git a/tree/tree/inc/TBranchObject.h b/tree/tree/inc/TBranchObject.h
index 86a7c4c96409348fb18d3849c6c2b24c015d722b..f30cc043788a2403d3a6f602eb2b0bdaf01ba292 100644
--- a/tree/tree/inc/TBranchObject.h
+++ b/tree/tree/inc/TBranchObject.h
@@ -21,9 +21,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBranch
#include "TBranch.h"
-#endif
class TBranchObject : public TBranch {
diff --git a/tree/tree/inc/TBranchRef.h b/tree/tree/inc/TBranchRef.h
index 3d9f6a4ad897524b6b5267f962608eaf2a0b0636..0fa045829a39969cbabbcb05edbc5ecdbbcf3179 100644
--- a/tree/tree/inc/TBranchRef.h
+++ b/tree/tree/inc/TBranchRef.h
@@ -21,12 +21,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBranch
#include "TBranch.h"
-#endif
-#ifndef ROOT_TRefTable
#include "TRefTable.h"
-#endif
class TTree;
diff --git a/tree/tree/inc/TBufferSQL.h b/tree/tree/inc/TBufferSQL.h
index 8f0ed211e10ca3212ab475dde172b8a7ce893404..e80f283ef3df14d3cbecd3db9ed62d16300b2dbd 100644
--- a/tree/tree/inc/TBufferSQL.h
+++ b/tree/tree/inc/TBufferSQL.h
@@ -20,12 +20,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBufferFile
#include "TBufferFile.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TSQLResult;
diff --git a/tree/tree/inc/TChain.h b/tree/tree/inc/TChain.h
index 9b0c23698db7a292cfa3f81a11863c5d4f5b6807..34fc4d72bf48190e8c32777fd17491aeba7e07d8 100644
--- a/tree/tree/inc/TChain.h
+++ b/tree/tree/inc/TChain.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
class TFile;
class TBrowser;
diff --git a/tree/tree/inc/TChainElement.h b/tree/tree/inc/TChainElement.h
index af7985fd334ea537e1ee61a866ec2086473c4e0e..4796672d0c18a5fc5c91950730779e5b3f5a9a6e 100644
--- a/tree/tree/inc/TChainElement.h
+++ b/tree/tree/inc/TChainElement.h
@@ -21,9 +21,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TBranch;
diff --git a/tree/tree/inc/TCut.h b/tree/tree/inc/TCut.h
index 7031a4a50612980c94c9f7476fcd9726a75b4602..888e9d6279e33fce74f3fa88f63eb51b21b27c93 100644
--- a/tree/tree/inc/TCut.h
+++ b/tree/tree/inc/TCut.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TCut : public TNamed {
private:
diff --git a/tree/tree/inc/TEntryList.h b/tree/tree/inc/TEntryList.h
index c63c8d88dbb3da11d59d75a6339a283bdddd09d9..91e5339be2687243155107b573549f5a41e3a1bd 100644
--- a/tree/tree/inc/TEntryList.h
+++ b/tree/tree/inc/TEntryList.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TEntryList
#define ROOT_TEntryList
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TTree;
class TDirectory;
diff --git a/tree/tree/inc/TEntryListArray.h b/tree/tree/inc/TEntryListArray.h
index b352ff0fe28b9f0e7ce350616c5e84615fc7ebf5..ac4f63eec609bc9ae13766eddff7d4ce55c8906f 100644
--- a/tree/tree/inc/TEntryListArray.h
+++ b/tree/tree/inc/TEntryListArray.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TEntryListArray
#define ROOT_TEntryListArray
-#ifndef ROOT_TEntryList
#include "TEntryList.h"
-#endif
class TTree;
class TDirectory;
@@ -101,9 +99,7 @@ public:
#ifndef ROOT_TEntryListArray
#define ROOT_TEntryListArray
-#ifndef ROOT_TEntryList
#include "TEntryList.h"
-#endif
class TTree;
class TDirectory;
diff --git a/tree/tree/inc/TEntryListBlock.h b/tree/tree/inc/TEntryListBlock.h
index 36e3491e4f15cc9516e3cf4e72192d67675b7665..172c0057138fc45b76068d5d9055441133d5a612 100644
--- a/tree/tree/inc/TEntryListBlock.h
+++ b/tree/tree/inc/TEntryListBlock.h
@@ -38,9 +38,7 @@
#ifndef ROOT_TEntryListBlock
#define ROOT_TEntryListBlock
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TEntryListBlock:public TObject
{
diff --git a/tree/tree/inc/TEventList.h b/tree/tree/inc/TEventList.h
index 1ce4274a7747663338ea59f065318b9ba70c46b3..bd0c15f395ae6d571d29422bc4b9856e63a2b0de 100644
--- a/tree/tree/inc/TEventList.h
+++ b/tree/tree/inc/TEventList.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TDirectory;
class TCollection;
diff --git a/tree/tree/inc/TFriendElement.h b/tree/tree/inc/TFriendElement.h
index 5d1a9896a300c1f5cc88b7d32c704fc456e183e2..c856a2b9f12cfb4a03fb90b568b504efec8a5021 100644
--- a/tree/tree/inc/TFriendElement.h
+++ b/tree/tree/inc/TFriendElement.h
@@ -24,9 +24,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TFile;
class TTree;
diff --git a/tree/tree/inc/TIndArray.h b/tree/tree/inc/TIndArray.h
index e2c8df7e14d862093a9d017b56436b816a72494a..dc3a7372a2271906fe723058218b4db39fb7501f 100644
--- a/tree/tree/inc/TIndArray.h
+++ b/tree/tree/inc/TIndArray.h
@@ -8,9 +8,7 @@
#ifndef ROOT_TIndArray
#define ROOT_TIndArray
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TIndArray
diff --git a/tree/tree/inc/TLeaf.h b/tree/tree/inc/TLeaf.h
index 707e4938fa82c13fff5f365868191e2f7b15e53e..5fcc27a5b341941dfd43ee9b90ea4999798fd0c1 100644
--- a/tree/tree/inc/TLeaf.h
+++ b/tree/tree/inc/TLeaf.h
@@ -24,9 +24,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBranch
#include "TBranch.h"
-#endif
class TClonesArray;
class TBrowser;
diff --git a/tree/tree/inc/TLeafB.h b/tree/tree/inc/TLeafB.h
index a9e1e03d102b3bbb6138f1d5db3103dcbc208a6d..9a13537dd92f2b286dbac3e5906501f58f435f59 100644
--- a/tree/tree/inc/TLeafB.h
+++ b/tree/tree/inc/TLeafB.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TLeaf
#include "TLeaf.h"
-#endif
class TLeafB : public TLeaf {
diff --git a/tree/tree/inc/TLeafC.h b/tree/tree/inc/TLeafC.h
index 33c939a3bfa93188633211efef8042ead8160f30..327befed603df75d10a5f93d24afb722c3cec535 100644
--- a/tree/tree/inc/TLeafC.h
+++ b/tree/tree/inc/TLeafC.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TLeaf
#include "TLeaf.h"
-#endif
class TLeafC : public TLeaf {
diff --git a/tree/tree/inc/TLeafD.h b/tree/tree/inc/TLeafD.h
index 50727e34c6040173cb6a77fe52e43cc15d2078a1..f7102e5b700724219f85d64df6b6523dc1f6df5a 100644
--- a/tree/tree/inc/TLeafD.h
+++ b/tree/tree/inc/TLeafD.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TLeaf
#include "TLeaf.h"
-#endif
class TLeafD : public TLeaf {
diff --git a/tree/tree/inc/TLeafElement.h b/tree/tree/inc/TLeafElement.h
index 975dfe05c58f13c294b42a0b7f4f7ecc001b239b..2b560a6470ac66682ab0d93b28fbef56646162fd 100644
--- a/tree/tree/inc/TLeafElement.h
+++ b/tree/tree/inc/TLeafElement.h
@@ -22,12 +22,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TLeaf
#include "TLeaf.h"
-#endif
-#ifndef ROOT_TBranchElement
#include "TBranchElement.h"
-#endif
class TMethodCall;
diff --git a/tree/tree/inc/TLeafF.h b/tree/tree/inc/TLeafF.h
index 855d0caec975da343142a8808066070fb9c309cc..b71a04ac906580c24484603dff3df51814577006 100644
--- a/tree/tree/inc/TLeafF.h
+++ b/tree/tree/inc/TLeafF.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TLeaf
#include "TLeaf.h"
-#endif
class TLeafF : public TLeaf {
diff --git a/tree/tree/inc/TLeafI.h b/tree/tree/inc/TLeafI.h
index e130b3142cc3ad74ad14c9235f2748a9a13aa349..4497c37b15a18e25f6a60d8fa45d76ec87cb077f 100644
--- a/tree/tree/inc/TLeafI.h
+++ b/tree/tree/inc/TLeafI.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TLeaf
#include "TLeaf.h"
-#endif
class TLeafI : public TLeaf {
diff --git a/tree/tree/inc/TLeafL.h b/tree/tree/inc/TLeafL.h
index bca2e712b49cfe545d7be9c55f9f56f8cca681e1..144347fc97ef3f6762727a0c9665524fe5ab9ec2 100644
--- a/tree/tree/inc/TLeafL.h
+++ b/tree/tree/inc/TLeafL.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TLeaf
#include "TLeaf.h"
-#endif
class TLeafL : public TLeaf {
diff --git a/tree/tree/inc/TLeafO.h b/tree/tree/inc/TLeafO.h
index 8d43b546891bdf39ac3f0d09a09c666a03c18882..6b57d498477b22a6b11438d8e2942d3ccce1ca33 100644
--- a/tree/tree/inc/TLeafO.h
+++ b/tree/tree/inc/TLeafO.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TLeaf
#include "TLeaf.h"
-#endif
class TLeafO : public TLeaf {
diff --git a/tree/tree/inc/TLeafObject.h b/tree/tree/inc/TLeafObject.h
index f563921bcbf1a147e15ee7ed2cfd398b7316cee8..b112915d65ef3b1ebb61b931ef4fb23944581da9 100644
--- a/tree/tree/inc/TLeafObject.h
+++ b/tree/tree/inc/TLeafObject.h
@@ -22,12 +22,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TLeaf
#include "TLeaf.h"
-#endif
-#ifndef ROOT_TClassRef
#include "TClassRef.h"
-#endif
class TClass;
class TMethodCall;
diff --git a/tree/tree/inc/TLeafS.h b/tree/tree/inc/TLeafS.h
index 168345665b63f043997984ef59ef6ec6c5e684b4..afc0906cf89d4f85a19046bc74a76ef573e67227 100644
--- a/tree/tree/inc/TLeafS.h
+++ b/tree/tree/inc/TLeafS.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TLeaf
#include "TLeaf.h"
-#endif
class TLeafS : public TLeaf {
diff --git a/tree/tree/inc/TNtuple.h b/tree/tree/inc/TNtuple.h
index 25cd3526fedf08be255bdd0a5277b604d3f5c75a..67cfbd8f1733e6d0a06ee6e8de8fdabe0a604373 100644
--- a/tree/tree/inc/TNtuple.h
+++ b/tree/tree/inc/TNtuple.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
class TBrowser;
diff --git a/tree/tree/inc/TNtupleD.h b/tree/tree/inc/TNtupleD.h
index b962fbab33b04672e1201b0f132d63e62803a549..3464237c7e0656335f3923e03e6883f0825a3c39 100644
--- a/tree/tree/inc/TNtupleD.h
+++ b/tree/tree/inc/TNtupleD.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
class TBrowser;
diff --git a/tree/tree/inc/TQueryResult.h b/tree/tree/inc/TQueryResult.h
index 0460d70f9979e2f7bcfa7a629d3b71f340e01942..b2de35ab753f7f928b17b249437947167d1f2451 100644
--- a/tree/tree/inc/TQueryResult.h
+++ b/tree/tree/inc/TQueryResult.h
@@ -21,18 +21,10 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TDatime
#include "TDatime.h"
-#endif
-#ifndef ROOT_TMacro
#include "TMacro.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TBrowser;
class TTreePlayer;
diff --git a/tree/tree/inc/TSelector.h b/tree/tree/inc/TSelector.h
index 9fa2175eb804babedff37884011d17ce30c22247..d3c772e55427a51f17574da25d8910a68ad072e1 100644
--- a/tree/tree/inc/TSelector.h
+++ b/tree/tree/inc/TSelector.h
@@ -22,15 +22,9 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TSelectorList
#include "TSelectorList.h"
-#endif
class TTree;
diff --git a/tree/tree/inc/TSelectorCint.h b/tree/tree/inc/TSelectorCint.h
index d2e470197c5ee780306882a46f894a336fca6a46..430c4fd6ed3a86311b37324b2421c2a00ade8479 100644
--- a/tree/tree/inc/TSelectorCint.h
+++ b/tree/tree/inc/TSelectorCint.h
@@ -25,12 +25,8 @@
#warning "TSelectorCint.h is deprecated. It will be removed in ROOT v6.12. Please use #include \"TSelector.h\", instead."
#endif
-#ifndef ROOT_TSelector
#include "TSelector.h"
-#endif
-#ifndef ROOT_TInterpreter
#include "TInterpreter.h"
-#endif
class TSelectorCint : public TSelector {
diff --git a/tree/tree/inc/TSelectorList.h b/tree/tree/inc/TSelectorList.h
index d953ae9c52a09e581be2333b8f9b0887755ed963..a6c1c152a6cc69362f37c76f02b0d6efeae17d62 100644
--- a/tree/tree/inc/TSelectorList.h
+++ b/tree/tree/inc/TSelectorList.h
@@ -25,9 +25,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_THashList
#include "THashList.h"
-#endif
class TSelectorList : public THashList {
diff --git a/tree/tree/inc/TSelectorScalar.h b/tree/tree/inc/TSelectorScalar.h
index 6934f99af88090ad72c543f57b824bcb0090fee7..9599f327802a6ab6892e643cecabea7197a87b1b 100644
--- a/tree/tree/inc/TSelectorScalar.h
+++ b/tree/tree/inc/TSelectorScalar.h
@@ -25,13 +25,9 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TParameter
#include "TParameter.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
class TCollection;
diff --git a/tree/tree/inc/TTree.h b/tree/tree/inc/TTree.h
index f581411537df498713aead348205bac529afbd85..826280fb49b1918c50c4bf30673b48e5a8bb9e31 100644
--- a/tree/tree/inc/TTree.h
+++ b/tree/tree/inc/TTree.h
@@ -26,49 +26,27 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBranch
#include "TBranch.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttMarker
#include "TAttMarker.h"
-#endif
-#ifndef ROOT_TArrayD
#include "TArrayD.h"
-#endif
-#ifndef ROOT_TArrayI
#include "TArrayI.h"
-#endif
-#ifndef ROOT_TBuffer
#include "TBuffer.h"
-#endif
-#ifndef ROOT_TDataType
#include "TDataType.h"
-#endif
-#ifndef ROOT_TClass
#include "TClass.h"
-#endif
-#ifndef ROOT_TVirtualTreePlayer
#include "TVirtualTreePlayer.h"
-#endif
#include <atomic>
diff --git a/tree/tree/inc/TTreeCache.h b/tree/tree/inc/TTreeCache.h
index de595d69c1996847ee1991abe72b97d046e03368..b34b27b64c1ab359821d1ee8ed45418c6cdff1e7 100644
--- a/tree/tree/inc/TTreeCache.h
+++ b/tree/tree/inc/TTreeCache.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TFileCacheRead
#include "TFileCacheRead.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
class TTree;
class TBranch;
diff --git a/tree/tree/inc/TTreeCacheUnzip.h b/tree/tree/inc/TTreeCacheUnzip.h
index bb802f51ee11c8b7b89698df39230203858ade4a..75a34127906abfd97f43623812b26fef3d97f3e3 100644
--- a/tree/tree/inc/TTreeCacheUnzip.h
+++ b/tree/tree/inc/TTreeCacheUnzip.h
@@ -25,9 +25,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTreeCache
#include "TTreeCache.h"
-#endif
#include <queue>
diff --git a/tree/tree/inc/TTreeCloner.h b/tree/tree/inc/TTreeCloner.h
index 8cc67fd4393538f865fa645e3d57acd3d5d6dbaf..fa7d1f94ce94095934ca904e3f9a2b46c31c8fa3 100644
--- a/tree/tree/inc/TTreeCloner.h
+++ b/tree/tree/inc/TTreeCloner.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
#include <vector>
diff --git a/tree/tree/inc/TTreeResult.h b/tree/tree/inc/TTreeResult.h
index d4ddcc2834a3e20ad2611921402c1c723145854e..ab10ada948d5d928bf9d2fde760073544385844a 100644
--- a/tree/tree/inc/TTreeResult.h
+++ b/tree/tree/inc/TTreeResult.h
@@ -25,9 +25,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSQLResult
#include "TSQLResult.h"
-#endif
class TString;
class TObjArray;
diff --git a/tree/tree/inc/TTreeRow.h b/tree/tree/inc/TTreeRow.h
index 25aff19b5d1af00c57999d9d63f918f0821ad551..d37aa2f3bf0af2890864cb4974130f3106275885 100644
--- a/tree/tree/inc/TTreeRow.h
+++ b/tree/tree/inc/TTreeRow.h
@@ -24,9 +24,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSQLRow
#include "TSQLRow.h"
-#endif
class TTreeRow : public TSQLRow {
diff --git a/tree/tree/inc/TTreeSQL.h b/tree/tree/inc/TTreeSQL.h
index baa4c4a62cd5aeb8fd3a01fa3f937bdc57117825..96fe4b0eab21f84e5b1a388fa64e1842a3a4efcb 100644
--- a/tree/tree/inc/TTreeSQL.h
+++ b/tree/tree/inc/TTreeSQL.h
@@ -30,9 +30,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
#include <vector>
diff --git a/tree/tree/inc/TVirtualIndex.h b/tree/tree/inc/TVirtualIndex.h
index b3ac66d65e51f7f5cb7eee61a4e7e7e73968ac4a..fd2774b29b37846d4172258022fa09efe3e8edff 100644
--- a/tree/tree/inc/TVirtualIndex.h
+++ b/tree/tree/inc/TVirtualIndex.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TTree;
diff --git a/tree/tree/inc/TVirtualTreePlayer.h b/tree/tree/inc/TVirtualTreePlayer.h
index c8b97d1eaa48c8f6348f73304b884faebd15e48b..fe9dbdb2a1af1747b3ed5f0d42ad08a16c78022f 100644
--- a/tree/tree/inc/TVirtualTreePlayer.h
+++ b/tree/tree/inc/TVirtualTreePlayer.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
#include <limits>
diff --git a/tree/tree/inc/TreeUtils.h b/tree/tree/inc/TreeUtils.h
index 62bfa5ba80ab5113e6a8707ddac318ab5ab8eabf..7ffb38e7cbe35c00811899515eb452da787ea07c 100644
--- a/tree/tree/inc/TreeUtils.h
+++ b/tree/tree/inc/TreeUtils.h
@@ -24,9 +24,7 @@
#include <iosfwd>
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
namespace ROOT {
namespace TreeUtils {
diff --git a/tree/treeplayer/inc/TBranchProxy.h b/tree/treeplayer/inc/TBranchProxy.h
index 37c5dabe6afaef613eec91aed21c2e5752c834a6..5393bd317ab29db69b26fcf98b95847aafec5b1d 100644
--- a/tree/treeplayer/inc/TBranchProxy.h
+++ b/tree/treeplayer/inc/TBranchProxy.h
@@ -12,30 +12,14 @@
#ifndef ROOT_TBranchProxy
#define ROOT_TBranchProxy
-#ifndef ROOT_TBranchProxyDirector
#include "TBranchProxyDirector.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TBranch
#include "TBranch.h"
-#endif
-#ifndef ROOT_TClonesArray
#include "TClonesArray.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_Riostream
#include "Riostream.h"
-#endif
-#ifndef ROOT_TError
#include "TError.h"
-#endif
-#ifndef ROOT_TVirtualCollectionProxy
#include "TVirtualCollectionProxy.h"
-#endif
#include <list>
#include <algorithm>
diff --git a/tree/treeplayer/inc/TBranchProxyClassDescriptor.h b/tree/treeplayer/inc/TBranchProxyClassDescriptor.h
index 90b5c516d5f1fff621a38bfb3f40cb993e750df9..cb89fc6d8d3d861c8096082d686fdb21752855c5 100644
--- a/tree/treeplayer/inc/TBranchProxyClassDescriptor.h
+++ b/tree/treeplayer/inc/TBranchProxyClassDescriptor.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TBranchProxyClassDescriptor
#define ROOT_TBranchProxyClassDescriptor
-#ifndef ROOT_TList
#include "TList.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TTree;
class TVirtualStreamerInfo;
diff --git a/tree/treeplayer/inc/TBranchProxyDescriptor.h b/tree/treeplayer/inc/TBranchProxyDescriptor.h
index fdfdfb570c8aa52067c1c327d9023934cc365852..ec8a6c5fd551f03528790a5147b8723f2282c242 100644
--- a/tree/treeplayer/inc/TBranchProxyDescriptor.h
+++ b/tree/treeplayer/inc/TBranchProxyDescriptor.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TBranchProxyDescriptor
#define ROOT_TBranchProxyDescriptor
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
namespace ROOT {
diff --git a/tree/treeplayer/inc/TBranchProxyDirector.h b/tree/treeplayer/inc/TBranchProxyDirector.h
index c83fdc7ec9c554ab591050bdff4a2cb3cad83639..5ac0eda0ef10598be8d08b157b9670f2b8e761c4 100644
--- a/tree/treeplayer/inc/TBranchProxyDirector.h
+++ b/tree/treeplayer/inc/TBranchProxyDirector.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TBranchProxyDirector
#define ROOT_TBranchProxyDirector
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
#include <list>
diff --git a/tree/treeplayer/inc/TBranchProxyTemplate.h b/tree/treeplayer/inc/TBranchProxyTemplate.h
index 463d798ffd2d6293754794fdf9c8f59956aa6eb6..7c75e750941c4d3c6e2b91e710582990ee1c6200 100644
--- a/tree/treeplayer/inc/TBranchProxyTemplate.h
+++ b/tree/treeplayer/inc/TBranchProxyTemplate.h
@@ -17,9 +17,7 @@
# error "Please regenerate this file using TTree::MakeProxy()!"
#endif
-#ifndef ROOT_TBranchProxy
#include "TBranchProxy.h"
-#endif
#define InjecTBranchProxyInterface() \
ROOT::Detail::TBranchProxy *GetProxy() { return obj.GetProxy(); } \
diff --git a/tree/treeplayer/inc/TChainIndex.h b/tree/treeplayer/inc/TChainIndex.h
index b0c8ccd4e131e11c7db92c07bf12745ba2c39106..6a649c892d73d469820600221833122697cad270 100644
--- a/tree/treeplayer/inc/TChainIndex.h
+++ b/tree/treeplayer/inc/TChainIndex.h
@@ -28,9 +28,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualIndex
#include "TVirtualIndex.h"
-#endif
#include <vector>
diff --git a/tree/treeplayer/inc/TFileDrawMap.h b/tree/treeplayer/inc/TFileDrawMap.h
index f25ccef014b3ae3ac7b275ce7aab0bb96640c145..680b91391bb25bd18aca7a252a9524e9caef37a1 100644
--- a/tree/treeplayer/inc/TFileDrawMap.h
+++ b/tree/treeplayer/inc/TFileDrawMap.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TH1;
class TFile;
diff --git a/tree/treeplayer/inc/TFormLeafInfo.h b/tree/treeplayer/inc/TFormLeafInfo.h
index b6be69304c0931a6fc8976a485a45423f41d9302..7a2c0f124b0b7dca181b8042b07b6435b5a28793 100644
--- a/tree/treeplayer/inc/TFormLeafInfo.h
+++ b/tree/treeplayer/inc/TFormLeafInfo.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TFormLeafInfo
#define ROOT_TFormLeafInfo
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TLeafElement
#include "TLeafElement.h"
-#endif
#include "TArrayI.h"
#include "TDataType.h"
diff --git a/tree/treeplayer/inc/TFormLeafInfoReference.h b/tree/treeplayer/inc/TFormLeafInfoReference.h
index c9887fee1bf7ef59c093f92f0b574508f3743328..a3313d4c46af5f75fa63fc4ba9401a425a4f6f46 100644
--- a/tree/treeplayer/inc/TFormLeafInfoReference.h
+++ b/tree/treeplayer/inc/TFormLeafInfoReference.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TFormLeafInfoReference
#define ROOT_TFormLeafInfoReference
-#ifndef ROOT_TFormLeafInfo
#include "TFormLeafInfo.h"
-#endif
#include <string>
diff --git a/tree/treeplayer/inc/TFriendProxy.h b/tree/treeplayer/inc/TFriendProxy.h
index 57948be4e57f1565113f1005d0c8a47956deb818..07abbabf4e8d0273e3d7979f5cbad9071264148c 100644
--- a/tree/treeplayer/inc/TFriendProxy.h
+++ b/tree/treeplayer/inc/TFriendProxy.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TFriendProxy
#define ROOT_TFriendProxy
-#ifndef ROOT_TBranchProxyDirector
#include "TBranchProxyDirector.h"
-#endif
class TTree;
diff --git a/tree/treeplayer/inc/TFriendProxyDescriptor.h b/tree/treeplayer/inc/TFriendProxyDescriptor.h
index 78749ecc5cee270636ea380185bc5c3bcac8c219..242719e4ab9dcaae24a2f45676b3fc5e638e637a 100644
--- a/tree/treeplayer/inc/TFriendProxyDescriptor.h
+++ b/tree/treeplayer/inc/TFriendProxyDescriptor.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TFriendProxyDescriptor
#define ROOT_TFriendProxyDescriptor
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
namespace ROOT {
diff --git a/tree/treeplayer/inc/TRefArrayProxy.h b/tree/treeplayer/inc/TRefArrayProxy.h
index edd5548b3a240d42ba715daae01405e8cb995d60..5073ded5ce8b1d583dbf8a6184a05df0719fd125 100644
--- a/tree/treeplayer/inc/TRefArrayProxy.h
+++ b/tree/treeplayer/inc/TRefArrayProxy.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TRefArrayProxy
#define ROOT_TRefArrayProxy
-#ifndef ROOT_TRefProxy
#include "TRefProxy.h"
-#endif
//______________________________________________________________________________
//
diff --git a/tree/treeplayer/inc/TRefProxy.h b/tree/treeplayer/inc/TRefProxy.h
index 106b2a804ae4d8d8ed12e7194c88683e80636982..db893c8e3cb48fefe14b514a8c9d1308dd2dc2db 100644
--- a/tree/treeplayer/inc/TRefProxy.h
+++ b/tree/treeplayer/inc/TRefProxy.h
@@ -15,13 +15,9 @@
#include <map>
#include <string>
-#ifndef ROOT_TVirtualRefProxy
#include "TVirtualRefProxy.h"
-#endif
-#ifndef ROOT_TClassRef
#include "TClassRef.h"
-#endif
// Forward declarations
class TFormLeafInfoReference;
diff --git a/tree/treeplayer/inc/TSelectorDraw.h b/tree/treeplayer/inc/TSelectorDraw.h
index cb1289baa4e81b335476385fa845603dc21f2503..17623cfbbf13067664fd4421ab357f1adab84255 100644
--- a/tree/treeplayer/inc/TSelectorDraw.h
+++ b/tree/treeplayer/inc/TSelectorDraw.h
@@ -21,9 +21,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TSelector
#include "TSelector.h"
-#endif
class TTreeFormula;
class TTreeFormulaManager;
diff --git a/tree/treeplayer/inc/TTreeDrawArgsParser.h b/tree/treeplayer/inc/TTreeDrawArgsParser.h
index ac3c5c23a03466cd1b6c220c29511fd3f9b10b8d..a24ae61e3aacbcae7d70b5c6cdce5e03a199d58b 100644
--- a/tree/treeplayer/inc/TTreeDrawArgsParser.h
+++ b/tree/treeplayer/inc/TTreeDrawArgsParser.h
@@ -21,13 +21,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TTreeDrawArgsParser : public TObject {
diff --git a/tree/treeplayer/inc/TTreeFormula.h b/tree/treeplayer/inc/TTreeFormula.h
index 81c48a626a1007e49d858e811a9bccfeb4f8328b..db7d7e56df38e66e479beb2d0d3cdd34e5a154d8 100644
--- a/tree/treeplayer/inc/TTreeFormula.h
+++ b/tree/treeplayer/inc/TTreeFormula.h
@@ -23,17 +23,11 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_v5_TFormula
#include "v5/TFormula.h"
-#endif
-#ifndef ROOT_TLeaf
#include "TLeaf.h"
-#endif
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
#include <string>
#include <vector>
diff --git a/tree/treeplayer/inc/TTreeFormulaManager.h b/tree/treeplayer/inc/TTreeFormulaManager.h
index ce60a91c18f8053005c4fc44d85d1c9ba47ee2e3..f3cd328f23b5c60d7393f31bc2ac38182699d9cb 100644
--- a/tree/treeplayer/inc/TTreeFormulaManager.h
+++ b/tree/treeplayer/inc/TTreeFormulaManager.h
@@ -22,9 +22,7 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObjArray
#include "TObjArray.h"
-#endif
#include "TTreeFormula.h"
diff --git a/tree/treeplayer/inc/TTreeGeneratorBase.h b/tree/treeplayer/inc/TTreeGeneratorBase.h
index ea8cee226b047e54e6fc6545320ca6612503f42a..c00edaefd41a00e6439cc5212891059264cba2f4 100644
--- a/tree/treeplayer/inc/TTreeGeneratorBase.h
+++ b/tree/treeplayer/inc/TTreeGeneratorBase.h
@@ -21,12 +21,8 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Tlist
#include "TList.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TBranch;
class TBranchElement;
diff --git a/tree/treeplayer/inc/TTreeIndex.h b/tree/treeplayer/inc/TTreeIndex.h
index e0ac9e442a014df021b5d77d4adf4951b16a3b7e..31f0ef183e5b8a2eb2fe926d104314f4d137486f 100644
--- a/tree/treeplayer/inc/TTreeIndex.h
+++ b/tree/treeplayer/inc/TTreeIndex.h
@@ -22,12 +22,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualIndex
#include "TVirtualIndex.h"
-#endif
-#ifndef ROOT_TTreeFormula
#include "TTreeFormula.h"
-#endif
class TTreeIndex : public TVirtualIndex {
diff --git a/tree/treeplayer/inc/TTreePerfStats.h b/tree/treeplayer/inc/TTreePerfStats.h
index 3ebad5d6de1780062994ee8769b451d4d78c13d2..01160c4795f42667197c9ecb40baf11ea81b8de4 100644
--- a/tree/treeplayer/inc/TTreePerfStats.h
+++ b/tree/treeplayer/inc/TTreePerfStats.h
@@ -21,12 +21,8 @@
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TVirtualPerfStats
#include "TVirtualPerfStats.h"
-#endif
-#ifndef ROOT_TString
#include "TString.h"
-#endif
class TBrowser;
diff --git a/tree/treeplayer/inc/TTreePlayer.h b/tree/treeplayer/inc/TTreePlayer.h
index 87fdcf2ce8fb6962d1936e19cc3cf96ba6fe809c..1d192cf097ec47ad3b8bf41c33ca9d306259fa56 100644
--- a/tree/treeplayer/inc/TTreePlayer.h
+++ b/tree/treeplayer/inc/TTreePlayer.h
@@ -27,15 +27,9 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TSelectorDraw
#include "TSelectorDraw.h"
-#endif
-#ifndef ROOT_TVirtualTreePlayer
#include "TVirtualTreePlayer.h"
-#endif
class TVirtualIndex;
diff --git a/tree/treeplayer/inc/TTreeReader.h b/tree/treeplayer/inc/TTreeReader.h
index 86268d02c1e77062183468dac255220f9000a8ac..1155918fe95f22548fd5cc466cb4b275fd634a0e 100644
--- a/tree/treeplayer/inc/TTreeReader.h
+++ b/tree/treeplayer/inc/TTreeReader.h
@@ -22,15 +22,9 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_THashTable
#include "THashTable.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
-#ifndef ROOT_TTreeReaderUtils
#include "TTreeReaderUtils.h"
-#endif
#include <deque>
#include <iterator>
diff --git a/tree/treeplayer/inc/TTreeReaderArray.h b/tree/treeplayer/inc/TTreeReaderArray.h
index 8e2b3145673997aca3b6e0a8eb7cd4dde9a1d9e0..cb29140528a84620b8f82a6383efcd92b7255f34 100644
--- a/tree/treeplayer/inc/TTreeReaderArray.h
+++ b/tree/treeplayer/inc/TTreeReaderArray.h
@@ -22,12 +22,8 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TTreeReaderValue
#include "TTreeReaderValue.h"
-#endif
-#ifndef ROOT_TTreeReaderUtils
#include "TTreeReaderUtils.h"
-#endif
namespace ROOT {
namespace Internal {
diff --git a/tree/treeplayer/inc/TTreeReaderGenerator.h b/tree/treeplayer/inc/TTreeReaderGenerator.h
index 6260762d759ce1b26fe4218fa2df6e79175051a2..bf2515aa20bf289cd7eb600a6d9cca725f022b6a 100644
--- a/tree/treeplayer/inc/TTreeReaderGenerator.h
+++ b/tree/treeplayer/inc/TTreeReaderGenerator.h
@@ -23,9 +23,7 @@
#include "TTreeGeneratorBase.h"
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TBranch;
class TBranchElement;
diff --git a/tree/treeplayer/inc/TTreeReaderUtils.h b/tree/treeplayer/inc/TTreeReaderUtils.h
index a796b686c22ee3f4694ed2ec0981c75c244377e2..f0e3028b944cca8cf51355c20dd7c0a559d36cee 100644
--- a/tree/treeplayer/inc/TTreeReaderUtils.h
+++ b/tree/treeplayer/inc/TTreeReaderUtils.h
@@ -22,12 +22,8 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TBranchProxyDirector
#include "TBranchProxyDirector.h"
-#endif
-#ifndef ROOT_TBranchProxy
#include "TBranchProxy.h"
-#endif
#include "TTreeReaderValue.h"
class TDictionary;
diff --git a/tree/treeplayer/inc/TTreeReaderValue.h b/tree/treeplayer/inc/TTreeReaderValue.h
index e1a90bf57940d51511b5e0ac8c35f8e60881d169..89306de3c6892e09cd9a888c8b4719609f53d433 100644
--- a/tree/treeplayer/inc/TTreeReaderValue.h
+++ b/tree/treeplayer/inc/TTreeReaderValue.h
@@ -22,15 +22,9 @@
// //
////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TString
#include "TString.h"
-#endif
-#ifndef ROOT_TDictionary
#include "TDictionary.h"
-#endif
-#ifndef ROOT_TBranchProxy
#include "TBranchProxy.h"
-#endif
#include <type_traits>
diff --git a/tree/treeplayer/inc/TTreeTableInterface.h b/tree/treeplayer/inc/TTreeTableInterface.h
index 6c9f62a2cfa766e9f27033e1c322ba52b1c52784..3774e2d571fa2bc422f59149357f05c7a6ec2f1b 100644
--- a/tree/treeplayer/inc/TTreeTableInterface.h
+++ b/tree/treeplayer/inc/TTreeTableInterface.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TTreeTableInterface
#define ROOT_TTreeTableInterface
-#ifndef ROOT_TVirtualTableInterface
#include "TVirtualTableInterface.h"
-#endif
class TTree;
class TObjArray;
diff --git a/tree/treeviewer/inc/HelpTextTV.h b/tree/treeviewer/inc/HelpTextTV.h
index 4dce6a9e3f82fc03d9de0002207ab7044cee2524..7b3f4e04a997529634a2acdedb4a38f9bcc38ded 100644
--- a/tree/treeviewer/inc/HelpTextTV.h
+++ b/tree/treeviewer/inc/HelpTextTV.h
@@ -12,9 +12,7 @@
#ifndef ROOT_HelpTextTV
#define ROOT_HelpTextTV
-#ifndef ROOT_Rtypes
#include <Rtypes.h>
-#endif
R__EXTERN const char gTVHelpAbout[];
R__EXTERN const char gTVHelpStart[];
diff --git a/tree/treeviewer/inc/TGTreeTable.h b/tree/treeviewer/inc/TGTreeTable.h
index e01ca43c51831ba6e483284bc716e422012bb3bc..7fe4f945c5ff45bdf2e24f1a8e94092d006bb33d 100644
--- a/tree/treeviewer/inc/TGTreeTable.h
+++ b/tree/treeviewer/inc/TGTreeTable.h
@@ -11,9 +11,7 @@
#ifndef ROOT_TGTreeTable
#define ROOT_TGTreeTable
-#ifndef ROOT_TGTable
#include "TGTable.h"
-#endif
class TTreeTableInterface;
class TTree;
diff --git a/tree/treeviewer/inc/TMemStatShow.h b/tree/treeviewer/inc/TMemStatShow.h
index eee347830d871ff36b6ab29d49e698a14b83c143..27a5fdd9b1d3bf242ae32806054bc738770a90ee 100644
--- a/tree/treeviewer/inc/TMemStatShow.h
+++ b/tree/treeviewer/inc/TMemStatShow.h
@@ -22,9 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
class TTree;
class TH1D;
diff --git a/tree/treeviewer/inc/TParallelCoord.h b/tree/treeviewer/inc/TParallelCoord.h
index c45bd79d9ae3479a4810103d65966539c29a1af6..6e263b1a179c215616f724fbce9e6679c5b5fe64 100644
--- a/tree/treeviewer/inc/TParallelCoord.h
+++ b/tree/treeviewer/inc/TParallelCoord.h
@@ -12,12 +12,8 @@
#ifndef ROOT_TParallelCoord
#define ROOT_TParallelCoord
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
class TTree;
class TPaveText;
diff --git a/tree/treeviewer/inc/TParallelCoordEditor.h b/tree/treeviewer/inc/TParallelCoordEditor.h
index 0dbadc83c0cfae6f42ed22fea3b446eabfddf0dd..42e554c6408fba4bd4caba68fb4b5938a397a278 100644
--- a/tree/treeviewer/inc/TParallelCoordEditor.h
+++ b/tree/treeviewer/inc/TParallelCoordEditor.h
@@ -12,9 +12,7 @@
#ifndef ROOT_TParallelCoordEditor
#define ROOT_TParallelCoordEditor
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TParallelCoord;
class TGCheckButton;
diff --git a/tree/treeviewer/inc/TParallelCoordRange.h b/tree/treeviewer/inc/TParallelCoordRange.h
index 316b97bf0cf8a264050622a8cdcce0cef911b4e3..c1c4722e7a7b0be08e7e1342dd1e9286fab074ef 100644
--- a/tree/treeviewer/inc/TParallelCoordRange.h
+++ b/tree/treeviewer/inc/TParallelCoordRange.h
@@ -12,13 +12,9 @@
#ifndef ROOT_TParallelCoordRange
#define ROOT_TParallelCoordRange
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
class TParallelCoordVar;
class TParallelCoord;
@@ -74,12 +70,8 @@ public:
#ifndef ROOT_TParallelCoordSelect
#define ROOT_TParallelCoordSelect
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TList
#include "TList.h"
-#endif
class TParallelCoord;
class TParallelCoordRange;
diff --git a/tree/treeviewer/inc/TParallelCoordVar.h b/tree/treeviewer/inc/TParallelCoordVar.h
index fe4d85d970c776e465a660e8bf9db0f76fbceff7..5bd1fc2975f7d852e557e61a825392981f5f8ea4 100644
--- a/tree/treeviewer/inc/TParallelCoordVar.h
+++ b/tree/treeviewer/inc/TParallelCoordVar.h
@@ -12,15 +12,9 @@
#ifndef ROOT_TParallelCoordVar
#define ROOT_TParallelCoordVar
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TNamed
#include "TNamed.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
class TParallelCoord;
class TParallelCoordSelect;
diff --git a/tree/treeviewer/inc/TSpider.h b/tree/treeviewer/inc/TSpider.h
index 8af121641cdf2c682f945c103eb2c3e51a2f8439..f679cb3160c1adffba5cfff4af322f492a080b83 100644
--- a/tree/treeviewer/inc/TSpider.h
+++ b/tree/treeviewer/inc/TSpider.h
@@ -21,21 +21,13 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_Object
#include "TObject.h"
-#endif
-#ifndef ROOT_TAttFill
#include "TAttFill.h"
-#endif
-#ifndef ROOT_TAttLine
#include "TAttLine.h"
-#endif
-#ifndef ROOT_TAttText
#include "TAttText.h"
-#endif
class TTree;
class TGraphPolargram;
diff --git a/tree/treeviewer/inc/TSpiderEditor.h b/tree/treeviewer/inc/TSpiderEditor.h
index 6f2ff7614268d66ccb412aeb01b2fa7a2cf640ce..430f5205b3cf728904e75720b65cdac87a2b5a17 100644
--- a/tree/treeviewer/inc/TSpiderEditor.h
+++ b/tree/treeviewer/inc/TSpiderEditor.h
@@ -20,9 +20,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGedFrame
#include "TGedFrame.h"
-#endif
class TSpider;
class TGCheckButton;
diff --git a/tree/treeviewer/inc/TTVLVContainer.h b/tree/treeviewer/inc/TTVLVContainer.h
index 840faa8f8cacb5b208f210b311adc493cb90c04f..085b6f708b45811be59802a2ed2f0101831d4560 100644
--- a/tree/treeviewer/inc/TTVLVContainer.h
+++ b/tree/treeviewer/inc/TTVLVContainer.h
@@ -23,9 +23,7 @@
// //
//////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGListView
#include "TGListView.h"
-#endif
class TGLabel;
diff --git a/tree/treeviewer/inc/TTVSession.h b/tree/treeviewer/inc/TTVSession.h
index ccfe27ef1d354c0a0064eb4aed4db86c5a14bce3..0add430ce77730d958a93105732141ce11746ac4 100644
--- a/tree/treeviewer/inc/TTVSession.h
+++ b/tree/treeviewer/inc/TTVSession.h
@@ -19,9 +19,7 @@
// //
///////////////////////////////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
class TTreeViewer;
class TClonesArray;
diff --git a/tree/treeviewer/inc/TTreeViewer.h b/tree/treeviewer/inc/TTreeViewer.h
index aa35f849f32f3a22a56e9bebf30a816465b50983..119fe0683d153b9a3b5cea8f2719882e60ad84c7 100644
--- a/tree/treeviewer/inc/TTreeViewer.h
+++ b/tree/treeviewer/inc/TTreeViewer.h
@@ -18,13 +18,9 @@
// //
////////////////////////////////////////////////////
-#ifndef ROOT_TGFrame
#include "TGFrame.h"
-#endif
-#ifndef ROOT_TTree
#include "TTree.h"
-#endif
class TTreeViewer;
class TTVLVContainer;
diff --git a/tutorials/cocoa/customcolor.h b/tutorials/cocoa/customcolor.h
index 6b5163fc5a3902b550da3be63a22169a8c5027f0..eaa3f87d09507658f9b01095398e94fcff75f1c9 100644
--- a/tutorials/cocoa/customcolor.h
+++ b/tutorials/cocoa/customcolor.h
@@ -5,15 +5,9 @@
#include <algorithm>
-#ifndef ROOT_TError //'ROOT-style' inclusion guards.
#include "TError.h"
-#endif
-#ifndef ROOT_Rtypes
#include "Rtypes.h"
-#endif
-#ifndef ROOT_TROOT
#include "TROOT.h"
-#endif
namespace ROOT {
namespace CocoaTutorials {
diff --git a/tutorials/gl/customcolorgl.h b/tutorials/gl/customcolorgl.h
index 04f5d482ca47977652a64a1d679cc610fabb7e49..ce06fb481375098464c329c5989c9fec212a9044 100644
--- a/tutorials/gl/customcolorgl.h
+++ b/tutorials/gl/customcolorgl.h
@@ -5,12 +5,8 @@
#include <algorithm>
-#ifndef ROOT_TError //'ROOT-style' inclusion guards.
#include "TError.h"
-#endif
-#ifndef ROOT_TROOT
#include "TROOT.h"
-#endif
namespace ROOT {
namespace GLTutorials {
diff --git a/tutorials/proof/ProcFileElements.h b/tutorials/proof/ProcFileElements.h
index 84568929cc93269719a3915d03dab75c8fddfd27..18976e55ace86e53f868c9a7355ac778d8720863 100644
--- a/tutorials/proof/ProcFileElements.h
+++ b/tutorials/proof/ProcFileElements.h
@@ -12,12 +12,8 @@
#define ROOT_ProcFileElements
-#ifndef ROOT_TObject
#include "TObject.h"
-#endif
-#ifndef ROOT_TSortedList
#include "TSortedList.h"
-#endif
class ProcFileElements : public TObject {