Reduce/improve includes usage in ROOT header files

bindings/tpython/src/TPyClassGenerator.cxx

@@ -22,6 +22,7 @@
 #include "TClass.h"
 #include "TInterpreter.h"
 #include "TROOT.h"
+#include "TList.h"
 
 // Standard
 #include <sstream>

core/base/inc/Rtypes.h

@@ -21,7 +21,7 @@
 
 
 #include "RtypesCore.h"
-#include "DllImport.h"
+// #include "DllImport.h" // included via RtypesCore.h, not used here
 
 #include "snprintf.h"   // part of stdio.h on systems that have it
 #include "strlcpy.h"    // part of string.h on systems that have it

core/base/inc/TColor.h

@@ -13,8 +13,8 @@
 #define ROOT_TColor
 
 #include "TNamed.h"
-#include "TArrayI.h"
 
+class TArrayI;
 
 class TColor : public TNamed {
 protected:

core/base/inc/TFileInfo.h

@@ -21,14 +21,17 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "TNamed.h"
+#include "TList.h"
 
+#ifdef R__LESS_INCLUDES
+class TUrl;
+class TUUID;
+class TMD5;
+#else
 #include "TUrl.h"
-
 #include "TUUID.h"
-
 #include "TMD5.h"
-
-#include "TList.h"
+#endif
 
 class TFileInfoMeta;
 

core/base/inc/TObject.h

@@ -13,7 +13,7 @@
 #define ROOT_TObject
 
 
-#include "RConfigure.h"
+// #include "RConfigure.h"  // included via Rtypes.h
 #include "Rtypes.h"
 #include "TStorage.h"
 #include "TVersionCheck.h"

core/base/inc/TParameter.h

@@ -23,8 +23,6 @@
 
 #include "Riostream.h"
 
-#include "TClass.h"
-
 #include "TObject.h"
 
 #include "TCollection.h"

core/base/inc/TPluginManager.h

@@ -94,7 +94,6 @@ class TEnv;
 class TList;
 class THashTable;
 class TFunction;
-class TMethodCall;
 class TPluginManager;
 
 #include <atomic>

core/base/inc/TProcessID.h

@@ -23,7 +23,12 @@
 
 
 #include "TNamed.h"
+
+#ifdef R__LESS_INCLUDES
+class TObjArray;
+#else
 #include "TObjArray.h"
+#endif
 
 #include <atomic>
 #include <type_traits>

core/base/inc/TROOT.h

@@ -26,8 +26,8 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "TDirectory.h"
-#include "TList.h"
-#include "RConfigure.h"
+// #include "TList.h"  // included in TDirectory.h
+// #include "RConfigure.h"  // included via Rtypes.h
 
 #include <atomic>
 #include <string>
@@ -55,6 +55,7 @@ class TListOfDataMembers;
 class TListOfEnums;
 class TListOfFunctions;
 class TListOfFunctionTemplates;
+class TSeqCollection;
 class TFunctionTemplate;
 class TGlobalMappedFunction;
 
@@ -270,8 +271,8 @@ friend TROOT *ROOT::Internal::GetROOT2();
    TObject          *GetGeometry(const char *name) const;
    const TObject    *GetSelectedPrimitive() const { return fPrimitive; }
    TVirtualPad      *GetSelectedPad() const { return fSelectPad; }
-   Int_t             GetNclasses() const { return fClasses->GetSize(); }
-   Int_t             GetNtypes() const { return fTypes->GetSize(); }
+   Int_t             GetNclasses() const;
+   Int_t             GetNtypes() const;
    TFolder          *GetRootFolder() const { return fRootFolder; }
    TProcessUUID     *GetUUIDs() const { return fUUIDs; }
    const TString    &GetWebDisplay() const { return fWebDisplay; }

core/base/inc/TStorage.h

@@ -21,7 +21,7 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#include "RConfigure.h"
+// #include "RConfigure.h" // included via Rtypes.h
 #include "Rtypes.h"
 
 typedef void (*FreeHookFun_t)(void*, void *addr, size_t);

core/base/inc/TStyle.h

@@ -12,16 +12,18 @@
 #ifndef ROOT_TStyle
 #define ROOT_TStyle
 
-
 #include "TNamed.h"
-#include "TAttAxis.h"
 #include "TAttLine.h"
 #include "TAttFill.h"
-#include "TAttText.h"
 #include "TAttMarker.h"
-#include "TArrayI.h"
+#include "TAttText.h"
+#include "TAttAxis.h"
 #include "TColor.h"
 
+#ifndef R__LESS_INCLUDES
+#include "TArrayI.h"
+#endif
+
 class TBrowser;
 
 class TStyle : public TNamed, public TAttLine, public TAttFill, public TAttMarker, public TAttText {

core/base/inc/TTask.h

@@ -22,7 +22,12 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "TNamed.h"
+
+#ifdef R__LESS_INCLUDES
+class TList;
+#else
 #include "TList.h"
+#endif
 
 class TBrowser;
 
@@ -50,7 +55,7 @@ class TTask : public TNamed {
    TTask& operator=(const TTask& tt);
 
    virtual void  Abort();  // *MENU*
-   virtual void  Add(TTask *task) {fTasks->Add(task);}
+   virtual void  Add(TTask *task);
    virtual void  Browse(TBrowser *b);
    virtual void  CleanTasks();
    virtual void  Clear(Option_t *option="");

core/base/inc/TUrl.h

@@ -26,8 +26,6 @@
 
 #include "TObject.h"
 #include "TString.h"
-#include "TMap.h"
-
 
 class THashList;
 class TMap;

core/base/inc/TVirtualMonitoring.h

@@ -22,17 +22,22 @@
 
 #include "TNamed.h"
 
+#ifdef R__LESS_INCLUDES
+class TList;
+class TMap;
+#else
 #include "TList.h"
 #include "TMap.h"
+#endif
 
 class TFile;
 
 class TVirtualMonitoringWriter : public TNamed {
 
 private:
 
-   TVirtualMonitoringWriter(const TVirtualMonitoringWriter&); // Not implemented
-   TVirtualMonitoringWriter& operator=(const TVirtualMonitoringWriter&); // Not implemented
+   TVirtualMonitoringWriter(const TVirtualMonitoringWriter&) = delete;
+   TVirtualMonitoringWriter& operator=(const TVirtualMonitoringWriter&) = delete;
 
    Double_t fValue;  // double monitor value
 
@@ -44,7 +49,7 @@ class TVirtualMonitoringWriter : public TNamed {
    TVirtualMonitoringWriter(const char *name, Double_t value)
      : TNamed(name, ""), fValue(value), fTmpOpenPhases(0) { }
 
-   virtual ~TVirtualMonitoringWriter() { if (fTmpOpenPhases) delete fTmpOpenPhases; }
+   virtual ~TVirtualMonitoringWriter();
 
    // TFile related info. In general they are gathered and sent only sometimes as summaries
    virtual Bool_t SendFileCloseEvent(TFile * /*file*/)

core/base/inc/TVirtualMutex.h

@@ -24,8 +24,6 @@
 
 #include "TObject.h"
 
-#include <memory>
-
 class TVirtualMutex;
 
 // Global mutex set in TThread::Init

core/base/inc/TVirtualRWMutex.h

@@ -25,6 +25,7 @@
 
 #include "TVirtualMutex.h"
 
+#include <memory>
 
 namespace ROOT {
 

core/base/inc/TVirtualViewer3D.h

@@ -24,12 +24,8 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#include "Rtypes.h"
-
 #include "TObject.h"
 
-#include "TAttFill.h"
-
 class TBuffer3D;
 class TVirtualPad;
 class TGLRect;

core/base/src/TFileCollection.cxx

@@ -26,6 +26,8 @@ collection of TFile names.
 #include "TObjString.h"
 #include "TUri.h"
 #include "TUrl.h"
+#include "TUUID.h"
+#include "TMD5.h"
 #include "TSystem.h"
 #include "Riostream.h"
 #include "TRegexp.h"

core/base/src/TFileInfo.cxx

@@ -20,7 +20,9 @@ Class describing a generic file including meta information.
 #include "TRegexp.h"
 #include "TSystem.h"
 #include "TClass.h"
-
+#include "TUrl.h"
+#include "TUUID.h"
+#include "TMD5.h"
 
 ClassImp(TFileInfo);
 ClassImp(TFileInfoMeta);

core/base/src/TFolder.cxx

@@ -86,6 +86,7 @@ if this pointer is used frequently or inside loops.
 #include "Strlen.h"
 #include "TFolder.h"
 #include "TBrowser.h"
+#include "TList.h"
 #include "TROOT.h"
 #include "TClass.h"
 #include "TError.h"

core/base/src/TPluginManager.cxx

@@ -79,7 +79,6 @@ TFile, TSQLServer, TGrid, etc. functionality.
 */
 
 #include "TPluginManager.h"
-#include "Varargs.h"
 #include "TEnv.h"
 #include "TRegexp.h"
 #include "TROOT.h"

core/base/src/TProcessUUID.cxx

@@ -41,11 +41,11 @@ TProcessID *fPID in TRef points to the unique object TProcessUUID.
 The TRef uniqueID is directly the UUIDNumber=slot number.
 */
 
-#include "TROOT.h"
 #include "TProcessUUID.h"
 #include "THashList.h"
 #include "TBits.h"
 #include "TObjString.h"
+#include "TObjArray.h"
 #include "TUUID.h"
 
 ClassImp(TProcessUUID);

core/base/src/TQCommand.cxx

@@ -101,7 +101,6 @@ Use TQUndoManager::Undo to undo commands in  history list.
 Redo is Undo for undo action. Use TQUndoManager::Redo method for that
 */
 
-#include "Varargs.h"
 #include "TQCommand.h"
 #include "TQConnection.h"
 #include "TDataType.h"

core/base/src/TQConnection.cxx

@@ -21,7 +21,6 @@ communication mechanism.
    -  receiver is the object to which slot-method is applied
 */
 
-#include "Varargs.h"
 #include "TQConnection.h"
 #include "TROOT.h"
 #include "TRefCnt.h"

core/base/src/TQObject.cxx

@@ -52,7 +52,6 @@ as an identifier of the modifier method.
 General purpose message signal
 */
 
-#include "Varargs.h"
 #include "TQObject.h"
 #include "TQConnection.h"
 #include "THashList.h"

core/base/src/TROOT.cxx

@@ -1802,6 +1802,21 @@ TCollection *TROOT::GetListOfTypes(Bool_t /* load */)
    return fTypes;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+/// Get number of classes.
+
+Int_t TROOT::GetNclasses() const
+{
+   return fClasses->GetSize();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// Get number of types.
+
+Int_t TROOT::GetNtypes() const
+{
+   return fTypes->GetSize();
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Execute command when system has been idle for idleTimeInSec seconds.

core/base/src/TTask.cxx

@@ -81,6 +81,7 @@ the following script:
 #include "Riostream.h"
 #include "TTask.h"
 #include "TBrowser.h"
+#include "TList.h"
 #include "TROOT.h"
 #include "TRegexp.h"
 
@@ -164,6 +165,16 @@ TTask::~TTask()
    delete fTasks;
 }
 
+
+////////////////////////////////////////////////////////////////////////////////
+/// Add TTask to this.
+
+void  TTask::Add(TTask *task) 
+{
+   fTasks->Add(task);
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 /// Abort current tree of tasks.
 /// After this call, the tree of tasks is ready to be executed again.

core/base/src/TVirtualMonitoring.cxx

@@ -18,6 +18,7 @@ Provides the interface for externel Monitoring
 
 #include "TVirtualMonitoring.h"
 
+#include "TList.h"
 
 ClassImp(TVirtualMonitoringWriter);
 ClassImp(TVirtualMonitoringReader);
@@ -26,3 +27,11 @@ ClassImp(TVirtualMonitoringReader);
 TVirtualMonitoringWriter *gMonitoringWriter = 0;
 TVirtualMonitoringReader *gMonitoringReader = 0;
 
+////////////////////////////////////////////////////////////
+/// destructor
+
+TVirtualMonitoringWriter::~TVirtualMonitoringWriter() 
+{
+   if (fTmpOpenPhases) 
+      delete fTmpOpenPhases; 
+}

core/cont/inc/TArray.h

@@ -24,7 +24,6 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "Rtypes.h"
-#include <string.h>
 
 class TBuffer;