Optimize io includes

io/io/inc/TDirectoryFile.h

@@ -26,8 +26,6 @@
 #include "TDatime.h"
 #include "TList.h"
 
-class TList;
-class TBrowser;
 class TKey;
 class TFile;
 

io/io/inc/TFileMerger.h

@@ -12,14 +12,11 @@
 #ifndef ROOT_TFileMerger
 #define ROOT_TFileMerger
 
-#include "TList.h"
 #include "TObject.h"
+#include "TList.h"
 #include "TString.h"
 #include "TStopwatch.h"
 
-#include <memory>
-
-class TList;
 class TFile;
 class TDirectory;
 

io/io/inc/TFilePrefetch.h

@@ -12,18 +12,23 @@
 #ifndef ROOT_TFilePrefetch
 #define ROOT_TFilePrefetch
 
-#include "TFile.h"
-#include "TThread.h"
-#include "TFPBlock.h"
-#include "TSemaphore.h"
 #include "TObject.h"
 #include "TString.h"
 #include "TStopwatch.h"
+#include "TThread.h"
+#include "TFile.h"
 
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
 
+#ifdef R__LESS_INCLUDES
+class TSemaphore;
+class TFPBlock;
+#else
+#include "TSemaphore.h"
+#include "TFPBlock.h"
+#endif
 
 class TFilePrefetch : public TObject {
 

io/io/inc/TStreamerInfo.h

@@ -16,13 +16,10 @@
 
 #include "TVirtualStreamerInfo.h"
 
-#include "ThreadLocalStorage.h"
-
 #include "TVirtualCollectionProxy.h"
 
 #include "TObjArray.h"
 
-
 /**
 \class TStreamerInfo
 \ingroup IO

io/io/src/TFile.cxx

@@ -123,6 +123,7 @@ The structure of a directory is shown in TDirectoryFile::TDirectoryFile
 #include "TEnv.h"
 #include "TVirtualMonitoring.h"
 #include "TVirtualMutex.h"
+#include "TMap.h"
 #include "TMathBase.h"
 #include "TObjString.h"
 #include "TStopwatch.h"

io/io/src/TFilePrefetch.cxx

@@ -15,6 +15,8 @@
 #include "TMD5.h"
 #include "TVirtualPerfStats.h"
 #include "TVirtualMonitoring.h"
+#include "TSemaphore.h"
+#include "TFPBlock.h"
 
 #include <iostream>
 #include <string>

io/io/src/TMakeProject.cxx

@@ -20,6 +20,7 @@ Helper class implementing the TFile::MakeProject.
 #include "TMakeProject.h"
 #include "TClass.h"
 #include "TClassEdit.h"
+#include "TList.h"
 #include "TROOT.h"
 #include "TMD5.h"
 #include "TStreamerInfo.h"

io/io/src/TStreamerInfoReadBuffer.cxx

@@ -24,6 +24,7 @@
 #include "TContainerConverters.h"
 #include "TVirtualArray.h"
 #include "TVirtualObject.h"
+#include "ThreadLocalStorage.h"
 
 // GetCurrentElement.
 // Currently only used by TRef::Streamer.

io/mpi/src/TMPIFile.cxx

@@ -12,6 +12,7 @@
 #include "TMPIFile.h"
 #include "TFileCacheWrite.h"
 #include "TKey.h"
+#include "THashTable.h"
 #include "TMath.h"
 
 ClassImp(TMPIFile);

io/rootpcm/src/rootclingIO.cxx

@@ -17,6 +17,7 @@
 #include "TError.h"
 #include "TFile.h"
 #include "TProtoClass.h"
+#include "TDataMember.h"
 #include "TROOT.h"
 #include "TStreamerInfo.h"
 #include "TClassEdit.h"

io/sql/inc/TBufferSQL2.h

@@ -6,7 +6,6 @@
 
 #include "TBufferText.h"
 #include "TString.h"
-#include "TObjArray.h"
 
 class TMap;
 class TExMap;

io/xml/inc/TXMLPlayer.h

@@ -14,14 +14,13 @@
 
 #include "TObject.h"
 
-#include "TList.h"
-
 #include "TXMLSetup.h"
 
 class TStreamerInfo;
 class TStreamerElement;
 class TStreamerSTL;
 class TDataMember;
+class TList;
 
 class TXMLPlayer : public TObject {
 public:

io/xml/src/TXMLPlayer.cxx

@@ -105,6 +105,7 @@
 
 #include "Riostream.h"
 #include "TROOT.h"
+#include "TList.h"
 #include "TClass.h"
 #include "TVirtualStreamerInfo.h"
 #include "TStreamerElement.h"

io/xml/src/TXMLSetup.cxx

@@ -33,6 +33,7 @@
 #include "TXMLSetup.h"
 
 #include "TROOT.h"
+#include "TList.h"
 #include "TClass.h"
 #include "TStreamerElement.h"