From: hristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 18 May 2011 04:49:51 +0000 (+0000)
Subject: Clean-up of include files
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=c93255fea4324a5f5f270d49316a46b1e0afc171;hp=1cea10fd7073469cb0886bf86264351ab4ee4748

Clean-up of include files
---

diff --git a/ACORDE/AliACORDETrigger.cxx b/ACORDE/AliACORDETrigger.cxx
index 1500937dbc9..a2bda8c3498 100644
--- a/ACORDE/AliACORDETrigger.cxx
+++ b/ACORDE/AliACORDETrigger.cxx
@@ -13,9 +13,10 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-#include "Riostream.h"
-
+#include <Riostream.h>
+#include <TTree.h>
 #include <TClonesArray.h>
+
 #include "AliRun.h"
 #include "AliRunLoader.h"
 #include "AliACORDETrigger.h"
diff --git a/ACORDE/AliACORDEv1.cxx b/ACORDE/AliACORDEv1.cxx
index e91201240f6..de1add37717 100644
--- a/ACORDE/AliACORDEv1.cxx
+++ b/ACORDE/AliACORDEv1.cxx
@@ -44,6 +44,7 @@
 #include <TMath.h>
 #include <TString.h>
 #include <TSystem.h>
+#include <TTree.h>
 
 #include "AliConst.h"
 #include "AliRun.h"
diff --git a/ANALYSIS/AliBackgroundSelection.cxx b/ANALYSIS/AliBackgroundSelection.cxx
index aeafdc13ae3..3148bc6d0c7 100644
--- a/ANALYSIS/AliBackgroundSelection.cxx
+++ b/ANALYSIS/AliBackgroundSelection.cxx
@@ -29,7 +29,7 @@
 #include "TTree.h"
 #include "AliMultiplicity.h"
 #ifdef PASS1RECO
-#include "../ITS/AliITSRecPoint.h"
+#include "AliITSRecPoint.h"
 #endif
 
 
diff --git a/EMCAL/AliEMCALSpaceFrame.cxx b/EMCAL/AliEMCALSpaceFrame.cxx
index 99b0d6895eb..b66815b3c4c 100644
--- a/EMCAL/AliEMCALSpaceFrame.cxx
+++ b/EMCAL/AliEMCALSpaceFrame.cxx
@@ -28,6 +28,7 @@
 #include "AliEMCALSpaceFrame.h"
 #include "AliMagF.h"
 #include "AliRun.h"
+#include "AliLog.h"
  
 ClassImp(AliEMCALSpaceFrame)
  
diff --git a/EVE/EveDet/AliEveITSDigitsInfo.cxx b/EVE/EveDet/AliEveITSDigitsInfo.cxx
index 4e577ed25b1..fe64ff8155d 100644
--- a/EVE/EveDet/AliEveITSDigitsInfo.cxx
+++ b/EVE/EveDet/AliEveITSDigitsInfo.cxx
@@ -38,6 +38,7 @@
 
 #include <TMath.h>
 #include <TVector3.h>
+#include <TTree.h>
 
 //==============================================================================
 //==============================================================================
diff --git a/EVGEN/AliGenDeuteron.cxx b/EVGEN/AliGenDeuteron.cxx
index a3ff77cd62d..6bccb911a51 100644
--- a/EVGEN/AliGenDeuteron.cxx
+++ b/EVGEN/AliGenDeuteron.cxx
@@ -51,6 +51,7 @@
 #include "AliGenCocktailEntry.h"
 #include "AliGenCocktailAfterBurner.h"
 #include "AliGenDeuteron.h"
+#include "AliLog.h"
 
 ClassImp(AliGenDeuteron)
 
diff --git a/EVGEN/AliGenHaloProtvino.cxx b/EVGEN/AliGenHaloProtvino.cxx
index 883f54c291d..099c8abee44 100644
--- a/EVGEN/AliGenHaloProtvino.cxx
+++ b/EVGEN/AliGenHaloProtvino.cxx
@@ -29,6 +29,7 @@
 #include <TPDGCode.h>
 #include <TSystem.h>
 
+#include "AliLog.h"
 #include "AliGenHaloProtvino.h"
 #include "AliRun.h"
 
diff --git a/FMD/AliFMDRawWriter.cxx b/FMD/AliFMDRawWriter.cxx
index f223bc25a40..dec8f4e5de0 100644
--- a/FMD/AliFMDRawWriter.cxx
+++ b/FMD/AliFMDRawWriter.cxx
@@ -50,6 +50,7 @@
 #include <TArrayF.h>		// ROOT_TArrayI
 #include <TArrayC.h>		// ROOT_TArrayI
 #include <TClonesArray.h>	// ROOT_TClonesArray
+#include <TTree.h>
 // #include <fstream>
 #include "AliDAQ.h"
 
diff --git a/HLT/ITS/AliHLTITSVertexerZ.cxx b/HLT/ITS/AliHLTITSVertexerZ.cxx
index d6898a516ec..6d1f57c57b7 100644
--- a/HLT/ITS/AliHLTITSVertexerZ.cxx
+++ b/HLT/ITS/AliHLTITSVertexerZ.cxx
@@ -15,6 +15,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 #include "AliHLTITSVertexerZ.h"
+#include <TTree.h>
 #include<TString.h>
 #include<TH1.h>
 #include<TMath.h>
diff --git a/HLT/MUON/OfflineInterface/AliHLTMUONDigitPublisherComponent.cxx b/HLT/MUON/OfflineInterface/AliHLTMUONDigitPublisherComponent.cxx
index 4ac7c0880cd..306161bab35 100644
--- a/HLT/MUON/OfflineInterface/AliHLTMUONDigitPublisherComponent.cxx
+++ b/HLT/MUON/OfflineInterface/AliHLTMUONDigitPublisherComponent.cxx
@@ -62,6 +62,7 @@
 #include "AliMUONRegHeader.h"
 #include "AliRunLoader.h"
 #include "AliCentralTrigger.h"
+#include "AliLog.h"
 #include <cstring>
 #include <cstdlib>
 #include <cmath>
diff --git a/HLT/TPCLib/AliHLTTPCFileHandler.cxx b/HLT/TPCLib/AliHLTTPCFileHandler.cxx
index a2f7a2df898..114103be1b6 100644
--- a/HLT/TPCLib/AliHLTTPCFileHandler.cxx
+++ b/HLT/TPCLib/AliHLTTPCFileHandler.cxx
@@ -36,6 +36,7 @@
 #include <TSystem.h>
 #include <TMath.h>
 
+#include "AliLoader.h"
 #include <AliRunLoader.h>
 #include <TObject.h>
 #include <TFile.h>
diff --git a/HMPID/AliHMPID.cxx b/HMPID/AliHMPID.cxx
index 815c414d5a3..4b725c38ff7 100644
--- a/HMPID/AliHMPID.cxx
+++ b/HMPID/AliHMPID.cxx
@@ -13,6 +13,7 @@
 //  * provided "as is" without express or implied warranty.                  *
 //  **************************************************************************
 
+#include <TTree.h>
 #include "AliHMPID.h"
 #include "AliHMPIDHit.h"   //OccupancyPrint(), HitQa()
 #include "AliHMPIDDigit.h" //
@@ -25,6 +26,7 @@
 #include <AliHeader.h>
 #include <TH1F.h>        //HitQA()
 #include <AliLog.h>      //in many methods to print AliInfo 
+#include "AliLoader.h"
 
 ClassImp(AliHMPID)    
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/HMPID/AliHMPIDDigitizer.cxx b/HMPID/AliHMPIDDigitizer.cxx
index 9c81baaa1bd..7e45ca4cf0c 100644
--- a/HMPID/AliHMPIDDigitizer.cxx
+++ b/HMPID/AliHMPIDDigitizer.cxx
@@ -27,6 +27,7 @@
 #include "AliHMPID.h"
 #include "AliHMPIDParam.h"
 #include <TRandom.h>
+#include <TTree.h>
 
 ClassImp(AliHMPIDDigitizer)
 
diff --git a/HMPID/AliHMPIDv1.cxx b/HMPID/AliHMPIDv1.cxx
index d0db224ea8b..0ce7e8d56b9 100644
--- a/HMPID/AliHMPIDv1.cxx
+++ b/HMPID/AliHMPIDv1.cxx
@@ -35,6 +35,7 @@
 #include <TF2.h>              //DefineOpticalProperties()
 #include <TGeoGlobalMagField.h>
 #include <TLorentzVector.h>   //IsLostByFresnel() 
+#include <TTree.h>
  
 ClassImp(AliHMPIDv1)    
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/HMPID/AliHMPIDv2.cxx b/HMPID/AliHMPIDv2.cxx
index 748b778281f..fea5c6b4c8d 100644
--- a/HMPID/AliHMPIDv2.cxx
+++ b/HMPID/AliHMPIDv2.cxx
@@ -37,6 +37,7 @@
 #include <TGeoGlobalMagField.h>
 #include <TGeoPhysicalNode.h> //AddAlignableVolumes()
 #include <TLorentzVector.h>   //IsLostByFresnel() 
+#include <TTree.h>
 
 ClassImp(AliHMPIDv2)    
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/HMPID/AliHMPIDv3.cxx b/HMPID/AliHMPIDv3.cxx
index 3c9ac542f50..7f5809763ef 100644
--- a/HMPID/AliHMPIDv3.cxx
+++ b/HMPID/AliHMPIDv3.cxx
@@ -40,6 +40,7 @@
 #include <TGeoXtru.h>           //CradleBaseVolume()
 #include <TLorentzVector.h>     //IsLostByFresnel() 
 #include <TString.h>            //StepManager()
+#include <TTree.h>
 
 ClassImp(AliHMPIDv3)    
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/ITS/AliITSLoader.cxx b/ITS/AliITSLoader.cxx
index 12bd812d344..63bacd232ae 100644
--- a/ITS/AliITSLoader.cxx
+++ b/ITS/AliITSLoader.cxx
@@ -18,6 +18,7 @@
 #include <TClonesArray.h>
 #include <TClass.h>
 #include <TGeoManager.h>
+#include <TTree.h>
 
 #include "AliITSdigit.h"
 #include "AliITSLoader.h"
diff --git a/ITS/AliITSMeanVertexer.cxx b/ITS/AliITSMeanVertexer.cxx
index 90701f0a0c7..388549e26e0 100644
--- a/ITS/AliITSMeanVertexer.cxx
+++ b/ITS/AliITSMeanVertexer.cxx
@@ -1,6 +1,7 @@
 #include <TFile.h>
 #include <TH1.h>
 #include <TH2.h>
+#include <TTree.h>
 #include "AliGeomManager.h"
 #include "AliITSDetTypeRec.h"
 #include "AliITSInitGeometry.h"
diff --git a/ITS/AliITSTrigger.cxx b/ITS/AliITSTrigger.cxx
index 5a354ced303..d86c3dcbc0e 100644
--- a/ITS/AliITSTrigger.cxx
+++ b/ITS/AliITSTrigger.cxx
@@ -28,6 +28,7 @@
 //                                                                    //
 ////////////////////////////////////////////////////////////////////////
 
+#include <TTree.h>
 #include "AliITSTrigger.h"
 #include "AliLog.h"
 #include "AliRun.h"
diff --git a/ITS/AliITSclustererV2.cxx b/ITS/AliITSclustererV2.cxx
index eed786e88ed..0e1c64d71ea 100644
--- a/ITS/AliITSclustererV2.cxx
+++ b/ITS/AliITSclustererV2.cxx
@@ -5,6 +5,7 @@
 //-------------------------------------------------------------------------
 
 
+#include "AliLoader.h"
 #include "AliRun.h"
 
 #include "AliITSclustererV2.h"
diff --git a/ITS/AliITSv11GeometrySPD.h b/ITS/AliITSv11GeometrySPD.h
index c7f0244b76c..bf21a28c385 100644
--- a/ITS/AliITSv11GeometrySPD.h
+++ b/ITS/AliITSv11GeometrySPD.h
@@ -17,6 +17,7 @@
  * $Id$
  */
 
+#include <TArrayD.h>
 #include <TGeoManager.h>
 #include <TVirtualMC.h>
 #include <TString.h>
diff --git a/ITS/UPGRADE/AliITSupgrade.cxx b/ITS/UPGRADE/AliITSupgrade.cxx
index 5928a694059..9490aeed33c 100644
--- a/ITS/UPGRADE/AliITSupgrade.cxx
+++ b/ITS/UPGRADE/AliITSupgrade.cxx
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
+#include <TTree.h>
 #include <TArrayD.h>            //new constructor
 #include <TFile.h>  
 #include <TGeoManager.h>    
diff --git a/ITS/UPGRADE/AliITSupgradeDigitizer.cxx b/ITS/UPGRADE/AliITSupgradeDigitizer.cxx
index c44c4e9b80e..66d89228ab4 100644
--- a/ITS/UPGRADE/AliITSupgradeDigitizer.cxx
+++ b/ITS/UPGRADE/AliITSupgradeDigitizer.cxx
@@ -27,6 +27,7 @@
 #include "AliITSsegmentationUpgrade.h"
 #include <TObjArray.h>
 #include <TClonesArray.h>
+#include <TTree.h>
 
 extern TRandom *gRandom;
 
diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index d07ad1e9298..adb3ab3c580 100644
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -22,6 +22,7 @@
 // providing simulation data management 
 //-----------------------------------------------------------------------------
 
+#include <TTree.h>
 #include "AliMUON.h"
 
 #include "AliMUONSDigitizerV2.h"
diff --git a/MUON/AliMUONDataInterface.cxx b/MUON/AliMUONDataInterface.cxx
index 9b21f559996..f698927fc94 100644
--- a/MUON/AliMUONDataInterface.cxx
+++ b/MUON/AliMUONDataInterface.cxx
@@ -37,6 +37,7 @@
 #include "AliRunLoader.h"
 #include "AliHeader.h"
 #include "AliCDBManager.h"
+#include "AliLog.h"
 
 #include <Riostream.h>
 #include <TFile.h>
diff --git a/MUON/AliMUONDigitizerV3.cxx b/MUON/AliMUONDigitizerV3.cxx
index 1beca5b84ca..bd7d91be4cc 100644
--- a/MUON/AliMUONDigitizerV3.cxx
+++ b/MUON/AliMUONDigitizerV3.cxx
@@ -44,6 +44,7 @@
 #include "AliLog.h"
 #include "AliRun.h"
 #include "AliRunDigitizer.h"
+#include "AliLoader.h"
 #include "AliRunLoader.h"
 
 #include <Riostream.h>
@@ -53,6 +54,7 @@
 #include <TRandom.h>
 #include <TString.h>
 #include <TSystem.h>
+#include <TTree.h>
 
 //-----------------------------------------------------------------------------
 /// \class AliMUONDigitizerV3
diff --git a/MUON/AliMUONMCDataInterface.cxx b/MUON/AliMUONMCDataInterface.cxx
index 47dbbc16793..8db8af69866 100644
--- a/MUON/AliMUONMCDataInterface.cxx
+++ b/MUON/AliMUONMCDataInterface.cxx
@@ -42,11 +42,13 @@
 #include "AliMpCDB.h"
 
 #include "AliLog.h"
+#include "AliLoader.h"
 #include "AliRunLoader.h"
 #include "AliHeader.h"
 #include "AliStack.h"
 #include "AliCDBManager.h"
 
+#include <TTree.h>
 #include <Riostream.h>
 #include <TClonesArray.h>
 #include <TList.h>
diff --git a/MUON/AliMUONPedestalEventGenerator.cxx b/MUON/AliMUONPedestalEventGenerator.cxx
index 4aba434bf40..3d4b80b759f 100644
--- a/MUON/AliMUONPedestalEventGenerator.cxx
+++ b/MUON/AliMUONPedestalEventGenerator.cxx
@@ -33,6 +33,7 @@
 #include "AliMpDetElement.h"
 #include "AliMpPlaneType.h"
 #include "AliRawDataHeaderSim.h"
+#include "AliLoader.h"
 #include "AliRunLoader.h"
 #include <TClonesArray.h>
 #include <TMath.h>
@@ -40,6 +41,7 @@
 #include <TRandom.h>
 #include <TStopwatch.h>
 #include <TSystem.h>
+#include <TTree.h>
 
 #include <cstdio>
 
diff --git a/MUON/AliMUONSDigitizerV2.cxx b/MUON/AliMUONSDigitizerV2.cxx
index a4d596df9cd..9fda4af2cd9 100644
--- a/MUON/AliMUONSDigitizerV2.cxx
+++ b/MUON/AliMUONSDigitizerV2.cxx
@@ -17,6 +17,7 @@
 
 #include <TClonesArray.h>
 #include <TParticle.h>
+#include <TTree.h>
 
 #include "AliMUONSDigitizerV2.h"
 
diff --git a/MUON/AliMUONSt2GeometryBuilderV2.cxx b/MUON/AliMUONSt2GeometryBuilderV2.cxx
index 458e3b06840..8264c822e0d 100644
--- a/MUON/AliMUONSt2GeometryBuilderV2.cxx
+++ b/MUON/AliMUONSt2GeometryBuilderV2.cxx
@@ -27,6 +27,7 @@
 #include <TVirtualMC.h>
 #include <TGeoMatrix.h>
 #include <Riostream.h>
+#include <TArrayI.h>
 
 #include "AliRun.h"
 #include "AliLog.h"
diff --git a/MUON/AliMUONTrigger.cxx b/MUON/AliMUONTrigger.cxx
index 074ff7ffe6b..49646beb9a6 100644
--- a/MUON/AliMUONTrigger.cxx
+++ b/MUON/AliMUONTrigger.cxx
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
+#include <TTree.h>
 #include "AliMUONTrigger.h"
 
 #include "AliLog.h"
@@ -22,6 +23,7 @@
 #include "AliMUONVTriggerStore.h"
 #include "AliRun.h"
 #include "AliRunLoader.h"
+#include "AliLoader.h"
 #include "AliTriggerInput.h"
 
 
diff --git a/MUON/AliMUONTriggerGUIbdmap.cxx b/MUON/AliMUONTriggerGUIbdmap.cxx
index 2ac6a462dc7..cf2cd868b2f 100644
--- a/MUON/AliMUONTriggerGUIbdmap.cxx
+++ b/MUON/AliMUONTriggerGUIbdmap.cxx
@@ -35,6 +35,7 @@
 #include <TObjArray.h>
 #include <TCanvas.h>
 
+#include "AliLoader.h"
 #include "AliRunLoader.h"
 #include "AliMUONVDigit.h"
 #include "AliMUONGeometryTransformer.h"
diff --git a/MUON/AliMUONTriggerGUIdimap.cxx b/MUON/AliMUONTriggerGUIdimap.cxx
index 5eaf6eabbce..eeeeb098ee9 100644
--- a/MUON/AliMUONTriggerGUIdimap.cxx
+++ b/MUON/AliMUONTriggerGUIdimap.cxx
@@ -33,6 +33,7 @@
 #include <TStyle.h>
 #include <TObjArray.h>
 
+#include "AliLoader.h"
 #include "AliRunLoader.h"
 
 #include "AliMUONVDigit.h"
diff --git a/MUON/AliMUONTriggerGeometryBuilder.cxx b/MUON/AliMUONTriggerGeometryBuilder.cxx
index 33a3eef3c19..c1267d74260 100644
--- a/MUON/AliMUONTriggerGeometryBuilder.cxx
+++ b/MUON/AliMUONTriggerGeometryBuilder.cxx
@@ -26,6 +26,7 @@
 
 #include <TVirtualMC.h>
 #include <TGeoMatrix.h>
+#include <TArrayI.h>
 
 #include "AliLog.h"
 #include "AliRun.h"
diff --git a/PHOS/AliPHOSLoader.h b/PHOS/AliPHOSLoader.h
index 7f9cbc2a51c..edf7b80ada7 100644
--- a/PHOS/AliPHOSLoader.h
+++ b/PHOS/AliPHOSLoader.h
@@ -31,10 +31,11 @@
 
 
 // --- ROOT system ---
-#include "TClonesArray.h"
 class TString ;
 class TParticle ;
 class TTask ;
+#include <TClonesArray.h>
+#include <TTree.h>
 
 // --- Standard library ---
 
diff --git a/PHOS/AliPHOSvImpacts.cxx b/PHOS/AliPHOSvImpacts.cxx
index e2dcab80598..56ffb673c4e 100644
--- a/PHOS/AliPHOSvImpacts.cxx
+++ b/PHOS/AliPHOSvImpacts.cxx
@@ -49,6 +49,7 @@
 //#include <TTree.h>
 #include <TClonesArray.h>
 #include <TVirtualMC.h>
+#include <TTree.h>
 
 // --- Standard library ---
 
@@ -58,6 +59,7 @@
 #include "AliPHOSImpact.h"
 #include "AliPHOSvImpacts.h"
 #include "AliRun.h"
+#include "AliLoader.h"
 #include "AliMC.h"
 #include "AliLog.h"
 
diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx
index 79827a074ad..5908d6c16d5 100644
--- a/PYTHIA6/AliGenPythia.cxx
+++ b/PYTHIA6/AliGenPythia.cxx
@@ -44,6 +44,7 @@
 #include "AliStack.h"
 #include "AliRunLoader.h"
 #include "AliMC.h"
+#include "AliLog.h"
 #include "PyquenCommon.h"
 
 ClassImp(AliGenPythia)
diff --git a/STEER/AliBaseLoader.cxx b/STEER/AliBaseLoader.cxx
index 2abd145fbaa..091ac1fa0e3 100644
--- a/STEER/AliBaseLoader.cxx
+++ b/STEER/AliBaseLoader.cxx
@@ -28,13 +28,14 @@
 
 /* $Id$ */
 
-#include <TString.h>
-#include <TFile.h>
-
 #include "AliBaseLoader.h"
-#include "AliLog.h"
 #include "AliTreeLoader.h"
-#include "AliRunLoader.h"
+#include "AliDataLoader.h"
+#include "AliLoader.h"
+#include "AliLog.h"
+
+#include <TFile.h>
+#include <TString.h>
 
 ClassImp(AliBaseLoader)
 
diff --git a/STEER/AliBaseLoader.h b/STEER/AliBaseLoader.h
index 323dfd99501..763776a1628 100644
--- a/STEER/AliBaseLoader.h
+++ b/STEER/AliBaseLoader.h
@@ -21,20 +21,13 @@
 //                                        //
 ////////////////////////////////////////////
 
-#include <TDirectory.h>
-#include <TNamed.h>
-#include <TString.h>
-#include <TTask.h>
-#include <TTree.h>
-class TFile;
+class TObject;
 class TFolder;
-
-class AliLoader;
 class AliDataLoader;
-class AliObjectLoader;
-class AliRunLoader;
-class AliTaskLoader;
-class AliTreeLoader;
+
+#include <TNamed.h>
+#include <TDirectory.h>
+#include <TString.h>
 
 class AliBaseLoader: public TNamed
 {
diff --git a/STEER/AliCentralTrigger.cxx b/STEER/AliCentralTrigger.cxx
index 3f87ca7f91c..9da29749090 100644
--- a/STEER/AliCentralTrigger.cxx
+++ b/STEER/AliCentralTrigger.cxx
@@ -42,6 +42,7 @@
 #include "AliLog.h"
 #include "AliRun.h"
 #include "AliRunLoader.h"
+#include "AliLoader.h"
 #include "AliModule.h"
 
 #include "AliTriggerInput.h"
diff --git a/STEER/AliDataLoader.cxx b/STEER/AliDataLoader.cxx
index 1abb6f33694..3f4b8697c26 100644
--- a/STEER/AliDataLoader.cxx
+++ b/STEER/AliDataLoader.cxx
@@ -28,16 +28,18 @@
 
 /* $Id$ */
 
-#include <TBits.h>
-#include <TFile.h>
-#include <TROOT.h>
-#include <TString.h>
-
 #include "AliDataLoader.h"
-#include "AliLog.h"
-#include "AliObjectLoader.h"
 #include "AliRunLoader.h"
+#include "AliLoader.h"
+#include "AliObjectLoader.h"
 #include "AliTreeLoader.h"
+#include "AliTaskLoader.h"
+#include "AliLog.h"
+
+#include <TFile.h>
+#include <TROOT.h>
+#include <TString.h>
+#include <TBits.h>
 
 ClassImp(AliDataLoader)
 
diff --git a/STEER/AliDataLoader.h b/STEER/AliDataLoader.h
index 35f2cc46482..030c75a10e7 100644
--- a/STEER/AliDataLoader.h
+++ b/STEER/AliDataLoader.h
@@ -21,9 +21,6 @@
 //                                        //
 ////////////////////////////////////////////
 
-#include <TDirectory.h>
-#include <TNamed.h>
-#include <TString.h>
 class TTask;
 class TTree;
 class TFile;
@@ -36,6 +33,10 @@ class AliRunLoader;
 class AliTaskLoader;
 class AliTreeLoader;
 
+#include <TDirectory.h>
+#include <TNamed.h>
+#include <TString.h>
+
 class AliDataLoader: public TNamed
  {
   public:
diff --git a/STEER/AliMC.cxx b/STEER/AliMC.cxx
index f18473ffade..23e43df244a 100644
--- a/STEER/AliMC.cxx
+++ b/STEER/AliMC.cxx
@@ -34,6 +34,7 @@
 #include <TStopwatch.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
+#include <TTree.h>
  
 #include "AliCDBEntry.h"
 #include "AliCDBManager.h"
diff --git a/STEER/AliObjectLoader.cxx b/STEER/AliObjectLoader.cxx
index d33f85bcc66..d40d7f76910 100644
--- a/STEER/AliObjectLoader.cxx
+++ b/STEER/AliObjectLoader.cxx
@@ -26,9 +26,10 @@
 //                                                                                         //
 /////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "AliLog.h"
 #include "AliObjectLoader.h"
-#include "AliRunLoader.h"
+#include "AliDataLoader.h"
+#include "AliLog.h"
+#include <TFolder.h>
 
 ClassImp(AliObjectLoader)
 
diff --git a/STEER/AliObjectLoader.h b/STEER/AliObjectLoader.h
index ca495544267..bfb272ed843 100644
--- a/STEER/AliObjectLoader.h
+++ b/STEER/AliObjectLoader.h
@@ -12,6 +12,11 @@
 //                                        //
 ////////////////////////////////////////////
 
+class TObject;
+class TFolder;
+class TString;
+class AliDataLoader;
+
 #include "AliBaseLoader.h"
 
 class AliObjectLoader: public AliBaseLoader
diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index 58407ebe594..316c47f9f7f 100644
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -46,6 +46,7 @@
 #include <TSystem.h>
 #include <TVirtualMC.h>
 #include <TGeoManager.h>
+#include <TTree.h>
 // 
 #include "AliLog.h"
 #include "AliDetector.h"
diff --git a/STEER/AliRunDigitizer.cxx b/STEER/AliRunDigitizer.cxx
index b17d65c6a23..9f715741a2f 100644
--- a/STEER/AliRunDigitizer.cxx
+++ b/STEER/AliRunDigitizer.cxx
@@ -92,8 +92,9 @@
 
 // ROOT includes
 
-#include <Riostream.h>
 class TList;
+#include <Riostream.h>
+#include <TTree.h>
 
 // AliROOT includes
 
diff --git a/STEER/AliRunLoader.cxx b/STEER/AliRunLoader.cxx
index 3ebc988d396..54c99d69277 100644
--- a/STEER/AliRunLoader.cxx
+++ b/STEER/AliRunLoader.cxx
@@ -45,18 +45,9 @@
 //                                                                  //
 //////////////////////////////////////////////////////////////////////
 
-#include <TROOT.h>
-#include <TBranch.h>
-#include <TFile.h>
-#include <TFolder.h>
-#include <TObjArray.h>
-#include <TString.h>
-class TTask;
-#include <TTree.h>
-
+#include "AliRunLoader.h"
 #include "AliLog.h"
 #include "AliRun.h"
-#include "AliConfig.h"
 #include "AliLoader.h"
 #include "AliHeader.h"
 #include "AliStack.h"
@@ -65,6 +56,15 @@ class TTask;
 #include "AliCDBLocal.h"
 #include "AliCentralTrigger.h"
 
+#include <TTree.h>
+#include <TBranch.h>
+#include <TROOT.h>
+#include <TFile.h>
+#include <TFolder.h>
+#include <TObjArray.h>
+#include <TString.h>
+#include <TTask.h>
+
 ClassImp(AliRunLoader)
 
 AliRunLoader* AliRunLoader::fgRunLoader = 0x0;
diff --git a/STEER/AliRunLoader.h b/STEER/AliRunLoader.h
index fce21170414..8db2fc899a5 100644
--- a/STEER/AliRunLoader.h
+++ b/STEER/AliRunLoader.h
@@ -22,13 +22,6 @@
 //                                                                 //
 /////////////////////////////////////////////////////////////////////
 
-#include <TNamed.h>
-
-#include "AliConfig.h"
-#include "AliLoader.h"
-#include "AliDataLoader.h"
-#include "AliLog.h"
-
 class TFile;
 class TString;
 class TFolder;
@@ -42,10 +35,14 @@ class AliLoader;
 class AliDetector;
 class AliHeader;
 class AliStack;
-class AliRunDigitizer;
 class AliCDBEntry;
 class AliCentralTrigger;
 
+#include <TNamed.h>
+
+#include "AliConfig.h"
+#include "AliDataLoader.h"
+
 class AliRunLoader: public TNamed
 {
   public:
diff --git a/STEER/AliStream.cxx b/STEER/AliStream.cxx
index 7658b123196..b6d2b00d958 100644
--- a/STEER/AliStream.cxx
+++ b/STEER/AliStream.cxx
@@ -18,6 +18,7 @@
 #include <TROOT.h>
 #include <TFile.h>
 #include <TObjString.h>
+#include <TTree.h>
 
 #include "AliLog.h"
 #include "AliLoader.h"
diff --git a/STEER/AliTaskLoader.cxx b/STEER/AliTaskLoader.cxx
index 42d6d7cb0df..c7b1a92ac88 100644
--- a/STEER/AliTaskLoader.cxx
+++ b/STEER/AliTaskLoader.cxx
@@ -29,9 +29,9 @@
 
 /* $Id$ */
 
-#include "AliLog.h"
-#include "AliRunLoader.h"
 #include "AliTaskLoader.h"
+#include "AliDataLoader.h"
+#include "AliLog.h"
 
 ClassImp(AliTaskLoader)
 
diff --git a/STEER/AliTaskLoader.h b/STEER/AliTaskLoader.h
index b671ec634f7..bd86c4e9249 100644
--- a/STEER/AliTaskLoader.h
+++ b/STEER/AliTaskLoader.h
@@ -12,7 +12,11 @@
 
 /* $Id$ */
 
+class TObject;
+class AliDataLoader;
+
 #include "AliBaseLoader.h"
+#include <TTask.h>
  
 class AliTaskLoader: public AliBaseLoader
  {
diff --git a/STEER/AliTreeLoader.cxx b/STEER/AliTreeLoader.cxx
index 4717b6c7c3c..4b600e083e6 100644
--- a/STEER/AliTreeLoader.cxx
+++ b/STEER/AliTreeLoader.cxx
@@ -27,12 +27,13 @@
 /////////////////////////////////////////////////////////////////////////////////////////////
 
 /* $Id$ */
-#include <TFile.h>
 
 #include "AliTreeLoader.h"
-#include "AliLog.h"
 #include "AliRunLoader.h"
+#include "AliLog.h"
 
+#include <TFile.h>
+#include <TFolder.h>
 
 ClassImp(AliTreeLoader)
 
diff --git a/STEER/AliTreeLoader.h b/STEER/AliTreeLoader.h
index 6bc8ae8d7e4..31bda1050e4 100644
--- a/STEER/AliTreeLoader.h
+++ b/STEER/AliTreeLoader.h
@@ -21,9 +21,10 @@
 ////////////////////////////////////////////
 
 class TString;
-class TTree;
 
 #include "AliObjectLoader.h"
+#include <TTree.h>
+#include <TObject.h>
 
 class AliTreeLoader: public AliObjectLoader
  {
diff --git a/STEER/AliTriggerDetector.cxx b/STEER/AliTriggerDetector.cxx
index c90071ad362..c43be385113 100644
--- a/STEER/AliTriggerDetector.cxx
+++ b/STEER/AliTriggerDetector.cxx
@@ -35,6 +35,7 @@
 #include "AliLog.h"
 #include "AliRun.h"
 #include "AliRunLoader.h"
+#include "AliLoader.h"
 
 #include "AliTriggerInput.h"
 #include "AliTriggerDetector.h"
diff --git a/STRUCT/AliABSO.cxx b/STRUCT/AliABSO.cxx
index 419beed9f8e..baddc17a754 100644
--- a/STRUCT/AliABSO.cxx
+++ b/STRUCT/AliABSO.cxx
@@ -37,6 +37,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <TGeoGlobalMagField.h>
+#include <TArrayI.h>
 
 #include "AliABSO.h"
 #include "AliRun.h"
diff --git a/STRUCT/AliABSOv0.cxx b/STRUCT/AliABSOv0.cxx
index a5d9fcbfa61..c4eaa03d4e5 100644
--- a/STRUCT/AliABSOv0.cxx
+++ b/STRUCT/AliABSOv0.cxx
@@ -47,6 +47,7 @@
 #include <TGeoPgon.h>
 #include <TGeoArb8.h>
 #include <TGeoMedium.h>
+#include <TArrayI.h>
 
 #include "AliABSOv0.h"
 #include "AliConst.h"
diff --git a/STRUCT/AliBODY.cxx b/STRUCT/AliBODY.cxx
index afdb878ac3e..3ad9eb97574 100644
--- a/STRUCT/AliBODY.cxx
+++ b/STRUCT/AliBODY.cxx
@@ -38,6 +38,7 @@
 
 #include <TGeoGlobalMagField.h>
 #include <TVirtualMC.h>
+#include <TArrayI.h>
 
 #include "AliBODY.h"
 #include "AliMagF.h"
diff --git a/STRUCT/AliDIPOv2.cxx b/STRUCT/AliDIPOv2.cxx
index 5e00dceef0c..b6594a3bc26 100644
--- a/STRUCT/AliDIPOv2.cxx
+++ b/STRUCT/AliDIPOv2.cxx
@@ -38,6 +38,7 @@
 #include <TGeoGlobalMagField.h>
 #include <TGeoVolume.h>
 #include <TVirtualMC.h>
+#include <TArrayI.h>
 
 #include "AliConst.h"
 #include "AliDIPOv2.h"
diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx
index d48d0eb639b..9c2271155b1 100644
--- a/STRUCT/AliHALL.cxx
+++ b/STRUCT/AliHALL.cxx
@@ -38,6 +38,7 @@
 
 #include <TGeoGlobalMagField.h>
 #include <TVirtualMC.h>
+#include <TArrayI.h>
 
 #include "AliConst.h"
 #include "AliHALL.h"
diff --git a/STRUCT/AliPIPEv0.cxx b/STRUCT/AliPIPEv0.cxx
index f476dd80969..0d83788bbb4 100644
--- a/STRUCT/AliPIPEv0.cxx
+++ b/STRUCT/AliPIPEv0.cxx
@@ -27,6 +27,7 @@
 #include <TGeoGlobalMagField.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
+#include <TArrayI.h>
 
 #include "AliConst.h"
 #include "AliMagF.h"
diff --git a/STRUCT/AliSHILv0.cxx b/STRUCT/AliSHILv0.cxx
index 9e10f27985f..c985b532dbd 100644
--- a/STRUCT/AliSHILv0.cxx
+++ b/STRUCT/AliSHILv0.cxx
@@ -30,6 +30,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <TVirtualMC.h>
+#include <TArrayI.h>
 
 #include "AliConst.h"
 #include "AliRun.h"
diff --git a/T0/AliT0Trigger.cxx b/T0/AliT0Trigger.cxx
index 8fd9a54685e..181eada11ba 100644
--- a/T0/AliT0Trigger.cxx
+++ b/T0/AliT0Trigger.cxx
@@ -26,6 +26,7 @@
 
 #include "AliLog.h"
 #include "AliRun.h"
+#include "AliLoader.h"
 #include "AliRunLoader.h"
 #include "AliTriggerInput.h"
 #include "AliT0Parameters.h"
diff --git a/THijing/AliGenBeamGasNew.cxx b/THijing/AliGenBeamGasNew.cxx
index f91537216c7..818a2a314c2 100644
--- a/THijing/AliGenBeamGasNew.cxx
+++ b/THijing/AliGenBeamGasNew.cxx
@@ -35,7 +35,7 @@
 #include "AliGenCocktail.h" 
 #include "AliGenCocktailEntry.h"
 #include "AliGenCocktailEventHeader.h"
-#include "../THijing/AliGenHijing.h" 
+#include "AliGenHijing.h" 
 #include "AliCollisionGeometry.h"
 #include "AliRun.h"
 #include "AliMC.h"
diff --git a/TOF/AliTOFClusterFinderV1.cxx b/TOF/AliTOFClusterFinderV1.cxx
index e1250695c6d..78aff2c9094 100644
--- a/TOF/AliTOFClusterFinderV1.cxx
+++ b/TOF/AliTOFClusterFinderV1.cxx
@@ -44,6 +44,7 @@ Revision 0.01  2008/05/10 A. De Caro
 #include "AliDAQ.h"
 #include "AliLog.h"
 #include "AliRawReader.h"
+#include "AliLoader.h"
 #include "AliRunLoader.h"
 #include "AliGeomManager.h"
 
diff --git a/TOF/AliTOFT0.cxx b/TOF/AliTOFT0.cxx
index 76c98429b25..668542b3b09 100644
--- a/TOF/AliTOFT0.cxx
+++ b/TOF/AliTOFT0.cxx
@@ -92,6 +92,7 @@
 #include <TRandom.h>
 #include <TROOT.h>
 
+#include "AliLoader.h"
 #include "AliMC.h"
 #include "AliRun.h"
 
diff --git a/TOF/AliTOFTrigger.cxx b/TOF/AliTOFTrigger.cxx
index 4e1768ca647..df5e183798e 100644
--- a/TOF/AliTOFTrigger.cxx
+++ b/TOF/AliTOFTrigger.cxx
@@ -32,6 +32,7 @@
 /////////////////////////////////////////////////////////////////////
 
 #include <TClonesArray.h>
+#include <TTree.h>
 
 #include "AliLoader.h"
 #include "AliLog.h"
diff --git a/TOF/AliTOFTrigger.h b/TOF/AliTOFTrigger.h
index 58866cd4a60..a44d1849616 100644
--- a/TOF/AliTOFTrigger.h
+++ b/TOF/AliTOFTrigger.h
@@ -13,6 +13,7 @@
 /////////////////////////////////////////////////
 
 #include "AliTriggerDetector.h"
+#include "AliLog.h"
 
 class AliTOFrawData;
 class AliTOFTriggerMask;
diff --git a/TPC/AliTPCDigitizer.cxx b/TPC/AliTPCDigitizer.cxx
index b64e1f73168..fa2aef886aa 100644
--- a/TPC/AliTPCDigitizer.cxx
+++ b/TPC/AliTPCDigitizer.cxx
@@ -46,6 +46,7 @@
 #include "AliTPCParam.h"
 #include "AliTPCParamSR.h" 
 #include "AliRun.h"
+#include "AliLoader.h"
 #include "AliPDG.h"
 #include "AliRunDigitizer.h"
 #include "AliSimDigits.h"
diff --git a/TPC/AliTPCFast.cxx b/TPC/AliTPCFast.cxx
index 039d0bbc763..ff9d5d9ae73 100644
--- a/TPC/AliTPCFast.cxx
+++ b/TPC/AliTPCFast.cxx
@@ -24,8 +24,10 @@
 #include <TParticle.h>
 #include <TVector.h>
 #include <TRandom.h>
+#include <TTree.h>
 
 #include "AliRunLoader.h"
+#include "AliLoader.h"
 #include "AliRun.h"
 #include "AliMC.h"
 #include "AliTPC.h"
diff --git a/TPC/AliTPCPid.h b/TPC/AliTPCPid.h
index 58336916623..12fb311a758 100644
--- a/TPC/AliTPCPid.h
+++ b/TPC/AliTPCPid.h
@@ -7,12 +7,8 @@
 /* $Id$ */
 
 #include <TObject.h>
-//#include <TF1.h>
-//#include <TClonesArray.h>
 #include <TVector.h>
-#include "../TPC/AliTPCtrack.h"
-//#include "../ITS/AliITSIOTrack.h"
-class AliKalmanTrack;
+#include "AliTPCtrack.h"
 #include <assert.h>
 
 class TF1;
@@ -37,7 +33,6 @@ public:
 	Int_t	GetPcode(TClonesArray* ,Float_t) const;
 	Int_t	GetPcode(Float_t q,Float_t pm);
 	Int_t   GetPcode(AliTPCtrack*track);
-        //Int_t   GetPcode(AliKalmanTrack* track);
 	void	SetCut(Int_t n, Float_t pm, Float_t pilo, Float_t pihi,
 			    Float_t klo, Float_t khi, Float_t plo, 
                             Float_t phi);
diff --git a/TPC/AliTPCQADataMakerSim.cxx b/TPC/AliTPCQADataMakerSim.cxx
index a9095cd4dd1..1f30233bda8 100644
--- a/TPC/AliTPCQADataMakerSim.cxx
+++ b/TPC/AliTPCQADataMakerSim.cxx
@@ -32,6 +32,7 @@
   list. This have been implemented but not tested.
 */
 
+#include <TTree.h>
 #include "AliTPCQADataMakerSim.h"
 
 // --- ROOT system ---
diff --git a/TRD/AliTRD.cxx b/TRD/AliTRD.cxx
index 38fd28d0a25..d36b24ca4c2 100644
--- a/TRD/AliTRD.cxx
+++ b/TRD/AliTRD.cxx
@@ -30,6 +30,7 @@
 #include "AliMC.h"
 #include "AliMagF.h"
 #include "AliRun.h"
+#include "AliLoader.h"
 
 #include "AliTRD.h"
 #include "AliTRDdigitizer.h"
diff --git a/TRD/AliTRDSimParam.cxx b/TRD/AliTRDSimParam.cxx
index e6ce23c21d3..9832e02b173 100644
--- a/TRD/AliTRDSimParam.cxx
+++ b/TRD/AliTRDSimParam.cxx
@@ -30,6 +30,7 @@
 
 #include "AliTRDSimParam.h"
 #include "AliTRDCommonParam.h"
+#include "AliLog.h"
 
 ClassImp(AliTRDSimParam)
 
diff --git a/TRD/AliTRDTriggerL1.cxx b/TRD/AliTRDTriggerL1.cxx
index 7919c6cbf44..c361955c097 100644
--- a/TRD/AliTRDTriggerL1.cxx
+++ b/TRD/AliTRDTriggerL1.cxx
@@ -26,6 +26,7 @@
 
 
 #include "TObjArray.h"
+#include <TTree.h>
 
 #include "AliLog.h"
 #include "AliTriggerInput.h"
diff --git a/TRD/AliTRDmcmSim.cxx b/TRD/AliTRDmcmSim.cxx
index c1964c36af8..247dee10703 100644
--- a/TRD/AliTRDmcmSim.cxx
+++ b/TRD/AliTRDmcmSim.cxx
@@ -35,6 +35,7 @@
 #include "TRandom.h"
 #include "TClonesArray.h"
 #include "TMath.h"
+#include <TTree.h>
 
 #include "AliLog.h"
 #include "AliRunLoader.h"
diff --git a/TRD/AliTRDptrgCBAC.h b/TRD/AliTRDptrgCBAC.h
index c31ec639f86..2b093baf84b 100644
--- a/TRD/AliTRDptrgCBAC.h
+++ b/TRD/AliTRDptrgCBAC.h
@@ -11,8 +11,9 @@
 //
 // --------------------------------------------------------
 
-#include "TObject.h"
 #include "AliTRDptrgParam.h"
+#include <TObjArray.h>
+#include <TObject.h>
 
 class AliRunLoader;
 
diff --git a/TRD/AliTRDptrgCBB.cxx b/TRD/AliTRDptrgCBB.cxx
index 2d285e08917..d4cd9a1c938 100644
--- a/TRD/AliTRDptrgCBB.cxx
+++ b/TRD/AliTRDptrgCBB.cxx
@@ -34,6 +34,7 @@
 #include "AliTRDptrgCBAC.h"
 #include "AliTRDptrgTLMU.h"
 #include "AliTRDptrgCBB.h"
+#include "AliLog.h"
 ClassImp(AliTRDptrgCBB)
 
 AliTRDptrgCBB::AliTRDptrgCBB(AliRunLoader *rl) 
diff --git a/TRD/AliTRDptrgCBB.h b/TRD/AliTRDptrgCBB.h
index c2c212e9aca..c477bef2e08 100644
--- a/TRD/AliTRDptrgCBB.h
+++ b/TRD/AliTRDptrgCBB.h
@@ -10,8 +10,9 @@
 // PTRG simulation
 //
 // --------------------------------------------------------
-#include "TObject.h"
 #include "AliTRDptrgParam.h"
+#include <TObjArray.h>
+#include <TObject.h>
 
 class AliRunLoader;
 
diff --git a/TRD/AliTRDptrgFEB.cxx b/TRD/AliTRDptrgFEB.cxx
index 60e15fed635..c83b432034f 100644
--- a/TRD/AliTRDptrgFEB.cxx
+++ b/TRD/AliTRDptrgFEB.cxx
@@ -29,13 +29,15 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include <TClonesArray.h> 
+#include <TTree.h>
 
 #include "AliRunLoader.h"
+#include "AliLoader.h"
 #include "AliLog.h"
 
-#include "../VZERO/AliVZEROdigit.h" 
-#include "../VZERO/AliVZEROCalibData.h"
-#include "../T0/AliT0digit.h"
+#include "AliVZEROdigit.h" 
+#include "AliVZEROCalibData.h"
+#include "AliT0digit.h"
 
 #include "AliTRDptrgParam.h"
 #include "AliTRDptrgLUT.h"
diff --git a/TRD/AliTRDptrgParam.h b/TRD/AliTRDptrgParam.h
index d444e41f57e..0b6cf3f6247 100644
--- a/TRD/AliTRDptrgParam.h
+++ b/TRD/AliTRDptrgParam.h
@@ -10,6 +10,9 @@
 // Singleton class to hold the parameters steering the PTRG 
 // 
 // --------------------------------------------------------
+
+class TArrayI;
+class TObjArray;
 #include "TObject.h"
 
   enum AliTRDptrgFEBType_t{ kUndefined = (Int_t)0, 
diff --git a/TRD/AliTRDptrgTLMU.cxx b/TRD/AliTRDptrgTLMU.cxx
index 80f94d774f6..0b73cb567ba 100644
--- a/TRD/AliTRDptrgTLMU.cxx
+++ b/TRD/AliTRDptrgTLMU.cxx
@@ -31,13 +31,14 @@
 #include "AliRun.h"
 #include "AliRunLoader.h"
 
-#include "../TOF/AliTOFdigit.h"
-#include "../RAW/AliRawReader.h" // needed for AliTOFTrigger's raw digit support
-#include "../TOF/AliTOFTrigger.h"
+#include "AliTOFdigit.h"
+#include "AliRawReader.h" // needed for AliTOFTrigger's raw digit support
+#include "AliTOFTrigger.h"
 
 #include "AliTRDptrgParam.h"
 
 #include "AliTRDptrgTLMU.h"
+#include "AliLog.h"
 
 ClassImp(AliTRDptrgTLMU)
 
diff --git a/TRD/AliTRDrawData.cxx b/TRD/AliTRDrawData.cxx
index ca9bc691205..45bfbc2e255 100644
--- a/TRD/AliTRDrawData.cxx
+++ b/TRD/AliTRDrawData.cxx
@@ -30,6 +30,7 @@
 #include "AliRawReader.h"
 #include "AliLog.h"
 #include "AliFstream.h"
+#include "AliLoader.h"
 #include "AliTreeLoader.h"
 
 #include "AliTRDrawData.h"
diff --git a/TRD/AliTRDrawStream.cxx b/TRD/AliTRDrawStream.cxx
index b6b5042720a..85ec5c8ed7e 100644
--- a/TRD/AliTRDrawStream.cxx
+++ b/TRD/AliTRDrawStream.cxx
@@ -39,6 +39,7 @@
 #include "AliTRDtrackletWord.h"
 #include "AliESDTrdTrack.h"
 #include "AliTreeLoader.h"
+#include "AliLoader.h"
 
 #include "AliTRDrawStream.h"
 
diff --git a/TRD/CMakelibTRDsim.pkg b/TRD/CMakelibTRDsim.pkg
index 7a6891de6c0..a1fa04ee3d3 100644
--- a/TRD/CMakelibTRDsim.pkg
+++ b/TRD/CMakelibTRDsim.pkg
@@ -43,7 +43,7 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
 set ( DHDR  TRDsimLinkDef.h)
 
-set ( EINCLUDE  RAW)
+set ( EINCLUDE  RAW VZERO T0 TOF)
 
 if( ALICE_TARGET STREQUAL "win32gcc")
 
diff --git a/VZERO/AliVZEROTrigger.cxx b/VZERO/AliVZEROTrigger.cxx
index 8f6041b7055..de566fa2b8e 100644
--- a/VZERO/AliVZEROTrigger.cxx
+++ b/VZERO/AliVZEROTrigger.cxx
@@ -24,8 +24,11 @@
 
 
 #include <TClonesArray.h>
+#include <TTree.h>
 
 #include "AliRun.h"
+#include "AliLoader.h"
+#include "AliLog.h"
 #include "AliRunLoader.h"
 #include "AliTriggerInput.h"
 
diff --git a/VZERO/AliVZEROv7.cxx b/VZERO/AliVZEROv7.cxx
index ab9d59f5805..d1c637ff288 100644
--- a/VZERO/AliVZEROv7.cxx
+++ b/VZERO/AliVZEROv7.cxx
@@ -48,6 +48,7 @@
 #include "TGeoTube.h"
 #include "TGeoArb8.h"
 #include "TGeoCompositeShape.h"
+#include <TTree.h>
 
 // --- AliRoot header files ---
 #include "AliRun.h"
diff --git a/ZDC/AliZDCDigitizer.cxx b/ZDC/AliZDCDigitizer.cxx
index db7c431bb1a..124328ef777 100644
--- a/ZDC/AliZDCDigitizer.cxx
+++ b/ZDC/AliZDCDigitizer.cxx
@@ -36,6 +36,7 @@
 #include "AliGenHijingEventHeader.h"
 #include "AliRunDigitizer.h"
 #include "AliRunLoader.h"
+#include "AliLoader.h"
 #include "AliGRPObject.h"
 #include "AliCDBManager.h"
 #include "AliCDBEntry.h"
diff --git a/ZDC/AliZDCTrigger.cxx b/ZDC/AliZDCTrigger.cxx
index d1d6b613b67..a6ee5d57b86 100644
--- a/ZDC/AliZDCTrigger.cxx
+++ b/ZDC/AliZDCTrigger.cxx
@@ -19,6 +19,7 @@
 //
 // ****************************************************************
 
+#include <TTree.h>
 #include "AliLog.h"
 #include "AliRun.h"
 #include "AliLoader.h"