diff --git a/geom/geom/src/TGeoAtt.cxx b/geom/geom/src/TGeoAtt.cxx
index b9ae3d31e2f924758c5c83740b9db6118aa31a62..f23915e90176e666c74dc24cc699dc7ea6b78e39 100644
--- a/geom/geom/src/TGeoAtt.cxx
+++ b/geom/geom/src/TGeoAtt.cxx
@@ -18,9 +18,11 @@ The TGeoAtt class is an utility for volume/node visibility and tracking
 activity. By default the attributes are set to visible/active
 */
 
-#include "TGeoManager.h"
 #include "TGeoAtt.h"
 
+#include "TGeoManager.h"
+#include "Rtypes.h"
+
 ClassImp(TGeoAtt)
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/geom/geom/src/TGeoCache.cxx b/geom/geom/src/TGeoCache.cxx
index 4e599be6ffb62b84751a17ae52d3655653448188..3fc4e4a43abde5b85f4c4596d7738711cd929e39 100644
--- a/geom/geom/src/TGeoCache.cxx
+++ b/geom/geom/src/TGeoCache.cxx
@@ -9,10 +9,13 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
+#include "TGeoCache.h"
+
+#include "Rtypes.h"
 #include "TGeoManager.h"
 #include "TGeoMatrix.h"
 #include "TGeoVolume.h"
-#include "TGeoCache.h"
+#include "TObject.h"
 
 //const Int_t kN3 = 3*sizeof(Double_t);
 
diff --git a/geom/geom/src/TGeoExtension.cxx b/geom/geom/src/TGeoExtension.cxx
index 226ee958dc6b699c1ee51acb736add32bce22072..768ab00157cc2f5f08ec4d16b2e11583aa440611 100644
--- a/geom/geom/src/TGeoExtension.cxx
+++ b/geom/geom/src/TGeoExtension.cxx
@@ -11,6 +11,8 @@
 
 #include "TGeoExtension.h"
 
+#include "Rtypes.h"
+
 ClassImp(TGeoExtension)
 
 /** \class TGeoExtension
diff --git a/geom/geom/src/TGeoStateInfo.cxx b/geom/geom/src/TGeoStateInfo.cxx
index a28e8e15f5523ea9fca04fda4d7a8ce8e36af266..2c754cdd8f99d73d5c09f8dd3b36e6441519ccf3 100644
--- a/geom/geom/src/TGeoStateInfo.cxx
+++ b/geom/geom/src/TGeoStateInfo.cxx
@@ -10,9 +10,11 @@
  *************************************************************************/
 
 #include "TGeoStateInfo.h"
+
+#include "Rtypes.h"
 #include "TGeoNode.h"
-#include "TGeoPolygon.h"
 #include "TGeoManager.h"
+#include "TGeoPolygon.h"
 
 /** \class TGeoStateInfo
 \ingroup Geometry_classes
diff --git a/geom/geom/src/TVirtualGeoTrack.cxx b/geom/geom/src/TVirtualGeoTrack.cxx
index 9b76a19c9d9079edccc8f4bffc84a9a2421ca3a2..d0218de41ff82df3ed3293530ae5088fd48068e0 100644
--- a/geom/geom/src/TVirtualGeoTrack.cxx
+++ b/geom/geom/src/TVirtualGeoTrack.cxx
@@ -9,10 +9,12 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-#include "TGeoManager.h"
-
 #include "TVirtualGeoTrack.h"
 
+#include "Rtypes.h"
+#include "TGeoManager.h"
+#include "TObject.h"
+
 /** \class TVirtualGeoTrack
 \ingroup Geometry_classes
 
diff --git a/geom/geom/src/TVirtualMagField.cxx b/geom/geom/src/TVirtualMagField.cxx
index 6c6661f8bd5b75d9eae6f37f52daba0832f1346f..fb283131e3c5f6707994430ff1f8ee53779815d6 100644
--- a/geom/geom/src/TVirtualMagField.cxx
+++ b/geom/geom/src/TVirtualMagField.cxx
@@ -8,9 +8,11 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-#include "TGeoGlobalMagField.h"
 #include "TVirtualMagField.h"
 
+#include "TGeoGlobalMagField.h"
+#include "Rtypes.h"
+
 /** \class TVirtualMagField
 \ingroup Geometry_classes
 Abstract class for magnetic field. Derived classes are encouraged to
diff --git a/graf3d/eve/inc/TEveGeoPolyShape.h b/graf3d/eve/inc/TEveGeoPolyShape.h
index b957a1c2465d92369f0d19ace9b6a09b8c1e8494..7f25eefef3d8d40c11398cca69a5db5ebbe2d608 100644
--- a/graf3d/eve/inc/TEveGeoPolyShape.h
+++ b/graf3d/eve/inc/TEveGeoPolyShape.h
@@ -12,8 +12,11 @@
 #ifndef ROOT_TEveGeoPolyShape
 #define ROOT_TEveGeoPolyShape
 
+#include "Rtypes.h"
 #include "TGeoBBox.h"
 
+#include <vector>
+
 class TBuffer3D;
 class TGLFaceSet;
 class TGeoCompositeShape;
diff --git a/graf3d/eve/src/TEveGeoPolyShape.cxx b/graf3d/eve/src/TEveGeoPolyShape.cxx
index df419209183846e1e5fd07746bec17e4fcbf78ea..913bcc157527815631fb3bf53c360c0dac112c63 100644
--- a/graf3d/eve/src/TEveGeoPolyShape.cxx
+++ b/graf3d/eve/src/TEveGeoPolyShape.cxx
@@ -10,6 +10,8 @@
  *************************************************************************/
 
 #include "TEveGeoPolyShape.h"
+
+#include "Rtypes.h"
 #include "TEveGeoShape.h"
 #include "TEvePad.h"
 #include "TEveUtil.h"
diff --git a/math/fumili/src/TFumili.cxx b/math/fumili/src/TFumili.cxx
index edc3492058dc9bb53a6b7cff27d46b7e649dd333..2fd01883b1eff059decc8808e4c41525dc2ca72b 100644
--- a/math/fumili/src/TFumili.cxx
+++ b/math/fumili/src/TFumili.cxx
@@ -97,17 +97,17 @@ function argument.
 //______________________________________________________________________________
 
 
-
-#include "TROOT.h"
 #include "TFumili.h"
-#include "TMath.h"
+
+#include "Riostream.h"
+#include "TGraphAsymmErrors.h"
 #include "TF1.h"
 #include "TF2.h"
 #include "TF3.h"
 #include "TH1.h"
-#include "TGraphAsymmErrors.h"
-
-#include "Riostream.h"
+#include "TMath.h"
+#include "TROOT.h"
+#include "TVirtualFitter.h"
 
 
 extern void H1FitChisquareFumili(Int_t &npar, Double_t *gin, Double_t &f, Double_t *u, Int_t flag);
diff --git a/tmva/tmva/inc/TMVA/NeuralNet.icc b/tmva/tmva/inc/TMVA/NeuralNet.icc
index 0797345b867654b5c923ccd4228d0329f22b5bcf..20ece1b3eab4bc202d73dda21dcc6742a968b6db 100644
--- a/tmva/tmva/inc/TMVA/NeuralNet.icc
+++ b/tmva/tmva/inc/TMVA/NeuralNet.icc
@@ -8,7 +8,8 @@
 
 #include "Math/Util.h"
 
-#include "MethodBase.h"
+#include "TMVA/Pattern.h"
+#include "TMVA/MethodBase.h"
 
 namespace TMVA
 {