From 034a6974f7f416229c72cf9017f2b3cbc645030c Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <vvasilev@cern.ch>
Date: Sat, 10 Dec 2016 16:52:51 +0100
Subject: [PATCH] Includes.

---
 core/clib/inc/strlcpy.h            |  1 +
 core/cont/inc/TBits.h              |  1 +
 core/cont/inc/TClonesArray.h       |  2 ++
 core/cont/src/TBits.cxx            |  5 ++++-
 core/cont/src/TBtree.cxx           |  1 +
 core/cont/src/TClassTable.cxx      | 17 +++++++++--------
 core/cont/src/TClonesArray.cxx     |  4 +++-
 math/mathcore/inc/Math/LCGEngine.h |  3 ++-
 math/mathcore/inc/TComplex.h       |  2 ++
 9 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/core/clib/inc/strlcpy.h b/core/clib/inc/strlcpy.h
index b206cfb87d8..3dfdff06ddd 100644
--- a/core/clib/inc/strlcpy.h
+++ b/core/clib/inc/strlcpy.h
@@ -12,6 +12,7 @@
 #ifndef ROOT_RConfig
 #include "RConfig.h"
 #endif
+#include "Rtypes.h"
 
 #ifndef HAS_STRLCPY
 
diff --git a/core/cont/inc/TBits.h b/core/cont/inc/TBits.h
index 55005550dbe..ed1e6a82d9a 100644
--- a/core/cont/inc/TBits.h
+++ b/core/cont/inc/TBits.h
@@ -20,6 +20,7 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
+#include "Rtypes.h"
 #ifndef ROOT_TObject
 #include "TObject.h"
 #endif
diff --git a/core/cont/inc/TClonesArray.h b/core/cont/inc/TClonesArray.h
index f775a9eaae3..63a1fa4f180 100644
--- a/core/cont/inc/TClonesArray.h
+++ b/core/cont/inc/TClonesArray.h
@@ -22,6 +22,8 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
+#include "Rtypes.h"
+
 #ifndef ROOT_TObjArray
 #include "TObjArray.h"
 #endif
diff --git a/core/cont/src/TBits.cxx b/core/cont/src/TBits.cxx
index 7542ee3b79f..a2cdc26c6f0 100644
--- a/core/cont/src/TBits.cxx
+++ b/core/cont/src/TBits.cxx
@@ -19,8 +19,11 @@ occupied by the upper bits that are 0.
 */
 
 #include "TBits.h"
-#include "string.h"
+
 #include "Riostream.h"
+#include "TObject.h"
+
+#include <string.h>
 
 ClassImp(TBits)
 
diff --git a/core/cont/src/TBtree.cxx b/core/cont/src/TBtree.cxx
index 741fa5493c7..7d603679d3c 100644
--- a/core/cont/src/TBtree.cxx
+++ b/core/cont/src/TBtree.cxx
@@ -167,6 +167,7 @@ item's own key).
 
 #include "TBtree.h"
 #include "TBuffer.h"
+#include "TObject.h"
 
 #include <stdlib.h>
 
diff --git a/core/cont/src/TClassTable.cxx b/core/cont/src/TClassTable.cxx
index 34aaa84f84b..1e973d976ae 100644
--- a/core/cont/src/TClassTable.cxx
+++ b/core/cont/src/TClassTable.cxx
@@ -17,15 +17,8 @@ ctor of a special init class when a global of this init class is
 initialized when the program starts (see the ClassImp macro).
 */
 
-#include "RConfig.h"
-#include <stdlib.h>
-#include <string>
-#include <map>
-#include <typeinfo>
-#include "Riostream.h"
-#include <memory>
-
 #include "TClassTable.h"
+
 #include "TClass.h"
 #include "TClassEdit.h"
 #include "TProtoClass.h"
@@ -38,6 +31,14 @@ initialized when the program starts (see the ClassImp macro).
 #include "TMap.h"
 
 #include "TInterpreter.h"
+
+#include <map>
+#include <memory>
+#include "Riostream.h"
+#include <typeinfo>
+#include <stdlib.h>
+#include <string>
+
 using namespace ROOT;
 
 TClassTable *gClassTable;
diff --git a/core/cont/src/TClonesArray.cxx b/core/cont/src/TClonesArray.cxx
index 89bde6cc8ce..ba1576f0fbc 100644
--- a/core/cont/src/TClonesArray.cxx
+++ b/core/cont/src/TClonesArray.cxx
@@ -123,13 +123,15 @@ When investigating misuse of TClonesArray, please make sure of the following:
      run.
 */
 
-#include <stdlib.h>
 #include "TClonesArray.h"
+
 #include "TError.h"
 #include "TROOT.h"
 #include "TClass.h"
+#include "TObject.h"
 #include "TObjectTable.h"
 
+#include <stdlib.h>
 
 ClassImp(TClonesArray)
 
diff --git a/math/mathcore/inc/Math/LCGEngine.h b/math/mathcore/inc/Math/LCGEngine.h
index 29b70dba2d8..fa7519d8bd3 100644
--- a/math/mathcore/inc/Math/LCGEngine.h
+++ b/math/mathcore/inc/Math/LCGEngine.h
@@ -13,9 +13,10 @@
 #ifndef ROOT_Math_LCGEngine
 #define ROOT_Math_LCGEngine
 
+#include <cassert>
 #include <cstdint>
+#include <string>
 #include <vector>
-#include <cassert>
 
 class TRandomEngine  {
 public:
diff --git a/math/mathcore/inc/TComplex.h b/math/mathcore/inc/TComplex.h
index c968fd14f96..f164ad9a04a 100644
--- a/math/mathcore/inc/TComplex.h
+++ b/math/mathcore/inc/TComplex.h
@@ -22,6 +22,8 @@
 #include "TMath.h"
 #endif
 
+#include "Rtypes.h"
+
 
 class TComplex {
 
-- 
GitLab