Optimize tree includes

tree/tree/inc/ROOT/TIOFeatures.hxx

@@ -17,7 +17,7 @@ class TBasket;
 class TBranch;
 class TTree;
 
-// keep it here to have a note that was removed  
+// keep it here to have a note that was removed
 // #ifndef R__LESS_INCLUDES
 // #include "TBasket.h"
 // #include <memory>

tree/tree/inc/TBranch.h

@@ -23,14 +23,12 @@
 //     the list of TLeaves (branch description)                         //
 //////////////////////////////////////////////////////////////////////////
 
-#include <memory>
-
-#include "Compression.h"
+#include "TNamed.h"
 #include "TAttFill.h"
+#include "TObjArray.h"
 #include "TBranchCacheInfo.h"
 #include "TDataType.h"
-#include "TNamed.h"
-#include "TObjArray.h"
+#include "Compression.h"
 #include "ROOT/TIOFeatures.hxx"
 
 class TTree;

tree/tree/inc/TBranchElement.h

@@ -27,8 +27,6 @@
 
 #include "TTree.h"
 
-#include "TError.h"
-
 class TFolder;
 class TStreamerInfo;
 class TVirtualCollectionProxy;

tree/tree/inc/TBranchRef.h

@@ -22,7 +22,12 @@
 
 
 #include "TBranch.h"
+
+#ifdef R__LESS_INCLUDES
+class TRefTable;
+#else
 #include "TRefTable.h"
+#endif
 
 class TTree;
 

tree/tree/inc/TChain.h

@@ -22,7 +22,6 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "TTree.h"
-#include <iosfwd>
 
 class TFile;
 class TBrowser;

tree/tree/inc/TLeaf.h

@@ -41,7 +41,13 @@
 //////////////////////////////////////////////////////////////////////////
 
 
+#include "TNamed.h"
+
+#ifdef R__LESS_INCLUDES
+class TBranch;
+#else
 #include "TBranch.h"
+#endif
 
 class TClonesArray;
 class TBrowser;

tree/tree/inc/TLeafD32.h

@@ -20,9 +20,11 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#include "TStreamerElement.h"
 #include "TLeaf.h"
 
+class TStreamerElement;
+
+
 class TLeafD32 : public TLeaf {
 
 protected:

tree/tree/inc/TLeafF16.h

@@ -20,9 +20,10 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#include "TStreamerElement.h"
 #include "TLeaf.h"
 
+class TStreamerElement;
+
 class TLeafF16 : public TLeaf {
 
 protected:

tree/tree/inc/TQueryResult.h

@@ -23,9 +23,14 @@
 
 #include "TNamed.h"
 #include "TDatime.h"
-#include "TMacro.h"
 #include "TString.h"
 
+#ifdef R__LESS_INCLUDES
+class TMacro;
+#else
+#include "TMacro.h"
+#endif
+
 class TBrowser;
 class TTreePlayer;
 class TQueryResult;

tree/tree/inc/TSelector.h

@@ -26,10 +26,8 @@
 #include "TString.h"
 #include "TSelectorList.h"
 
-
 class TTree;
 
-
 class TSelector : public TObject {
 
 public:

tree/tree/inc/TTreeCache.h

@@ -23,9 +23,6 @@
 
 #include "TFileCacheRead.h"
 
-#include <cstdint>
-#include <memory>
-#include <utility>
 #include <vector>
 
 class TTree;

tree/tree/src/TBranchBrowsable.cxx

@@ -25,6 +25,7 @@
 #include "TStreamerElement.h"
 #include "TVirtualCollectionProxy.h"
 #include "TRef.h"
+#include "TError.h"
 #include <algorithm>
 
 ClassImp(TVirtualBranchBrowsable);

tree/tree/src/TBranchRef.cxx

@@ -32,9 +32,9 @@ TObjArray.
 */
 
 #include "TBranchRef.h"
-#include "TBuffer.h"
 #include "TTree.h"
 #include "TBasket.h"
+#include "TRefTable.h"
 #include "TFile.h"
 #include "TFriendElement.h"
 

tree/tree/src/TChain.cxx

@@ -46,6 +46,7 @@ the trees in the chain.
 #include "TPluginManager.h"
 #include "TROOT.h"
 #include "TRegexp.h"
+#include "Riostream.h"
 #include "TSelector.h"
 #include "TSystem.h"
 #include "TTree.h"

tree/tree/src/TLeafD32.cxx

@@ -19,6 +19,7 @@ A TLeaf for a 24 bit truncated floating point data type.
 #include "TBranch.h"
 #include "TBuffer.h"
 #include "TClonesArray.h"
+#include "TStreamerElement.h"
 #include "Riostream.h"
 
 ClassImp(TLeafD32);

tree/tree/src/TLeafF16.cxx

@@ -19,6 +19,7 @@ A TLeaf for a 24 bit truncated floating point data type.
 #include "TBranch.h"
 #include "TBuffer.h"
 #include "TClonesArray.h"
+#include "TStreamerElement.h"
 #include "Riostream.h"
 
 ClassImp(TLeafF16);

tree/tree/src/TQueryResult.cxx

@@ -18,11 +18,11 @@ A container class for query results.
 #include <string.h>
 
 #include "TBrowser.h"
-#include "TError.h"
 #include "TEventList.h"
 #include "TQueryResult.h"
 #include "TRegexp.h"
 #include "TROOT.h"
+#include "TMacro.h"
 #include "TMath.h"
 #include "TSelector.h"
 #include "TSystem.h"

tree/tree/src/TTree.cxx

@@ -395,6 +395,7 @@ End_Macro
 #include "TROOT.h"
 #include "TRealData.h"
 #include "TRegexp.h"
+#include "TRefTable.h"
 #include "TStreamerElement.h"
 #include "TStreamerInfo.h"
 #include "TStyle.h"

tree/tree/src/TTreeCacheUnzip.cxx

@@ -25,6 +25,7 @@ A TTreeCache which exploits parallelized decompression of its own content.
 #include "TEventList.h"
 #include "TFile.h"
 #include "TMath.h"
+#include "TROOT.h"
 #include "TMutex.h"
 #include "ROOT/RMakeUnique.hxx"
 

tree/tree/test/TIOFeatures.cxx

@@ -6,6 +6,7 @@
 #include "gtest/gtest.h"
 
 #include <vector>
+#include "TBasket.h"
 
 TEST(TIOFeatures, IOBits)
 {

tree/treeplayer/src/TTreeFormula.cxx

@@ -11,6 +11,7 @@
 
 #include "TROOT.h"
 #include "TTreeFormula.h"
+#include "TList.h"
 #include "TTree.h"
 #include "TBuffer.h"
 #include "TBranch.h"

tree/treeplayer/src/TTreeGeneratorBase.cxx

@@ -20,6 +20,7 @@
 #include "TStreamerElement.h"
 #include "TStreamerInfo.h"
 #include "TTree.h"
+#include "TError.h"
 #include "TVirtualCollectionProxy.h"
 #include "TVirtualStreamerInfo.h"
 

tree/treeplayer/src/TTreePlayer.cxx

@@ -76,6 +76,7 @@ extra libraries (Histogram, display, etc).
 #include "TVirtualMonitoring.h"
 #include "TTreeCache.h"
 #include "TVirtualMutex.h"
+#include "ThreadLocalStorage.h"
 
 #include "HFitInterface.h"
 #include "Fit/BinData.h"

tree/treeplayer/src/TTreeReaderArray.cxx

@@ -21,6 +21,7 @@
 #include "TFriendElement.h"
 #include "TFriendProxy.h"
 #include "TLeaf.h"
+#include "TList.h"
 #include "TROOT.h"
 #include "TStreamerInfo.h"
 #include "TStreamerElement.h"

tree/treeviewer/src/TSpider.cxx

@@ -16,6 +16,7 @@
 #include "TGraphPolargram.h"
 #include "TPolyLine.h"
 #include "TNtuple.h"
+#include "TBranch.h"
 #include "TTreeFormula.h"
 #include "TTreeFormulaManager.h"
 #include "TList.h"

tree/treeviewer/src/TTreeViewer.cxx

@@ -190,6 +190,7 @@ or :
 #include "TContextMenu.h"
 #include "TInterpreter.h"
 #include "TLeaf.h"
+#include "TBranch.h"
 #include "TRootHelpDialog.h"
 #include "TSystem.h"
 #include "TApplication.h"