From: quark <quark@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 9 Mar 2012 18:13:17 +0000 (+0000)
Subject: Change to support compilation when ALICE_INSTALL is not same as ALICE_ROOT
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=6c49a8e133417c4a687af6075dce81efd0f608eb

Change to support compilation when ALICE_INSTALL is not same as ALICE_ROOT
---

diff --git a/EVE/EveBase/AliEveVSDCreator.cxx b/EVE/EveBase/AliEveVSDCreator.cxx
index a23cbb5c1c4..728dc520d65 100644
--- a/EVE/EveBase/AliEveVSDCreator.cxx
+++ b/EVE/EveBase/AliEveVSDCreator.cxx
@@ -174,7 +174,7 @@ void AliEveVSDCreator::CreateTrees()
   }
   catch(TEveException& exc)
   {
-    Warning(exc, "skipping AliEveV0 extraction.");
+    Warning(kEH, "Executing %s skipping AliEveV0 extraction.", exc.Data());
     goto end_esd_processing;
   }
 
diff --git a/EVE/EveDet/AliEveEMCALSModuleData.h b/EVE/EveDet/AliEveEMCALSModuleData.h
index b36fe45bb58..60fa8d3dfc4 100644
--- a/EVE/EveDet/AliEveEMCALSModuleData.h
+++ b/EVE/EveDet/AliEveEMCALSModuleData.h
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include "AliEveEMCALData.h"
+#include <AliEveEMCALData.h>
 
 class TClonesArray;
 class TGeoNode;
diff --git a/EVE/EveDet/AliEveITSModule.h b/EVE/EveDet/AliEveITSModule.h
index e8005f98201..a8bd4f40b24 100644
--- a/EVE/EveDet/AliEveITSModule.h
+++ b/EVE/EveDet/AliEveITSModule.h
@@ -11,7 +11,7 @@
 
 #include <TEveQuadSet.h>
 
-#include <EveDet/AliEveITSDigitsInfo.h>
+#include <AliEveITSDigitsInfo.h>
 
 
 class AliEveITSModule : public TEveQuadSet
diff --git a/EVE/EveDet/AliEveITSScaledModule.h b/EVE/EveDet/AliEveITSScaledModule.h
index 5596da2b543..76b639079aa 100644
--- a/EVE/EveDet/AliEveITSScaledModule.h
+++ b/EVE/EveDet/AliEveITSScaledModule.h
@@ -11,7 +11,7 @@
 #define AliEveITSScaledModule_H
 
 #include <TEveUtil.h>
-#include <EveDet/AliEveITSModule.h>
+#include <AliEveITSModule.h>
 
 #include <TQObject.h>
 
diff --git a/EVE/EveDet/AliEveListAnalyser.h b/EVE/EveDet/AliEveListAnalyser.h
index 17844b19fbd..0146f7668d2 100644
--- a/EVE/EveDet/AliEveListAnalyser.h
+++ b/EVE/EveDet/AliEveListAnalyser.h
@@ -64,7 +64,7 @@
 
 #include <TClass.h>
 #include <TEveElement.h>
-#include <EveDet/AliEveTRDData.h>
+#include <AliEveTRDData.h>
 
 #define SIGNATURE_ERROR           -1
 #define NOT_EXIST_ERROR           -2
diff --git a/EVE/EveDet/AliEveTPCSector3D.h b/EVE/EveDet/AliEveTPCSector3D.h
index 515794a7b2c..101c04c5506 100644
--- a/EVE/EveDet/AliEveTPCSector3D.h
+++ b/EVE/EveDet/AliEveTPCSector3D.h
@@ -10,8 +10,8 @@
 #ifndef AliEveTPCSector3D_H
 #define AliEveTPCSector3D_H
 
-#include <EveDet/AliEveTPCSectorViz.h>
-#include <EveDet/AliEveTPCSectorData.h>
+#include <AliEveTPCSectorViz.h>
+#include <AliEveTPCSectorData.h>
 
 #include <TEveBoxSet.h>
 #include <TEvePointSet.h>
diff --git a/EVE/EveDet/AliEveTRDTrackList.h b/EVE/EveDet/AliEveTRDTrackList.h
index e09c3b757d9..7dacbd67ee1 100644
--- a/EVE/EveDet/AliEveTRDTrackList.h
+++ b/EVE/EveDet/AliEveTRDTrackList.h
@@ -60,7 +60,7 @@
 
 
 #include <TEveElement.h>
-#include <EveDet/AliEveTRDData.h>
+#include <AliEveTRDData.h>
 
 #define SIGNATURE_ERROR   -1
 #define NOT_EXIST_ERROR   -2
diff --git a/EVE/alice-macros/MUON_displayData.C b/EVE/alice-macros/MUON_displayData.C
index 9d0a0ea3acb..23f37af7175 100644
--- a/EVE/alice-macros/MUON_displayData.C
+++ b/EVE/alice-macros/MUON_displayData.C
@@ -23,17 +23,17 @@
 #include <TEveElement.h>
 #include <TEveTrack.h>
 
-#include <MUON/mapping/AliMpSegmentation.h>
-#include <MUON/mapping/AliMpDDLStore.h>
-#include <MUON/mapping/AliMpCDB.h>
-#include <MUON/AliMUONTrackExtrap.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDMuonTrack.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveMUONData.h>
-#include <EVE/EveDet/AliEveMUONChamber.h>
-#include <EVE/EveDet/AliEveMUONTrack.h>
+#include <AliMpSegmentation.h>
+#include <AliMpDDLStore.h>
+#include <AliMpCDB.h>
+#include <AliMUONTrackExtrap.h>
+#include <AliRunLoader.h>
+#include <AliESDEvent.h>
+#include <AliESDMuonTrack.h>
+#include <AliEveEventManager.h>
+#include <AliEveMUONData.h>
+#include <AliEveMUONChamber.h>
+#include <AliEveMUONTrack.h>
 #endif
 
 class AliEveMUONData;
diff --git a/EVE/alice-macros/MUON_displaySimu.C b/EVE/alice-macros/MUON_displaySimu.C
index bc921a3063e..8a3d604399d 100644
--- a/EVE/alice-macros/MUON_displaySimu.C
+++ b/EVE/alice-macros/MUON_displaySimu.C
@@ -23,21 +23,21 @@
 #include <TEveElement.h>
 #include <TEveTrack.h>
 
-#include <MUON/mapping/AliMpSegmentation.h>
-#include <MUON/mapping/AliMpDDLStore.h>
-#include <MUON/mapping/AliMpCDB.h>
-#include <MUON/AliMUONRecoCheck.h>
-#include <MUON/AliMUONTrack.h>
-#include <MUON/AliMUONTrackExtrap.h>
-#include <MUON/AliMUONVTrackStore.h>
-#include <STEER/STEERBase/AliStack.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDMuonTrack.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveMUONData.h>
-#include <EVE/EveDet/AliEveMUONChamber.h>
-#include <EVE/EveDet/AliEveMUONTrack.h>
+#include <AliMpSegmentation.h>
+#include <AliMpDDLStore.h>
+#include <AliMpCDB.h>
+#include <AliMUONRecoCheck.h>
+#include <AliMUONTrack.h>
+#include <AliMUONTrackExtrap.h>
+#include <AliMUONVTrackStore.h>
+#include <AliStack.h>
+#include <AliRunLoader.h>
+#include <AliESDEvent.h>
+#include <AliESDMuonTrack.h>
+#include <AliEveEventManager.h>
+#include <AliEveMUONData.h>
+#include <AliEveMUONChamber.h>
+#include <AliEveMUONTrack.h>
 #else
 class AliEveMUONData;
 class AliEveEventManager;
diff --git a/EVE/alice-macros/MUON_makeGeom.C b/EVE/alice-macros/MUON_makeGeom.C
index e8b8acb3c23..342dc365452 100644
--- a/EVE/alice-macros/MUON_makeGeom.C
+++ b/EVE/alice-macros/MUON_makeGeom.C
@@ -13,8 +13,8 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TGeoManager.h>
 
-#include <MUON/mapping/AliMpCDB.h>
-#include <STEER/STEER/AliRun.h>
+#include <AliMpCDB.h>
+#include <AliRun.h>
 #endif
 
 void MUON_makeGeom()
diff --git a/EVE/alice-macros/acorde_esd.C b/EVE/alice-macros/acorde_esd.C
index 0d5d58fa1fa..20a00abde49 100644
--- a/EVE/alice-macros/acorde_esd.C
+++ b/EVE/alice-macros/acorde_esd.C
@@ -13,9 +13,9 @@
 #include <TEveElement.h>
 #include <TEveGeoShape.h>
 
-#include <EveBase/AliEveEventManager.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDACORDE.h>
+#include <AliEveEventManager.h>
+#include <AliESDEvent.h>
+#include <AliESDACORDE.h>
 #endif
 
 TString acorde_module_path(Int_t module);
diff --git a/EVE/alice-macros/acorde_hits.C b/EVE/alice-macros/acorde_hits.C
index 9dffd52b2b5..0baeb45cd72 100644
--- a/EVE/alice-macros/acorde_hits.C
+++ b/EVE/alice-macros/acorde_hits.C
@@ -13,8 +13,8 @@
 #include <TEveElement.h>
 #include <TEvePointSet.h>
 
-#include <EveBase/AliEveEventManager.h>
-#include <STEER/STEER/AliRunLoader.h>
+#include <AliEveEventManager.h>
+#include <AliRunLoader.h>
 #endif
 
 TEvePointSet*
diff --git a/EVE/alice-macros/acorde_raw.C b/EVE/alice-macros/acorde_raw.C
index 1bc5eb7f2c6..679d0e72acc 100644
--- a/EVE/alice-macros/acorde_raw.C
+++ b/EVE/alice-macros/acorde_raw.C
@@ -17,9 +17,9 @@
 #include <TEveTrans.h>
 #include <TEveGeoShape.h>
 
-#include <EveBase/AliEveEventManager.h>
-#include <RAW/AliRawReader.h>
-#include <ACORDE/AliACORDERawStream.h>
+#include <AliEveEventManager.h>
+#include <AliRawReader.h>
+#include <AliACORDERawStream.h>
 #endif
 
 TString acorde_module_path(Int_t module);
diff --git a/EVE/alice-macros/alieve_set_cuts.C b/EVE/alice-macros/alieve_set_cuts.C
index 39a878b39aa..d7d5064129f 100644
--- a/EVE/alice-macros/alieve_set_cuts.C
+++ b/EVE/alice-macros/alieve_set_cuts.C
@@ -31,11 +31,11 @@
 #include <TEveScene.h>
 #include <TEveTrackPropagator.h>
 
-#include <EveBase/AliEveEventManager.h>
-#include <EveBase/AliEveMultiView.h>
-#include <EveBase/AliEveTrack.h>
-#include <STEER/ESD/AliESDtrack.h>
-#include <STEER/ESD/AliESDEvent.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
+#include <AliEveTrack.h>
+#include <AliESDtrack.h>
+#include <AliESDEvent.h>
 #endif
 
 #include <TGButton.h>
diff --git a/EVE/alice-macros/ana_list.C b/EVE/alice-macros/ana_list.C
index c48ecca5751..389ae519884 100755
--- a/EVE/alice-macros/ana_list.C
+++ b/EVE/alice-macros/ana_list.C
@@ -28,8 +28,8 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TEveManager.h>
 
-#include <TRD/AliTRDarrayADC.h>
-#include <EVE/EveDet/AliEveListAnalyser.h>
+#include <AliTRDarrayADC.h>
+#include <AliEveListAnalyser.h>
 #endif
 
 void ana_list(TEveElement *cont = 0)
diff --git a/EVE/alice-macros/ana_list_load_kinks.C b/EVE/alice-macros/ana_list_load_kinks.C
index c370142bb99..45f9f1e0475 100755
--- a/EVE/alice-macros/ana_list_load_kinks.C
+++ b/EVE/alice-macros/ana_list_load_kinks.C
@@ -10,16 +10,16 @@
 #include <TEveManager.h>
 #include <TEveTrackPropagator.h>
 
-#include <TRD/AliTRDarrayADC.h>
-#include <TRD/AliTRDReconstructor.h>
-#include <TRD/AliTRDtrackV1.h>
-#include <STEER/ESD/AliESDkink.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDfriend.h>
-#include <EVE/EveDet/AliEveTRDData.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveKink.h>
-#include <EVE/EveDet/AliEveListAnalyser.h>
+#include <AliTRDarrayADC.h>
+#include <AliTRDReconstructor.h>
+#include <AliTRDtrackV1.h>
+#include <AliESDkink.h>
+#include <AliESDEvent.h>
+#include <AliESDfriend.h>
+#include <AliEveTRDData.h>
+#include <AliEveEventManager.h>
+#include <AliEveKink.h>
+#include <AliEveListAnalyser.h>
 #endif
 
 void esd_kink_init_rectrackMother(TEveRecTrack& rt, const AliExternalTrackParam* tp)
diff --git a/EVE/alice-macros/aod_HF.C b/EVE/alice-macros/aod_HF.C
index 585dffc0ff5..ade99e1c001 100644
--- a/EVE/alice-macros/aod_HF.C
+++ b/EVE/alice-macros/aod_HF.C
@@ -14,23 +14,21 @@
 #include <TEveTrackPropagator.h>
 #include <TEvePointSet.h>
 #include <TEveManager.h>
-
-#include <STEER/STEERBase/AliExternalTrackParam.h>
-#include <STEER/STEERBase/AliVVertex.h>
-#include <STEER/AOD/AliAODVertex.h>
-#include <STEER/AOD/AliAODEvent.h>
-#include <STEER/AOD/AliAODTrack.h>
-#include <STEER/AOD/AliAODMCParticle.h>
-#include <STEER/ESD/AliESDtrack.h>
-#include <STEER/ESD/AliESDEvent.h>
+#include <TEveUtil.h>
+
+#include <AliExternalTrackParam.h>
+#include <AliVVertex.h>
+#include <AliAODVertex.h>
+#include <AliAODEvent.h>
+#include <AliAODTrack.h>
+#include <AliAODMCParticle.h>
+#include <AliESDtrack.h>
+#include <AliESDEvent.h>
 #include <PWG3/vertexingHF/AliAODRecoDecayHF.h>
 #include <PWG3/vertexingHF/AliAODRecoDecayHF2Prong.h>
-
-#include <EVE/EveBase/AliEveHF.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-
 #include <PWG3/vertexingHF/macros/LoadLibraries.C>
-
+#include <AliEveHF.h>
+#include <AliEveEventManager.h>
 #else
 class AliAODRecoDecayHF;
 #endif
@@ -81,13 +79,13 @@ AliEveHF* aod_make_HF(TEveTrackPropagator* rnrStyle, AliAODVertex* primAODVtx,
   return myHF;
 }
 
-
 AliEveHFList* aod_HF()
 {
   Bool_t useParFiles=kFALSE;
-  gROOT->LoadMacro("$ALICE_ROOT/PWG3/vertexingHF/macros/LoadLibraries.C");
+  
+  TEveUtil::LoadMacro("$ALICE_ROOT/PWG3/vertexingHF/macros/LoadLibraries.C+");
   LoadLibraries(useParFiles);
-
+  
   AliAODEvent* aod = AliEveEventManager::AssertAOD();
   AliESDEvent* esd = AliEveEventManager::AssertESD();
 
diff --git a/EVE/alice-macros/beams_info.C b/EVE/alice-macros/beams_info.C
index e2b876f2ae4..910501e1ad0 100644
--- a/EVE/alice-macros/beams_info.C
+++ b/EVE/alice-macros/beams_info.C
@@ -9,8 +9,8 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TEveElement.h>
 
-#include <EVE/EveBase/AliEveBeamsInfo.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliEveBeamsInfo.h>
+#include <AliEveEventManager.h>
 #endif
 
 AliEveBeamsInfo* beams_info(){
diff --git a/EVE/alice-macros/clusters.C b/EVE/alice-macros/clusters.C
index e3c52b5ed82..d4915be38e9 100644
--- a/EVE/alice-macros/clusters.C
+++ b/EVE/alice-macros/clusters.C
@@ -2,17 +2,16 @@
 #include <TEveManager.h>
 #include <TEvePointSet.h>
 #include <TGeoManager.h>
-#include <EveBase/AliEveEventManager.h>
 
-#include "AliRunLoader.h"
-#include "AliCluster.h"
-#include "AliTracker.h"
-#include "AliReconstruction.h"
-#include "AliESDEvent.h"
-#include "AliESDtrack.h"
-#include "AliESDfriend.h"
-
-#include "AliITSRecoParam.h"
+#include <AliRunLoader.h>
+#include <AliCluster.h>
+#include <AliTracker.h>
+#include <AliReconstruction.h>
+#include <AliESDEvent.h>
+#include <AliESDtrack.h>
+#include <AliESDfriend.h>
+#include <AliITSRecoParam.h>
+#include <AliEveEventManager.h>
 #endif
 
 void clusters()
diff --git a/EVE/alice-macros/clusters_from_index.C b/EVE/alice-macros/clusters_from_index.C
index 127d00e5879..e7ec44a5918 100644
--- a/EVE/alice-macros/clusters_from_index.C
+++ b/EVE/alice-macros/clusters_from_index.C
@@ -11,10 +11,10 @@
 #include <TEveElement.h>
 #include <TEvePointSet.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliTrackPointArray.h>
-#include <EveBase/AliEveEventManager.h>
-#include <EveBase/AliEveMultiView.h>
+#include <AliESDEvent.h>
+#include <AliTrackPointArray.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 TEvePointSet* clusters_from_index(Int_t index=0, TEveElement* cont=0)
diff --git a/EVE/alice-macros/clusters_from_label.C b/EVE/alice-macros/clusters_from_label.C
index 82022c6b615..a01938f1e9e 100644
--- a/EVE/alice-macros/clusters_from_label.C
+++ b/EVE/alice-macros/clusters_from_label.C
@@ -11,11 +11,11 @@
 #include <TEveElement.h>
 #include <TEvePointSet.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDtrack.h>
-#include <STEER/ESD/AliTrackPointArray.h>
-#include <EveBase/AliEveEventManager.h>
-#include <EveBase/AliEveMultiView.h>
+#include <AliESDEvent.h>
+#include <AliESDtrack.h>
+#include <AliTrackPointArray.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 TEvePointSet* clusters_from_label(Int_t label=0, TEveElement* cont=0)
diff --git a/EVE/alice-macros/clusters_its_tpc_trd_tof_hmpid_pvtx.C b/EVE/alice-macros/clusters_its_tpc_trd_tof_hmpid_pvtx.C
index 123ced9e492..857694bbdba 100644
--- a/EVE/alice-macros/clusters_its_tpc_trd_tof_hmpid_pvtx.C
+++ b/EVE/alice-macros/clusters_its_tpc_trd_tof_hmpid_pvtx.C
@@ -1,4 +1,17 @@
 //Macro generated automatically by AliEveMacroExecutor
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+#include <TEveBrowser.h>
+#include <TEveWindow.h>
+#include <TEvePointSet.h>
+
+#include <AliEveEventManager.h>
+#include <AliEveMacro.h>
+#include <AliEveMacroExecutor.h>
+#include <AliEveMacroExecutorWindow.h>
+#include <AliEveMultiView.h>
+#endif
+
 
 void clusters_its_tpc_trd_tof_hmpid_pvtx(){
 
@@ -6,63 +19,63 @@ void clusters_its_tpc_trd_tof_hmpid_pvtx(){
   exec->RemoveMacros();
   TEveBrowser *browser = gEve->GetBrowser();
   browser->ShowCloseTab(kFALSE);
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C", "primary_vertex", "", 1));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C+", "primary_vertex", "", 1));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C", "primary_vertex_ellipse", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C+", "primary_vertex_ellipse", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C", "primary_vertex_box", "kFALSE, 3, 3, 3", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C+", "primary_vertex_box", "kFALSE, 3, 3, 3", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C", "primary_vertex_spd", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C+", "primary_vertex_spd", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C", "primary_vertex_ellipse_spd", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C+", "primary_vertex_ellipse_spd", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C", "primary_vertex_box_spd", "kFALSE, 3, 3, 3", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C+", "primary_vertex_box_spd", "kFALSE, 3, 3, 3", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C", "primary_vertex_tpc", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C+", "primary_vertex_tpc", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C", "primary_vertex_ellipse_tpc", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C+", "primary_vertex_ellipse_tpc", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C", "primary_vertex_box_tpc", "kFALSE, 3, 3, 3", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C+", "primary_vertex_box_tpc", "kFALSE, 3, 3, 3", 0));
 
-  exec->AddMacro(new AliEveMacro(1, "REC Clus ITS", "its_clusters.C++", "its_clusters", "", 1));
+  exec->AddMacro(new AliEveMacro(1, "REC Clus ITS", "its_clusters.C+", "its_clusters", "", 1));
 
-  exec->AddMacro(new AliEveMacro(1, "REC Clus TPC", "tpc_clusters.C++", "tpc_clusters", "", 1));
+  exec->AddMacro(new AliEveMacro(1, "REC Clus TPC", "tpc_clusters.C+", "tpc_clusters", "", 1));
 
-  exec->AddMacro(new AliEveMacro(1, "REC Clus TRD", "trd_clusters.C++", "trd_clusters", "", 1));
+  exec->AddMacro(new AliEveMacro(1, "REC Clus TRD", "trd_clusters.C+", "trd_clusters", "", 1));
 
-  exec->AddMacro(new AliEveMacro(1, "REC Clus TOF", "tof_clusters.C++", "tof_clusters", "", 1));
+  exec->AddMacro(new AliEveMacro(1, "REC Clus TOF", "tof_clusters.C+", "tof_clusters", "", 1));
 
-  exec->AddMacro(new AliEveMacro(1, "REC Clus HMPID", "hmpid_clusters.C++", "hmpid_clusters", "", 1));
+  exec->AddMacro(new AliEveMacro(1, "REC Clus HMPID", "hmpid_clusters.C+", "hmpid_clusters", "", 1));
 
-  exec->AddMacro(new AliEveMacro(1, "REC Clus MUON", "muon_clusters.C++", "muon_clusters", "", 0));
+  exec->AddMacro(new AliEveMacro(1, "REC Clus MUON", "muon_clusters.C+", "muon_clusters", "", 0));
 
-  exec->AddMacro(new AliEveMacro(1, "REC Clus TOF", "emcal_digits.C++", "emcal_digits", "", 0));
+  exec->AddMacro(new AliEveMacro(1, "REC Clus TOF", "emcal_digits.C+", "emcal_digits", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW ITS", "its_raw.C", "its_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW ITS", "its_raw.C+", "its_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW TPC", "tpc_raw.C", "tpc_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW TPC", "tpc_raw.C+", "tpc_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW TOF", "tof_raw.C", "tof_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW TOF", "tof_raw.C+", "tof_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW VZERO", "vzero_raw.C", "vzero_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW VZERO", "vzero_raw.C+", "vzero_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW ACORDE", "acorde_raw.C", "acorde_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW ACORDE", "acorde_raw.C+", "acorde_raw", "", 0));
 
   exec->AddMacro(new AliEveMacro(8, "RAW MUON", "muon_raw.C++", "muon_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW FMD", "fmd_raw.C", "fmd_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW FMD", "fmd_raw.C+", "fmd_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C", "esd_tracks", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C+", "esd_tracks", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C", "esd_tracks_MI", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C+", "esd_tracks_MI", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C", "esd_tracks_by_category", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C+", "esd_tracks_by_category", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC Track MUON", "esd_muon_tracks.C++", "esd_muon_tracks", "kTRUE,kFALSE", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC Track MUON", "esd_muon_tracks.C+", "esd_muon_tracks", "kTRUE,kFALSE", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC FMD", "fmd_esd.C", "fmd_esd", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC FMD", "fmd_esd.C+", "fmd_esd", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC TRD", "trd_detectors.C++", "trd_detectors", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC TRD", "trd_detectors.C+", "trd_detectors", "", 0));
 
   TEveWindowSlot *slot = TEveWindow::CreateWindowInTab(browser->GetTabRight());
   slot->StartEmbedding();
@@ -71,4 +84,4 @@ void clusters_its_tpc_trd_tof_hmpid_pvtx(){
   exewin->PopulateMacros();
 
 
-}
\ No newline at end of file
+}
diff --git a/EVE/alice-macros/clusters_its_tpc_trd_tof_hmpid_tracks_pvtx.C b/EVE/alice-macros/clusters_its_tpc_trd_tof_hmpid_tracks_pvtx.C
index eb7ab1d8bf8..2a113ec20c0 100644
--- a/EVE/alice-macros/clusters_its_tpc_trd_tof_hmpid_tracks_pvtx.C
+++ b/EVE/alice-macros/clusters_its_tpc_trd_tof_hmpid_tracks_pvtx.C
@@ -1,4 +1,16 @@
 //Macro generated automatically by AliEveMacroExecutor
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+#include <TEveBrowser.h>
+#include <TEveWindow.h>
+#include <TEvePointSet.h>
+
+#include <AliEveEventManager.h>
+#include <AliEveMacro.h>
+#include <AliEveMacroExecutor.h>
+#include <AliEveMacroExecutorWindow.h>
+#include <AliEveMultiView.h>
+#endif
 
 void clusters_its_tpc_trd_tof_hmpid_tracks_pvtx(){
 
@@ -6,23 +18,23 @@ void clusters_its_tpc_trd_tof_hmpid_tracks_pvtx(){
   exec->RemoveMacros();
   TEveBrowser *browser = gEve->GetBrowser();
   browser->ShowCloseTab(kFALSE);
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C", "primary_vertex", "", 1));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C+", "primary_vertex", "", 1));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C", "primary_vertex_ellipse", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C+", "primary_vertex_ellipse", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C", "primary_vertex_box", "kFALSE, 3, 3, 3", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C+", "primary_vertex_box", "kFALSE, 3, 3, 3", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C", "primary_vertex_spd", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C+", "primary_vertex_spd", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C", "primary_vertex_ellipse_spd", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C+", "primary_vertex_ellipse_spd", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C", "primary_vertex_box_spd", "kFALSE, 3, 3, 3", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C+", "primary_vertex_box_spd", "kFALSE, 3, 3, 3", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C", "primary_vertex_tpc", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX", "primary_vertex.C+", "primary_vertex_tpc", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C", "primary_vertex_ellipse_tpc", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Ellipse", "primary_vertex.C+", "primary_vertex_ellipse_tpc", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C", "primary_vertex_box_tpc", "kFALSE, 3, 3, 3", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC PVTX Box", "primary_vertex.C+", "primary_vertex_box_tpc", "kFALSE, 3, 3, 3", 0));
 
   exec->AddMacro(new AliEveMacro(1, "REC Clus ITS", "its_clusters.C++", "its_clusters", "", 1));
 
@@ -38,29 +50,29 @@ void clusters_its_tpc_trd_tof_hmpid_tracks_pvtx(){
 
   exec->AddMacro(new AliEveMacro(1, "REC Clus TOF", "emcal_digits.C++", "emcal_digits", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW ITS", "its_raw.C", "its_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW ITS", "its_raw.C+", "its_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW TPC", "tpc_raw.C", "tpc_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW TPC", "tpc_raw.C+", "tpc_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW TOF", "tof_raw.C", "tof_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW TOF", "tof_raw.C+", "tof_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW VZERO", "vzero_raw.C", "vzero_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW VZERO", "vzero_raw.C+", "vzero_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW ACORDE", "acorde_raw.C", "acorde_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW ACORDE", "acorde_raw.C+", "acorde_raw", "", 0));
 
   exec->AddMacro(new AliEveMacro(8, "RAW MUON", "muon_raw.C++", "muon_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(8, "RAW FMD", "fmd_raw.C", "fmd_raw", "", 0));
+  exec->AddMacro(new AliEveMacro(8, "RAW FMD", "fmd_raw.C+", "fmd_raw", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C", "esd_tracks", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C+", "esd_tracks", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C", "esd_tracks_MI", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C+", "esd_tracks_MI", "", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C", "esd_tracks_by_category", "", 1));
+  exec->AddMacro(new AliEveMacro(2, "REC Track", "esd_tracks.C+", "esd_tracks_by_category", "", 1));
 
   exec->AddMacro(new AliEveMacro(2, "REC Track MUON", "esd_muon_tracks.C++", "esd_muon_tracks", "kTRUE,kFALSE", 0));
 
-  exec->AddMacro(new AliEveMacro(2, "REC FMD", "fmd_esd.C", "fmd_esd", "", 0));
+  exec->AddMacro(new AliEveMacro(2, "REC FMD", "fmd_esd.C+", "fmd_esd", "", 0));
 
   exec->AddMacro(new AliEveMacro(2, "REC TRD", "trd_detectors.C++", "trd_detectors", "", 0));
 
@@ -71,4 +83,4 @@ void clusters_its_tpc_trd_tof_hmpid_tracks_pvtx(){
   exewin->PopulateMacros();
 
 
-}
\ No newline at end of file
+}
diff --git a/EVE/alice-macros/emcal_all.C b/EVE/alice-macros/emcal_all.C
index d32499e1d0e..50930d63cd5 100644
--- a/EVE/alice-macros/emcal_all.C
+++ b/EVE/alice-macros/emcal_all.C
@@ -34,30 +34,29 @@
 #include <TEveElement.h>
 #include <TEvePointSet.h>
 
-#include <EMCAL/AliEMCAL.h>
-#include <EMCAL/AliEMCALLoader.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDtrack.h>
-#include <STEER/ESD/AliTrackPointArray.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
-#include <EVE/EveDet/AliEveEMCALData.h>
-#include <EVE/EveDet/AliEveEMCALSModule.h>
+#include <AliEMCAL.h>
+#include <AliEMCALLoader.h>
+#include <AliESDEvent.h>
+#include <AliESDtrack.h>
+#include <AliTrackPointArray.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
+#include <AliEveEMCALData.h>
+#include <AliEveEMCALSModule.h>
 #else
 class AliEveEMCALData;
 #endif
 
 AliEveEMCALData     *emcal_data       = 0;
 
-void emcal_all(const UInt_t evtNum = 0, Bool_t digFile = 0, 
+void emcal_all(const UInt_t evtNum = 0)/*, Bool_t digFile = 0, 
 	       const UInt_t eventsToProcess = 5, TString dirName = "./", 
-	       const TString esdTreeName = "esdTree", const char *  pattern = ".")
+	       const TString esdTreeName = "esdTree", const char *  pattern = ".")*/
 {
 
   Int_t iLoader             = 1;
   Int_t iESD                = 1;
-  Int_t iAOD                = 0;
   Int_t iHits               = 1;
   Int_t iDigits             = 1;
   Int_t iClusters           = 1;
@@ -69,7 +68,7 @@ void emcal_all(const UInt_t evtNum = 0, Bool_t digFile = 0,
   // esd check already in AssertESD function 
   AliEMCALLoader *emcl = dynamic_cast<AliEMCALLoader*> (rl->GetDetectorLoader("EMCAL"));
   Int_t evtID = AliEveEventManager::GetMaster()->GetEventId();
-  if(evtID != evtNum) AliEveEventManager::GetMaster()->GotoEvent(evtNum);
+  if(evtID != (Int_t)evtNum) AliEveEventManager::GetMaster()->GotoEvent(evtNum);
 
   TTree* ht = 0x0; 
   TTree* dt = 0x0; 
diff --git a/EVE/alice-macros/emcal_digits.C b/EVE/alice-macros/emcal_digits.C
index 44ece0e0bee..2b55b2421af 100644
--- a/EVE/alice-macros/emcal_digits.C
+++ b/EVE/alice-macros/emcal_digits.C
@@ -7,27 +7,23 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 #ifndef __CINT__
-
-#include <TEveManager.h>
-#include <TEveQuadSet.h>
+#include <TBranch.h>
+#include <TClonesArray.h>
 #include <TGeoNode.h>
 #include <TGeoBBox.h>
 #include <TGeoManager.h>
 #include <TStyle.h>
-#include <TEveTrans.h>
-#include <TClonesArray.h>
 #include <TTree.h>
-#include <TBranch.h>
-
-#include <EveBase/AliEveEventManager.h>
+#include <TEveManager.h>
+#include <TEveQuadSet.h>
+#include <TEveTrans.h>
 
 #include <AliRunLoader.h>
 #include <AliCluster.h>
 #include <AliEMCALGeometry.h>
 #include <AliEMCALDigit.h>
 #include <AliLog.h>
-
-// #include <Riostream.h>
+#include <AliEveEventManager.h>
 #endif
 
 void emcal_digits()
diff --git a/EVE/alice-macros/emcal_hits.C b/EVE/alice-macros/emcal_hits.C
index f72b71f2be6..bd8fdc785c3 100644
--- a/EVE/alice-macros/emcal_hits.C
+++ b/EVE/alice-macros/emcal_hits.C
@@ -14,9 +14,8 @@
 #include <TEvePointSet.h>
 #include <TEveTreeTools.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <STEER/STEER/AliRunLoader.h>
-
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 TEvePointSet*
diff --git a/EVE/alice-macros/esd_V0.C b/EVE/alice-macros/esd_V0.C
index edb45f313c8..99800e0ef9f 100644
--- a/EVE/alice-macros/esd_V0.C
+++ b/EVE/alice-macros/esd_V0.C
@@ -12,14 +12,14 @@
 #include <TEveTrackPropagator.h>
 #include <TEveManager.h>
 
-#include <STEER/STEERBase/AliExternalTrackParam.h>
-#include <STEER/STEERBase/AliPID.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDVertex.h>
-#include <STEER/ESD/AliESDtrack.h>
-#include <STEER/ESD/AliESDv0.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveV0.h>
+#include <AliExternalTrackParam.h>
+#include <AliPID.h>
+#include <AliESDEvent.h>
+#include <AliESDVertex.h>
+#include <AliESDtrack.h>
+#include <AliESDv0.h>
+#include <AliEveEventManager.h>
+#include <AliEveV0.h>
 #endif
 
 
@@ -173,4 +173,4 @@ AliEveV0List* esd_V0(Bool_t onFly=kFALSE)
   gEve->Redraw3D();
 
   return cont;
-}
\ No newline at end of file
+}
diff --git a/EVE/alice-macros/esd_V0_points.C b/EVE/alice-macros/esd_V0_points.C
index d98b2363a90..1055f79363f 100644
--- a/EVE/alice-macros/esd_V0_points.C
+++ b/EVE/alice-macros/esd_V0_points.C
@@ -11,9 +11,9 @@
 #include <TEveManager.h>
 #include <TEvePointSet.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDv0.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliESDEvent.h>
+#include <AliESDv0.h>
+#include <AliEveEventManager.h>
 #endif
 
 void esd_VO_fill_pointset(TEvePointSet* ps, Bool_t onFly)
diff --git a/EVE/alice-macros/esd_cascade.C b/EVE/alice-macros/esd_cascade.C
index 88ab4668d2e..8abb9433062 100644
--- a/EVE/alice-macros/esd_cascade.C
+++ b/EVE/alice-macros/esd_cascade.C
@@ -12,12 +12,12 @@
 #include <TEveVSDStructs.h>
 #include <TEveTrackPropagator.h>
 
-#include <STEER/STEERBase/AliExternalTrackParam.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDcascade.h>
-#include <STEER/ESD/AliESDVertex.h>
-#include <EVE/EveBase/AliEveCascade.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliExternalTrackParam.h>
+#include <AliESDEvent.h>
+#include <AliESDcascade.h>
+#include <AliESDVertex.h>
+#include <AliEveCascade.h>
+#include <AliEveEventManager.h>
 #endif
 
 void esd_cascade_init_rectrack(TEveRecTrack& rt, const AliExternalTrackParam* tp)
diff --git a/EVE/alice-macros/esd_cascade_points.C b/EVE/alice-macros/esd_cascade_points.C
index a251cb29f49..116ed5cb3e2 100644
--- a/EVE/alice-macros/esd_cascade_points.C
+++ b/EVE/alice-macros/esd_cascade_points.C
@@ -9,10 +9,10 @@
 #include <TEveManager.h>
 #include <TEvePointSet.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDcascade.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliESDEvent.h>
+#include <AliESDcascade.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 void esd_cascade_fill_pointset(TEvePointSet* ps)
diff --git a/EVE/alice-macros/esd_hlt_tracks.C b/EVE/alice-macros/esd_hlt_tracks.C
index 03b40e1cb11..d06f412bed0 100644
--- a/EVE/alice-macros/esd_hlt_tracks.C
+++ b/EVE/alice-macros/esd_hlt_tracks.C
@@ -19,14 +19,14 @@
 #include <TClass.h>
 #include <TFile.h>
 #include <TTree.h>
+#include <TEveManager.h>
 #include <TEveTrack.h>
 #include <TEveUtil.h>
-#include <TEveManager.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliESDEvent.h>
+#include <AliEveEventManager.h>
 
-#include "esd_tracks.C"
+#include <EVE/alice-macros/esd_tracks.C>
 #endif
 
 /**
@@ -63,7 +63,7 @@ TEveTrackList* esd_hlt_tracks()
   }
 
   TEveUtil::LoadMacro("esd_tracks.C");
-
+   
   int eventId=eveManager->GetEventId();
   TFile* esdFile=eveManager->GetESDFile();
   if (!esdFile) {
@@ -79,7 +79,7 @@ TEveTrackList* esd_hlt_tracks()
     return NULL;
   }
   if (pHLTTree->GetEntries()<=eventId) {
-    Warning("esd_hlt_tracks.C", "skiping event %d: out of range %d", eventId, pHLTTree->GetEntries());
+    Warning("esd_hlt_tracks.C", "skiping event %d: out of range %lld", eventId, pHLTTree->GetEntries());
     return NULL;
   }
 
diff --git a/EVE/alice-macros/esd_kink.C b/EVE/alice-macros/esd_kink.C
index 21483aafa63..b1af6844b0a 100644
--- a/EVE/alice-macros/esd_kink.C
+++ b/EVE/alice-macros/esd_kink.C
@@ -13,13 +13,13 @@
 #include <TEveVSDStructs.h>
 #include <TEveManager.h>
 
-#include <STEER/STEERBase/AliExternalTrackParam.h>
-#include <STEER/STEERBase/AliPID.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDtrack.h>
-#include <STEER/ESD/AliESDkink.h>
-#include <EVE/EveBase/AliEveKink.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliExternalTrackParam.h>
+#include <AliPID.h>
+#include <AliESDEvent.h>
+#include <AliESDtrack.h>
+#include <AliESDkink.h>
+#include <AliEveKink.h>
+#include <AliEveEventManager.h>
 #endif
 
 void esd_kink_init_rectrackMother(TEveRecTrack& rt, const AliExternalTrackParam* tp)
diff --git a/EVE/alice-macros/esd_kink_points.C b/EVE/alice-macros/esd_kink_points.C
index c21972c33e0..0759a2fbfb6 100644
--- a/EVE/alice-macros/esd_kink_points.C
+++ b/EVE/alice-macros/esd_kink_points.C
@@ -12,10 +12,10 @@
 #include <TEvePointSet.h>
 #include <TEveManager.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDtrack.h>
-#include <STEER/ESD/AliESDkink.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliESDEvent.h>
+#include <AliESDtrack.h>
+#include <AliESDkink.h>
+#include <AliEveEventManager.h>
 #endif
 
 void esd_kink_fill_pointset(TEvePointSet* ps)
diff --git a/EVE/alice-macros/esd_muon_tracks.C b/EVE/alice-macros/esd_muon_tracks.C
index 526e947e01a..b68ea546bdb 100644
--- a/EVE/alice-macros/esd_muon_tracks.C
+++ b/EVE/alice-macros/esd_muon_tracks.C
@@ -28,20 +28,20 @@
 #include <TEveTrackPropagator.h>
 #include <TEveVSDStructs.h>
 
-#include <MUON/AliMUONESDInterface.h>
-#include <MUON/AliMUONTrack.h>
-#include <MUON/AliMUONTrackExtrap.h>
-#include <MUON/AliMUONTrackParam.h>
-#include <MUON/AliMUONConstants.h>
-#include <MUON/AliMUONCDB.h>
-#include <MUON/AliMUONGeometryTransformer.h>
-#include <MUON/AliMUONTriggerCircuit.h>
-#include <MUON/mapping/AliMpCDB.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDMuonTrack.h>
-#include <EVE/EveBase/AliEveMagField.h>
-#include <EVE/EveBase/AliEveTrack.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliMUONESDInterface.h>
+#include <AliMUONTrack.h>
+#include <AliMUONTrackExtrap.h>
+#include <AliMUONTrackParam.h>
+#include <AliMUONConstants.h>
+#include <AliMUONCDB.h>
+#include <AliMUONGeometryTransformer.h>
+#include <AliMUONTriggerCircuit.h>
+#include <AliMpCDB.h>
+#include <AliESDEvent.h>
+#include <AliESDMuonTrack.h>
+#include <AliEveMagField.h>
+#include <AliEveTrack.h>
+#include <AliEveEventManager.h>
 #endif
 
 //______________________________________________________________________________
diff --git a/EVE/alice-macros/esd_spd_tracklets.C b/EVE/alice-macros/esd_spd_tracklets.C
index 35d35ca79c9..0e553aed9a9 100644
--- a/EVE/alice-macros/esd_spd_tracklets.C
+++ b/EVE/alice-macros/esd_spd_tracklets.C
@@ -13,13 +13,13 @@
 #include <TEveTrack.h>
 #include <TEveTrackPropagator.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDVertex.h>
-#include <STEER/ESD/AliMultiplicity.h>
-#include <STEER/STEERBase/AliMagF.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveTracklet.h>
-#include <EVE/EveBase/AliEveTrackCounter.h>
+#include <AliESDEvent.h>
+#include <AliESDVertex.h>
+#include <AliMultiplicity.h>
+#include <AliMagF.h>
+#include <AliEveEventManager.h>
+#include <AliEveTracklet.h>
+#include <AliEveTrackCounter.h>
 #endif
 
 TEveElementList* esd_spd_tracklets(Float_t radius=8, Width_t line_width=2,
diff --git a/EVE/alice-macros/esd_tracks.C b/EVE/alice-macros/esd_tracks.C
index 7979b9777ee..084dfbac152 100644
--- a/EVE/alice-macros/esd_tracks.C
+++ b/EVE/alice-macros/esd_tracks.C
@@ -17,17 +17,17 @@
 #include <TEveManager.h>
 #include <TEveTrackPropagator.h>
 
-#include <ANALYSIS/AliESDtrackCuts.h>
-#include <PWGUD/base/AliPWG0Helper.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDfriend.h>
-#include <STEER/ESD/AliESDtrack.h>
-#include <STEER/ESD/AliESDfriendTrack.h>
-#include <STEER/STEERBase/AliExternalTrackParam.h>
-#include <EVE/EveBase/AliEveTrack.h>
-#include <EVE/EveBase/AliEveTrackCounter.h>
-#include <EVE/EveBase/AliEveMagField.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliESDtrackCuts.h>
+#include <AliPWG0Helper.h>
+#include <AliESDEvent.h>
+#include <AliESDfriend.h>
+#include <AliESDtrack.h>
+#include <AliESDfriendTrack.h>
+#include <AliExternalTrackParam.h>
+#include <AliEveTrack.h>
+#include <AliEveTrackCounter.h>
+#include <AliEveMagField.h>
+#include <AliEveEventManager.h>
 #endif
 
 
diff --git a/EVE/alice-macros/esd_zdc.C b/EVE/alice-macros/esd_zdc.C
index f19b0b6276f..618a2b2e1a8 100644
--- a/EVE/alice-macros/esd_zdc.C
+++ b/EVE/alice-macros/esd_zdc.C
@@ -9,9 +9,9 @@
 #include <TEveManager.h>
 #include <TEveElement.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDZDC.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliESDEvent.h>
+#include <AliESDZDC.h>
+#include <AliEveEventManager.h>
 #endif
 
 TEveRGBAPalette *g_zdc_palette = 0;
diff --git a/EVE/alice-macros/event_first.C b/EVE/alice-macros/event_first.C
index e29b8ba01a2..35a02d45372 100644
--- a/EVE/alice-macros/event_first.C
+++ b/EVE/alice-macros/event_first.C
@@ -8,7 +8,7 @@
  **************************************************************************/
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliEveEventManager.h>
 #endif
 
 void event_first()
diff --git a/EVE/alice-macros/event_goto.C b/EVE/alice-macros/event_goto.C
index 9e7329c772f..9312bddc589 100644
--- a/EVE/alice-macros/event_goto.C
+++ b/EVE/alice-macros/event_goto.C
@@ -8,7 +8,7 @@
  **************************************************************************/
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliEveEventManager.h>
 #endif
 
 /// \ingroup evemacros
diff --git a/EVE/alice-macros/event_last.C b/EVE/alice-macros/event_last.C
index 9505715d2b0..84ef2193475 100644
--- a/EVE/alice-macros/event_last.C
+++ b/EVE/alice-macros/event_last.C
@@ -8,7 +8,7 @@
  **************************************************************************/
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliEveEventManager.h>
 #endif
 
 void event_last()
diff --git a/EVE/alice-macros/event_next.C b/EVE/alice-macros/event_next.C
index 06e592c8b00..179816e828f 100644
--- a/EVE/alice-macros/event_next.C
+++ b/EVE/alice-macros/event_next.C
@@ -8,7 +8,7 @@
  **************************************************************************/
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliEveEventManager.h>
 #endif
 
 void event_next()
diff --git a/EVE/alice-macros/event_prev.C b/EVE/alice-macros/event_prev.C
index 14881a6ed03..47cfe04b169 100644
--- a/EVE/alice-macros/event_prev.C
+++ b/EVE/alice-macros/event_prev.C
@@ -8,7 +8,7 @@
  **************************************************************************/
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliEveEventManager.h>
 #endif
 
 void event_prev()
diff --git a/EVE/alice-macros/fmd_digits.C b/EVE/alice-macros/fmd_digits.C
index 442a6873d5c..1219854d75b 100644
--- a/EVE/alice-macros/fmd_digits.C
+++ b/EVE/alice-macros/fmd_digits.C
@@ -3,7 +3,7 @@
 #include <TStyle.h>
 #include <TEveManager.h>
 
-#include <EVE/EveDet/AliEveFMDLoader.h>
+#include <AliEveFMDLoader.h>
 #endif
 
 void fmd_digits()
diff --git a/EVE/alice-macros/fmd_esd.C b/EVE/alice-macros/fmd_esd.C
index bc28e4ed85d..6ab7eaddd58 100644
--- a/EVE/alice-macros/fmd_esd.C
+++ b/EVE/alice-macros/fmd_esd.C
@@ -3,7 +3,7 @@
 #include <TStyle.h>
 #include <TEveManager.h>
 
-#include <EVE/EveDet/AliEveFMDLoader.h>
+#include <AliEveFMDLoader.h>
 #endif
 
 void fmd_esd()
diff --git a/EVE/alice-macros/fmd_hits.C b/EVE/alice-macros/fmd_hits.C
index b4c26553efc..90bb86eb919 100644
--- a/EVE/alice-macros/fmd_hits.C
+++ b/EVE/alice-macros/fmd_hits.C
@@ -3,7 +3,7 @@
 #include <TStyle.h>
 #include <TEveManager.h>
 
-#include <EVE/EveDet/AliEveFMDLoader.h>
+#include <AliEveFMDLoader.h>
 #endif
 
 void fmd_hits()
diff --git a/EVE/alice-macros/fmd_hits2.C b/EVE/alice-macros/fmd_hits2.C
index 0f254d54ee1..f5fccc29f4b 100644
--- a/EVE/alice-macros/fmd_hits2.C
+++ b/EVE/alice-macros/fmd_hits2.C
@@ -15,9 +15,9 @@
 #include <TEveTreeTools.h>
 #include <TEvePointSet.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveFMDLoader.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
+#include <AliEveFMDLoader.h>
 #endif
 
 TEvePointSet*
diff --git a/EVE/alice-macros/fmd_raw.C b/EVE/alice-macros/fmd_raw.C
index 24e6f40d54f..8111cae6ae8 100644
--- a/EVE/alice-macros/fmd_raw.C
+++ b/EVE/alice-macros/fmd_raw.C
@@ -3,7 +3,7 @@
 #include <TStyle.h>
 #include <TEveManager.h>
 
-#include <EVE/EveDet/AliEveFMDLoader.h>
+#include <AliEveFMDLoader.h>
 #endif
 
 void fmd_raw()
diff --git a/EVE/alice-macros/geom_acorde.C b/EVE/alice-macros/geom_acorde.C
index 2057829b471..468d2b6dfbd 100644
--- a/EVE/alice-macros/geom_acorde.C
+++ b/EVE/alice-macros/geom_acorde.C
@@ -14,7 +14,7 @@
 #include <TEveElement.h>
 #include <TEveGeoNode.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliEveEventManager.h>
 #endif
 
 void geom_acorde()
diff --git a/EVE/alice-macros/geom_fmd.C b/EVE/alice-macros/geom_fmd.C
index 1db20bbf42c..2118dbb0c47 100644
--- a/EVE/alice-macros/geom_fmd.C
+++ b/EVE/alice-macros/geom_fmd.C
@@ -14,7 +14,7 @@
 #include <TEveGeoNode.h>
 #include <TEveElement.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliEveEventManager.h>
 #endif
 
 void geom_fmd()
diff --git a/EVE/alice-macros/geom_gentle_bright.C b/EVE/alice-macros/geom_gentle_bright.C
index d9cc7f3014f..eccc802c4bb 100644
--- a/EVE/alice-macros/geom_gentle_bright.C
+++ b/EVE/alice-macros/geom_gentle_bright.C
@@ -5,8 +5,8 @@
 #include <TEveGeoShape.h>
 #include <TEveGeoShapeExtract.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 
diff --git a/EVE/alice-macros/geom_gentle_default.C b/EVE/alice-macros/geom_gentle_default.C
index c3e850fe17d..07baa7d8994 100644
--- a/EVE/alice-macros/geom_gentle_default.C
+++ b/EVE/alice-macros/geom_gentle_default.C
@@ -5,8 +5,8 @@
 #include <TEveGeoShape.h>
 #include <TEveGeoShapeExtract.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 void geom_gentle_default(Bool_t register_as_global=kTRUE)
diff --git a/EVE/alice-macros/geom_gentle_green.C b/EVE/alice-macros/geom_gentle_green.C
index eed733767a6..b865b6a2e7a 100644
--- a/EVE/alice-macros/geom_gentle_green.C
+++ b/EVE/alice-macros/geom_gentle_green.C
@@ -5,8 +5,8 @@
 #include <TEveGeoShape.h>
 #include <TEveGeoShapeExtract.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 void geom_gentle_green(Bool_t register_as_global=kTRUE)
diff --git a/EVE/alice-macros/geom_gentle_notransparency.C b/EVE/alice-macros/geom_gentle_notransparency.C
index 94ec3f9c281..6f4311dd9fb 100644
--- a/EVE/alice-macros/geom_gentle_notransparency.C
+++ b/EVE/alice-macros/geom_gentle_notransparency.C
@@ -6,8 +6,8 @@
 #include <TEveGeoShape.h>
 #include <TEveGeoShapeExtract.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 void geom_gentle_notransparency(Bool_t register_as_global=kTRUE)
diff --git a/EVE/alice-macros/geom_gentle_projector.C b/EVE/alice-macros/geom_gentle_projector.C
index 64d150ddb5f..2987fbc09a3 100644
--- a/EVE/alice-macros/geom_gentle_projector.C
+++ b/EVE/alice-macros/geom_gentle_projector.C
@@ -6,8 +6,8 @@
 #include <TEveGeoShape.h>
 #include <TEveGeoShapeExtract.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 void geom_gentle_projector(Bool_t register_as_global=kTRUE)
diff --git a/EVE/alice-macros/geom_gentle_tpc.C b/EVE/alice-macros/geom_gentle_tpc.C
index dd55ec01929..83ebcaa3741 100644
--- a/EVE/alice-macros/geom_gentle_tpc.C
+++ b/EVE/alice-macros/geom_gentle_tpc.C
@@ -6,8 +6,8 @@
 #include <TEveGeoShape.h>
 #include <TEveGeoShapeExtract.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 void geom_gentle_tpc(Bool_t register_as_global=kTRUE)
diff --git a/EVE/alice-macros/geom_gentle_transparent.C b/EVE/alice-macros/geom_gentle_transparent.C
index b90a55d18d9..a14bf2782f6 100644
--- a/EVE/alice-macros/geom_gentle_transparent.C
+++ b/EVE/alice-macros/geom_gentle_transparent.C
@@ -6,8 +6,8 @@
 #include <TEveGeoShape.h>
 #include <TEveGeoShapeExtract.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 void geom_gentle_transparent(Bool_t register_as_global=kTRUE)
diff --git a/EVE/alice-macros/geom_gentle_transparentdark.C b/EVE/alice-macros/geom_gentle_transparentdark.C
index af7bb8fb334..c62e7e7269a 100644
--- a/EVE/alice-macros/geom_gentle_transparentdark.C
+++ b/EVE/alice-macros/geom_gentle_transparentdark.C
@@ -15,8 +15,8 @@
 #include <TEveGeoShape.h>
 #include <TEveGeoShapeExtract.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 void geom_gentle_transparentdark(Bool_t register_as_global=kTRUE)
diff --git a/EVE/alice-macros/geom_gentle_transparentlight.C b/EVE/alice-macros/geom_gentle_transparentlight.C
index 89e4262fbb9..15fbd1e06ff 100644
--- a/EVE/alice-macros/geom_gentle_transparentlight.C
+++ b/EVE/alice-macros/geom_gentle_transparentlight.C
@@ -6,8 +6,8 @@
 #include <TEveGeoShape.h>
 #include <TEveGeoShapeExtract.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 
diff --git a/EVE/alice-macros/geom_gentle_yellow.C b/EVE/alice-macros/geom_gentle_yellow.C
index 1c851a9fd8e..15dea1edda6 100644
--- a/EVE/alice-macros/geom_gentle_yellow.C
+++ b/EVE/alice-macros/geom_gentle_yellow.C
@@ -15,8 +15,8 @@
 #include <TEveGeoShape.h>
 #include <TEveGeoShapeExtract.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 void geom_gentle_yellow(Bool_t register_as_global=kTRUE)
diff --git a/EVE/alice-macros/geom_phos.C b/EVE/alice-macros/geom_phos.C
index 7f2d8cc1115..a57fe07a638 100644
--- a/EVE/alice-macros/geom_phos.C
+++ b/EVE/alice-macros/geom_phos.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TGeoManager.h>
 #include <TEveManager.h>
diff --git a/EVE/alice-macros/geom_pmd.C b/EVE/alice-macros/geom_pmd.C
index 55b6c15102e..2be4d8260b7 100644
--- a/EVE/alice-macros/geom_pmd.C
+++ b/EVE/alice-macros/geom_pmd.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TGeoManager.h>
 #include <TEveManager.h>
diff --git a/EVE/alice-macros/geom_simple.C b/EVE/alice-macros/geom_simple.C
index 2532ad2e35c..6f39cea6b05 100644
--- a/EVE/alice-macros/geom_simple.C
+++ b/EVE/alice-macros/geom_simple.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TGeoManager.h>
 #include <TEveManager.h>
diff --git a/EVE/alice-macros/histo2d.C b/EVE/alice-macros/histo2d.C
index 4bb66ace752..38fdec839be 100644
--- a/EVE/alice-macros/histo2d.C
+++ b/EVE/alice-macros/histo2d.C
@@ -23,9 +23,9 @@
 #include <TEveViewer.h>
 #include <TEveWindow.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliESDEvent.h>
+#include <AliEveEventManager.h>
+#include <AliEveMultiView.h>
 #endif
 
 double pi = TMath::Pi();
diff --git a/EVE/alice-macros/histo2d_all_events.C b/EVE/alice-macros/histo2d_all_events.C
index cedfa13306a..01628e8589f 100644
--- a/EVE/alice-macros/histo2d_all_events.C
+++ b/EVE/alice-macros/histo2d_all_events.C
@@ -25,8 +25,8 @@
 #include <TEveViewer.h>
 #include <TEveWindow.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliESDEvent.h>
+#include <AliEveEventManager.h>
 #endif
 
 double pi = TMath::Pi();
diff --git a/EVE/alice-macros/hmpid_clusters.C b/EVE/alice-macros/hmpid_clusters.C
index badb5ac78e4..9836d42bf8c 100644
--- a/EVE/alice-macros/hmpid_clusters.C
+++ b/EVE/alice-macros/hmpid_clusters.C
@@ -17,9 +17,9 @@
 #include <TTree.h>
 #include <TBranch.h>
 
-#include <STEER/STEER/AliCluster3D.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EveBase/AliEveEventManager.h>
+#include <AliCluster3D.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #else
 class TEveElement;
 class TEvePointSet;
diff --git a/EVE/alice-macros/hmpid_digits.C b/EVE/alice-macros/hmpid_digits.C
index f236a1f8a98..c2edba4b2aa 100644
--- a/EVE/alice-macros/hmpid_digits.C
+++ b/EVE/alice-macros/hmpid_digits.C
@@ -1,3 +1,9 @@
+/**************************************************************************
+ * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
+ * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
+ * full copyright notice.                                                 *
+ **************************************************************************/
+
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TClonesArray.h>
 #include <TBranch.h>
@@ -12,11 +18,11 @@
 #include <TEveTrans.h>
 #include <TEveQuadSet.h>
 
-#include <HMPID/AliHMPIDDigit.h>
-#include <HMPID/AliHMPIDv3.h>
-#include <STEER/STEER/AliCluster3D.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliHMPIDDigit.h>
+#include <AliHMPIDv3.h>
+#include <AliCluster3D.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 void hmpid_digits()
diff --git a/EVE/alice-macros/hmpid_raw.C b/EVE/alice-macros/hmpid_raw.C
index d3c0bb4a7db..69c5a25c0da 100644
--- a/EVE/alice-macros/hmpid_raw.C
+++ b/EVE/alice-macros/hmpid_raw.C
@@ -1,3 +1,9 @@
+/**************************************************************************
+ * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
+ * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
+ * full copyright notice.                                                 *
+ **************************************************************************/
+
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TGeoMatrix.h>
 #include <TStyle.h>
@@ -8,11 +14,11 @@
 #include <TEveTrans.h>
 #include <TEveQuadSet.h>
 
-#include <HMPID/AliHMPIDDigit.h>
-#include <HMPID/AliHMPIDv3.h>
-#include <HMPID/AliHMPIDRawStream.h>
-#include <RAW/AliRawReader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliHMPIDDigit.h>
+#include <AliHMPIDv3.h>
+#include <AliHMPIDRawStream.h>
+#include <AliRawReader.h>
+#include <AliEveEventManager.h>
 #endif
 
 void hmpid_raw()
diff --git a/EVE/alice-macros/its_clusters.C b/EVE/alice-macros/its_clusters.C
index d71f2c19dbb..5780170355b 100644
--- a/EVE/alice-macros/its_clusters.C
+++ b/EVE/alice-macros/its_clusters.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TClonesArray.h>
 #include <TBranch.h>
@@ -14,9 +15,9 @@
 #include <TEveElement.h>
 #include <TEvePointSet.h>
 
-#include <EveBase/AliEveEventManager.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <STEER/STEER/AliCluster.h>
+#include <AliRunLoader.h>
+#include <AliCluster.h>
+#include <AliEveEventManager.h>
 #else
 class TEveElement;
 class TEvePointSet;
@@ -24,9 +25,6 @@ class TTree;
 class TBranch;
 #endif
 
-
-
-
 TEvePointSet* its_clusters(TEveElement* cont=0, Float_t maxR=50)
 {
   AliEveEventManager::AssertGeometry();
diff --git a/EVE/alice-macros/its_common_foos.C b/EVE/alice-macros/its_common_foos.C
index 0e0c399ea5d..c6ca576a886 100644
--- a/EVE/alice-macros/its_common_foos.C
+++ b/EVE/alice-macros/its_common_foos.C
@@ -6,14 +6,15 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TString.h>
 #include <TEveManager.h>
 #include <TEveElement.h>
 
-#include <EveDet/AliEveITSModule.h>
-#include <EveDet/AliEveITSDigitsInfo.h>
-#include <EveDet/AliEveITSScaledModule.h>
+#include <AliEveITSModule.h>
+#include <AliEveITSDigitsInfo.h>
+#include <AliEveITSScaledModule.h>
 #endif
 
 
diff --git a/EVE/alice-macros/its_digits.C b/EVE/alice-macros/its_digits.C
index 1d1cdca69d8..3a0db49c71b 100644
--- a/EVE/alice-macros/its_digits.C
+++ b/EVE/alice-macros/its_digits.C
@@ -12,12 +12,11 @@
 #include <TStyle.h>
 #include <TEveUtil.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EveBase/AliEveEventManager.h>
-#include <EveDet/AliEveITSDigitsInfo.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
+#include <AliEveITSDigitsInfo.h>
 
 #include "its_common_foos.C"
-
 #endif
 
 // Load ITS digits.
diff --git a/EVE/alice-macros/its_hits.C b/EVE/alice-macros/its_hits.C
index 96649edf8f0..71ffb16829f 100644
--- a/EVE/alice-macros/its_hits.C
+++ b/EVE/alice-macros/its_hits.C
@@ -14,8 +14,8 @@
 #include <TEveManager.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 TEvePointSet*
diff --git a/EVE/alice-macros/its_hits_layer_split.C b/EVE/alice-macros/its_hits_layer_split.C
index 25a725556dd..4f09b59ef86 100644
--- a/EVE/alice-macros/its_hits_layer_split.C
+++ b/EVE/alice-macros/its_hits_layer_split.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TTree.h>
 #include <TEvePointSet.h>
@@ -13,8 +14,8 @@
 #include <TEveManager.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 void its_hits_layer_split(const char *varexp    = "fX:fY:fZ:GetLayer()",
diff --git a/EVE/alice-macros/its_module_stepper.C b/EVE/alice-macros/its_module_stepper.C
index 9929ef512a8..b8b8d9ee810 100644
--- a/EVE/alice-macros/its_module_stepper.C
+++ b/EVE/alice-macros/its_module_stepper.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TGLViewer.h>
 #include <TTree.h>
@@ -13,10 +14,10 @@
 #include <TEveManager.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveITSModuleStepper.h>
-#include <EVE/EveDet/AliEveITSDigitsInfo.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
+#include <AliEveITSModuleStepper.h>
+#include <AliEveITSDigitsInfo.h>
 #endif
 
 class AliEveITSModuleStepper;
diff --git a/EVE/alice-macros/its_raw.C b/EVE/alice-macros/its_raw.C
index d404212e088..538f61a4a9c 100644
--- a/EVE/alice-macros/its_raw.C
+++ b/EVE/alice-macros/its_raw.C
@@ -6,16 +6,16 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TStyle.h>
 #include <TEveUtil.h>
 
-#include <RAW/AliRawReader.h>
-#include <EveBase/AliEveEventManager.h>
-#include <EveDet/AliEveITSDigitsInfo.h>
+#include <AliRawReader.h>
+#include <AliEveEventManager.h>
+#include <AliEveITSDigitsInfo.h>
 
 #include "its_common_foos.C"
-
 #endif
 
 // Load ITS raw-data.
diff --git a/EVE/alice-macros/jetplane.C b/EVE/alice-macros/jetplane.C
index a815e7c63f7..e553d07a58e 100644
--- a/EVE/alice-macros/jetplane.C
+++ b/EVE/alice-macros/jetplane.C
@@ -18,11 +18,11 @@
 #include <TEveScene.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <STEER/AOD/AliAODEvent.h>
-#include <STEER/AOD/AliAODTrack.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveJetPlane.h>
+#include <AliRunLoader.h>
+#include <AliAODEvent.h>
+#include <AliAODTrack.h>
+#include <AliEveEventManager.h>
+#include <AliEveJetPlane.h>
 #endif
 
 TEveViewer *gJPView   = 0;
diff --git a/EVE/alice-macros/kine_print.C b/EVE/alice-macros/kine_print.C
index ec89d31b410..d3d2536259c 100644
--- a/EVE/alice-macros/kine_print.C
+++ b/EVE/alice-macros/kine_print.C
@@ -13,9 +13,9 @@
 #include <TParticle.h>
 #include <TParticlePDG.h>
 
-#include <STEER/STEERBase/AliStack.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliStack.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 void
 kine_print(Double_t min_pt = 0, Double_t min_p = 0)
diff --git a/EVE/alice-macros/kine_tracks.C b/EVE/alice-macros/kine_tracks.C
index 89dcf861718..ced9e58fb75 100644
--- a/EVE/alice-macros/kine_tracks.C
+++ b/EVE/alice-macros/kine_tracks.C
@@ -21,13 +21,13 @@
 #include <TEveManager.h>
 #include <TEveTrackPropagator.h>
 
-#include <STEER/STEERBase/AliMagF.h>
-#include <STEER/STEERBase/AliStack.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveMagField.h>
-#include <EVE/EveBase/AliEveTrack.h>
-#include <EVE/EveBase/AliEveKineTools.h>
+#include <AliMagF.h>
+#include <AliStack.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
+#include <AliEveMagField.h>
+#include <AliEveTrack.h>
+#include <AliEveKineTools.h>
 #endif
 
 // Use magnetic-field as retrieved from GRP.
diff --git a/EVE/alice-macros/lego.C b/EVE/alice-macros/lego.C
index e9a36b15f57..857d8b4bdfc 100644
--- a/EVE/alice-macros/lego.C
+++ b/EVE/alice-macros/lego.C
@@ -5,11 +5,12 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+ 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TEveElement.h>
 
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveLego.h>
+#include <AliEveEventManager.h>
+#include <AliEveLego.h>
 #endif
 
 AliEveLego* lego(){
diff --git a/EVE/alice-macros/make_residuals.C b/EVE/alice-macros/make_residuals.C
index aa4444d89be..26975c79ea9 100644
--- a/EVE/alice-macros/make_residuals.C
+++ b/EVE/alice-macros/make_residuals.C
@@ -1,4 +1,9 @@
-
+/**************************************************************************
+ * Copyright(c) 1998-2009, ALICE Experiment at CERN, all rights reserved. *
+ * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
+ * full copyright notice.                                                 *
+ **************************************************************************/
+ 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TCanvas.h>
 #include <TGButton.h>
@@ -13,16 +18,16 @@
 #include <TTree.h>
 #include <TEveUtil.h>
 
-#include <STEER/CDB/AliCDBManager.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDfriendTrack.h>
-#include <STEER/STEER/AliGeomManager.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliCDBManager.h>
+#include <AliESDEvent.h>
+#include <AliESDfriendTrack.h>
+#include <AliGeomManager.h>
+#include <AliEveEventManager.h>
 
 /* Not sure which ConfigCalibTrain.C macro ? 
  * From ANALYSIS or from PWGPP?
  */
-#include "ANALYSIS/macros/ConfigCalibTrain.C" 
+#include <ANALYSIS/macros/ConfigCalibTrain.C>
 #endif
 
 class ButtonWindow : public TGMainFrame {
@@ -535,7 +540,7 @@ void ButtonWindow::DrawResiduals()
       Info("make_residuals::DrawResiduals", "nEntries: %f", nEntries->GetNumber());
       Info("make_residuals::DrawResiduals", "firstEntry: %f", firstEntry->GetNumber());
       
-      TEveUtil::LoadMacro("ConfigCalibTrain.C");
+      TEveUtil::LoadMacro("$ALICE_ROOT/ANALYSIS/macros/ConfigCalibTrain.C+");
 
       AliESDEvent *esd = AliEveEventManager::AssertESD();
 
diff --git a/EVE/alice-macros/muon_clusters.C b/EVE/alice-macros/muon_clusters.C
index c384510688d..a56aca6ef7e 100644
--- a/EVE/alice-macros/muon_clusters.C
+++ b/EVE/alice-macros/muon_clusters.C
@@ -23,10 +23,10 @@
 #include <TEveManager.h>
 #include <TEvePointSet.h>
 
-#include <MUON/AliMUONVCluster.h>
-#include <MUON/AliMUONVClusterStore.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliMUONVCluster.h>
+#include <AliMUONVClusterStore.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 class TIter;
 class TEvePointSet;
diff --git a/EVE/alice-macros/muon_digits.C b/EVE/alice-macros/muon_digits.C
index d972ae872f7..d6ea00fafd2 100644
--- a/EVE/alice-macros/muon_digits.C
+++ b/EVE/alice-macros/muon_digits.C
@@ -24,15 +24,15 @@
 #include <TEveManager.h>
 #include <TEveQuadSet.h>
 
-#include <MUON/AliMUONGeometryTransformer.h>
-#include <MUON/AliMUONVDigit.h>
-#include <MUON/AliMUONVDigitStore.h>
-#include <MUON/mapping/AliMpPad.h>
-#include <MUON/mapping/AliMpSegmentation.h>
-#include <MUON/mapping/AliMpVSegmentation.h>
-#include <MUON/mapping/AliMpCDB.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliMUONGeometryTransformer.h>
+#include <AliMUONVDigit.h>
+#include <AliMUONVDigitStore.h>
+#include <AliMpPad.h>
+#include <AliMpSegmentation.h>
+#include <AliMpVSegmentation.h>
+#include <AliMpCDB.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 //______________________________________________________________________________
diff --git a/EVE/alice-macros/muon_raw.C b/EVE/alice-macros/muon_raw.C
index 1eff67c4874..252a2ba486e 100644
--- a/EVE/alice-macros/muon_raw.C
+++ b/EVE/alice-macros/muon_raw.C
@@ -25,11 +25,11 @@
 #include <TEveUtil.h>
 #include <TEveQuadSet.h>
 
-#include <MUON/AliMUONDigitMaker.h>
-#include <MUON/AliMUONDigitStoreV2R.h>
-#include <MUON/mapping/AliMpCDB.h>
-#include <RAW/AliRawReader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliMUONDigitMaker.h>
+#include <AliMUONDigitStoreV2R.h>
+#include <AliMpCDB.h>
+#include <AliRawReader.h>
+#include <AliEveEventManager.h>
 #endif
 
 void muon_raw()
diff --git a/EVE/alice-macros/muon_trackRefs.C b/EVE/alice-macros/muon_trackRefs.C
index eb7235f40f1..335cd9602f5 100644
--- a/EVE/alice-macros/muon_trackRefs.C
+++ b/EVE/alice-macros/muon_trackRefs.C
@@ -30,18 +30,18 @@
 #include <TEveVSDStructs.h>
 #include <TEveTrackPropagator.h>
 
-#include <MUON/AliMUONClusterStoreV2.h>
-#include <MUON/AliMUONRawClusterV2.h>
-#include <MUON/AliMUONVCluster.h>
-#include <MUON/AliMUONConstants.h>
-#include <MUON/AliMUONRecoParam.h>
-#include <MUON/AliMUONCDB.h>
-#include <STEER/STEERBase/AliStack.h>
-#include <STEER/STEERBase/AliTrackReference.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveMagField.h>
-#include <EVE/EveBase/AliEveTrack.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliMUONClusterStoreV2.h>
+#include <AliMUONRawClusterV2.h>
+#include <AliMUONVCluster.h>
+#include <AliMUONConstants.h>
+#include <AliMUONRecoParam.h>
+#include <AliMUONCDB.h>
+#include <AliStack.h>
+#include <AliTrackReference.h>
+#include <AliRunLoader.h>
+#include <AliEveMagField.h>
+#include <AliEveTrack.h>
+#include <AliEveEventManager.h>
 #endif
 
 //______________________________________________________________________________
diff --git a/EVE/alice-macros/phos_clusters.C b/EVE/alice-macros/phos_clusters.C
index 5bc52d5a59f..84f04ce1014 100644
--- a/EVE/alice-macros/phos_clusters.C
+++ b/EVE/alice-macros/phos_clusters.C
@@ -16,9 +16,9 @@
 #include <TEveElement.h>
 #include <TEvePointSet.h>
 
-#include <STEER/STEER/AliCluster.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EveBase/AliEveEventManager.h>
+#include <AliCluster.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 TEvePointSet* phos_clusters(TEveElement* cont=0)
diff --git a/EVE/alice-macros/pmd_digits.C b/EVE/alice-macros/pmd_digits.C
index 2bbeb92b4fd..f740eea6142 100644
--- a/EVE/alice-macros/pmd_digits.C
+++ b/EVE/alice-macros/pmd_digits.C
@@ -17,12 +17,12 @@
 #include <TEveRGBAPalette.h>
 #include <TEveTrans.h>
 
-#include <HMPID/AliHMPIDDigit.h>
-#include <HMPID/AliHMPIDv3.h>
-#include <STEER/STEER/AliCluster3D.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEvePMDModule.h>
+#include <AliHMPIDDigit.h>
+#include <AliHMPIDv3.h>
+#include <AliCluster3D.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
+#include <AliEvePMDModule.h>
 #endif
 
 void pmd_digits(Int_t mode = 0)
diff --git a/EVE/alice-macros/pmd_hits.C b/EVE/alice-macros/pmd_hits.C
index 29f4f2e6c23..558123dc1f1 100644
--- a/EVE/alice-macros/pmd_hits.C
+++ b/EVE/alice-macros/pmd_hits.C
@@ -15,8 +15,8 @@
 #include <TEvePointSet.h>
 #include <TEveTrans.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 TEvePointSet*
diff --git a/EVE/alice-macros/pmd_raw.C b/EVE/alice-macros/pmd_raw.C
index 4f4bc7d6ae3..2e78acc3dd8 100644
--- a/EVE/alice-macros/pmd_raw.C
+++ b/EVE/alice-macros/pmd_raw.C
@@ -16,11 +16,11 @@
 #include <TEveElement.h>
 #include <TEvePointSet.h>
 
-#include <PMD/AliPMDRawStream.h>
-#include <RAW/AliRawReaderRoot.h>
-#include <STEER/STEER/AliCluster.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEvePMDModule.h>
+#include <AliPMDRawStream.h>
+#include <AliRawReaderRoot.h>
+#include <AliCluster.h>
+#include <AliEveEventManager.h>
+#include <AliEvePMDModule.h>
 #endif
 
 void pmd_raw(Int_t mode = 0)
diff --git a/EVE/alice-macros/primary_vertex.C b/EVE/alice-macros/primary_vertex.C
index 328688e98bb..63a739d746e 100644
--- a/EVE/alice-macros/primary_vertex.C
+++ b/EVE/alice-macros/primary_vertex.C
@@ -12,9 +12,9 @@
 #include <TEveCompound.h>
 #include <TEveStraightLineSet.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDVertex.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliESDEvent.h>
+#include <AliESDVertex.h>
+#include <AliEveEventManager.h>
 #endif
 
 //==============================================================================
diff --git a/EVE/alice-macros/primary_vertex_tracks.C b/EVE/alice-macros/primary_vertex_tracks.C
index b3ce4cb313f..88d8bb3b3e2 100644
--- a/EVE/alice-macros/primary_vertex_tracks.C
+++ b/EVE/alice-macros/primary_vertex_tracks.C
@@ -14,11 +14,11 @@
 #include <TEveTrackPropagator.h>
 #include <TEveUtil.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDVertex.h>
-#include <STEER/ESD/AliESDtrack.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveBase/AliEveTrack.h>
+#include <AliESDEvent.h>
+#include <AliESDVertex.h>
+#include <AliESDtrack.h>
+#include <AliEveEventManager.h>
+#include <AliEveTrack.h>
 
 #include "esd_tracks.C"
 #endif
diff --git a/EVE/alice-macros/print_kine_from_label.C b/EVE/alice-macros/print_kine_from_label.C
index b4686198f7a..7a6ff2a7536 100644
--- a/EVE/alice-macros/print_kine_from_label.C
+++ b/EVE/alice-macros/print_kine_from_label.C
@@ -10,9 +10,9 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TParticle.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <STEER/STEERBase/AliStack.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliStack.h>
+#include <AliEveEventManager.h>
 #endif
 
 void print_kine_from_label(Int_t label)
diff --git a/EVE/alice-macros/raw_its_tpc_tof_pvtx.C b/EVE/alice-macros/raw_its_tpc_tof_pvtx.C
index c62f057b3ec..4db1948c40e 100644
--- a/EVE/alice-macros/raw_its_tpc_tof_pvtx.C
+++ b/EVE/alice-macros/raw_its_tpc_tof_pvtx.C
@@ -1,4 +1,16 @@
 //Macro generated automatically by AliEveMacroExecutor
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+#include <TEveBrowser.h>
+#include <TEveWindow.h>
+#include <TEvePointSet.h>
+
+#include <AliEveEventManager.h>
+#include <AliEveMacro.h>
+#include <AliEveMacroExecutor.h>
+#include <AliEveMacroExecutorWindow.h>
+#include <AliEveMultiView.h>
+#endif
 
 void raw_its_tpc_tof_pvtx(){
 
@@ -71,4 +83,4 @@ void raw_its_tpc_tof_pvtx(){
   exewin->PopulateMacros();
 
 
-}
\ No newline at end of file
+}
diff --git a/EVE/alice-macros/raw_its_tpc_tof_vzero_fmd_pvtx.C b/EVE/alice-macros/raw_its_tpc_tof_vzero_fmd_pvtx.C
index 9a97aa9a2e1..502d8936cce 100644
--- a/EVE/alice-macros/raw_its_tpc_tof_vzero_fmd_pvtx.C
+++ b/EVE/alice-macros/raw_its_tpc_tof_vzero_fmd_pvtx.C
@@ -1,4 +1,16 @@
 //Macro generated automatically by AliEveMacroExecutor
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+#include <TEveBrowser.h>
+#include <TEveWindow.h>
+#include <TEvePointSet.h>
+
+#include <AliEveEventManager.h>
+#include <AliEveMacro.h>
+#include <AliEveMacroExecutor.h>
+#include <AliEveMacroExecutorWindow.h>
+#include <AliEveMultiView.h>
+#endif
 
 void raw_its_tpc_tof_vzero_fmd_pvtx(){
 
@@ -71,4 +83,4 @@ void raw_its_tpc_tof_vzero_fmd_pvtx(){
   exewin->PopulateMacros();
 
 
-}
\ No newline at end of file
+}
diff --git a/EVE/alice-macros/raw_its_tpc_tof_vzero_pvtx.C b/EVE/alice-macros/raw_its_tpc_tof_vzero_pvtx.C
index 0b9c88f9c1e..cc2c3a6119c 100644
--- a/EVE/alice-macros/raw_its_tpc_tof_vzero_pvtx.C
+++ b/EVE/alice-macros/raw_its_tpc_tof_vzero_pvtx.C
@@ -1,4 +1,16 @@
 //Macro generated automatically by AliEveMacroExecutor
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+#include <TEveBrowser.h>
+#include <TEveWindow.h>
+#include <TEvePointSet.h>
+
+#include <AliEveEventManager.h>
+#include <AliEveMacro.h>
+#include <AliEveMacroExecutor.h>
+#include <AliEveMacroExecutorWindow.h>
+#include <AliEveMultiView.h>
+#endif
 
 void raw_its_tpc_tof_vzero_pvtx(){
 
diff --git a/EVE/alice-macros/raw_tpc_its.C b/EVE/alice-macros/raw_tpc_its.C
index df64fee7951..e50ba5bf3d1 100644
--- a/EVE/alice-macros/raw_tpc_its.C
+++ b/EVE/alice-macros/raw_tpc_its.C
@@ -1,4 +1,16 @@
 //Macro generated automatically by AliEveMacroExecutor
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+#include <TEveBrowser.h>
+#include <TEveWindow.h>
+#include <TEvePointSet.h>
+
+#include <AliEveEventManager.h>
+#include <AliEveMacro.h>
+#include <AliEveMacroExecutor.h>
+#include <AliEveMacroExecutorWindow.h>
+#include <AliEveMultiView.h>
+#endif
 
 void raw_tpc_its(){
 
@@ -71,4 +83,4 @@ void raw_tpc_its(){
   exewin->PopulateMacros();
 
 
-}
\ No newline at end of file
+}
diff --git a/EVE/alice-macros/set_momentum_vectors.C b/EVE/alice-macros/set_momentum_vectors.C
index b246182650b..e31ca534557 100644
--- a/EVE/alice-macros/set_momentum_vectors.C
+++ b/EVE/alice-macros/set_momentum_vectors.C
@@ -15,9 +15,9 @@
 #include <TEveElement.h>
 #include <TEveUtil.h>
 
-#include <STEER/ESD/AliESDtrack.h>
-#include <EVE/EveBase/AliEveTrack.h>
-#include <EVE/EveBase/AliEveMultiView.h>
+#include <AliESDtrack.h>
+#include <AliEveTrack.h>
+#include <AliEveMultiView.h>
 #endif
 
 void set_momentum_vectors()
diff --git a/EVE/alice-macros/t0_digits.C b/EVE/alice-macros/t0_digits.C
index fa8510acd29..c4a3db60acf 100644
--- a/EVE/alice-macros/t0_digits.C
+++ b/EVE/alice-macros/t0_digits.C
@@ -11,11 +11,11 @@
 #include <TTree.h>
 #include <TStyle.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <T0/AliT0digit.h>
-#include <EveBase/AliEveEventManager.h>
-#include <EveDet/AliEveITSDigitsInfo.h>
-#include <EVE/EveDet/AliEveT0Module.h>
+#include <AliRunLoader.h>
+#include <AliT0digit.h>
+#include <AliEveEventManager.h>
+#include <AliEveITSDigitsInfo.h>
+#include <AliEveT0Module.h>
 #endif
 
 void t0_digits()
diff --git a/EVE/alice-macros/t0_hits.C b/EVE/alice-macros/t0_hits.C
index cc8e4998758..38b01d47afa 100644
--- a/EVE/alice-macros/t0_hits.C
+++ b/EVE/alice-macros/t0_hits.C
@@ -15,8 +15,8 @@
 #include <TEveManager.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 TEvePointSet*
diff --git a/EVE/alice-macros/t0_raw.C b/EVE/alice-macros/t0_raw.C
index 5dc24ed401f..59f3095fc24 100644
--- a/EVE/alice-macros/t0_raw.C
+++ b/EVE/alice-macros/t0_raw.C
@@ -10,9 +10,9 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TStyle.h>
 
-#include <RAW/AliRawReader.h>
-#include <EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveT0Module.h>
+#include <AliRawReader.h>
+#include <AliEveEventManager.h>
+#include <AliEveT0Module.h>
 #endif
 
 void t0_raw()
diff --git a/EVE/alice-macros/tof_clusters.C b/EVE/alice-macros/tof_clusters.C
index 75cb3d8d8fc..1df955847b2 100644
--- a/EVE/alice-macros/tof_clusters.C
+++ b/EVE/alice-macros/tof_clusters.C
@@ -14,9 +14,9 @@
 #include <TEveManager.h>
 #include <TEvePointSet.h>
 
-#include <STEER/STEER/AliCluster.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliCluster.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #else
 class TEveElement;
 class TEvePointSet;
diff --git a/EVE/alice-macros/tof_digits.C b/EVE/alice-macros/tof_digits.C
index 21209cf76ea..b165a5d790f 100644
--- a/EVE/alice-macros/tof_digits.C
+++ b/EVE/alice-macros/tof_digits.C
@@ -15,11 +15,11 @@
 #include <TEveManager.h>
 #include <TEveElement.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <TOF/AliTOFGeometry.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveTOFDigitsInfo.h>
-#include <EVE/EveDet/AliEveTOFSector.h>
+#include <AliRunLoader.h>
+#include <AliTOFGeometry.h>
+#include <AliEveEventManager.h>
+#include <AliEveTOFDigitsInfo.h>
+#include <AliEveTOFSector.h>
 #endif
 
 void tof_digits()
diff --git a/EVE/alice-macros/tof_digits_sector.C b/EVE/alice-macros/tof_digits_sector.C
index 2b79b702b92..8c35562a650 100644
--- a/EVE/alice-macros/tof_digits_sector.C
+++ b/EVE/alice-macros/tof_digits_sector.C
@@ -14,11 +14,11 @@
 #include <TEveManager.h>
 #include <TEveElement.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <TOF/AliTOFGeometry.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveTOFDigitsInfo.h>
-#include <EVE/EveDet/AliEveTOFSector.h>
+#include <AliRunLoader.h>
+#include <AliTOFGeometry.h>
+#include <AliEveEventManager.h>
+#include <AliEveTOFDigitsInfo.h>
+#include <AliEveTOFSector.h>
 #endif
 
 void tof_digits_sector(Int_t sector=0)
diff --git a/EVE/alice-macros/tof_digits_strips.C b/EVE/alice-macros/tof_digits_strips.C
index 2e035ea647a..5deb20b1954 100644
--- a/EVE/alice-macros/tof_digits_strips.C
+++ b/EVE/alice-macros/tof_digits_strips.C
@@ -15,11 +15,11 @@
 #include <TEveManager.h>
 #include <TEveElement.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <TOF/AliTOFGeometry.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveTOFDigitsInfo.h>
-#include <EVE/EveDet/AliEveTOFStrip.h>
+#include <AliRunLoader.h>
+#include <AliTOFGeometry.h>
+#include <AliEveEventManager.h>
+#include <AliEveTOFDigitsInfo.h>
+#include <AliEveTOFStrip.h>
 #endif
 
 void tof_digits_strips(Int_t selectedSector=-1)
diff --git a/EVE/alice-macros/tof_hits.C b/EVE/alice-macros/tof_hits.C
index 4fd4b28f618..b630be8babb 100644
--- a/EVE/alice-macros/tof_hits.C
+++ b/EVE/alice-macros/tof_hits.C
@@ -14,8 +14,8 @@
 #include <TEveManager.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 TEvePointSet*
diff --git a/EVE/alice-macros/tof_raw.C b/EVE/alice-macros/tof_raw.C
index 80aba87a1e1..a26e8791c60 100644
--- a/EVE/alice-macros/tof_raw.C
+++ b/EVE/alice-macros/tof_raw.C
@@ -11,10 +11,10 @@
 #include <TEveManager.h>
 #include <TEveElement.h>
 
-#include <TOF/AliTOFGeometry.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveTOFDigitsInfo.h>
-#include <EVE/EveDet/AliEveTOFSector.h>
+#include <AliTOFGeometry.h>
+#include <AliEveEventManager.h>
+#include <AliEveTOFDigitsInfo.h>
+#include <AliEveTOFSector.h>
 #endif
 
 void tof_raw(Int_t newDecoder = 2)
diff --git a/EVE/alice-macros/tpc_calib_viewer.C b/EVE/alice-macros/tpc_calib_viewer.C
index 28c7b55a397..8dcd11e763c 100644
--- a/EVE/alice-macros/tpc_calib_viewer.C
+++ b/EVE/alice-macros/tpc_calib_viewer.C
@@ -13,7 +13,7 @@
 #include <TEveManager.h>
 #include <TEveBrowser.h>
 
-#include <TPC/AliTPCCalibViewerGUI.h>
+#include <AliTPCCalibViewerGUI.h>
 #endif
 
 void tpc_calib_viewer(const char* file="CalibTree.root")
diff --git a/EVE/alice-macros/tpc_digits.C b/EVE/alice-macros/tpc_digits.C
index 7c82f3d6345..793956ae5d8 100644
--- a/EVE/alice-macros/tpc_digits.C
+++ b/EVE/alice-macros/tpc_digits.C
@@ -13,11 +13,11 @@
 #include <TEveManager.h>
 #include <TEveElement.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveTPCData.h>
-#include <EVE/EveDet/AliEveTPCSector2D.h>
-#include <EVE/EveDet/AliEveTPCSector3D.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
+#include <AliEveTPCData.h>
+#include <AliEveTPCSector2D.h>
+#include <AliEveTPCSector3D.h>
 #endif
 
 void tpc_digits(Int_t mode=1)
diff --git a/EVE/alice-macros/tpc_hits.C b/EVE/alice-macros/tpc_hits.C
index ae684318856..2d5a00b481e 100644
--- a/EVE/alice-macros/tpc_hits.C
+++ b/EVE/alice-macros/tpc_hits.C
@@ -15,8 +15,8 @@
 #include <TEveManager.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 TEvePointSet*
diff --git a/EVE/alice-macros/tpc_hits_charge_split.C b/EVE/alice-macros/tpc_hits_charge_split.C
index 934a2c3e13d..08d7c442cb7 100644
--- a/EVE/alice-macros/tpc_hits_charge_split.C
+++ b/EVE/alice-macros/tpc_hits_charge_split.C
@@ -13,8 +13,8 @@
 #include <TEvePointSet.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 void tpc_hits_charge_split(const char *varexp    =
diff --git a/EVE/alice-macros/tpc_hits_eta_split.C b/EVE/alice-macros/tpc_hits_eta_split.C
index 4b50b5b988a..c871ae87b50 100644
--- a/EVE/alice-macros/tpc_hits_eta_split.C
+++ b/EVE/alice-macros/tpc_hits_eta_split.C
@@ -13,8 +13,8 @@
 #include <TEvePointSet.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 void tpc_hits_eta_split(const char *varexp    =
diff --git a/EVE/alice-macros/tpc_raw.C b/EVE/alice-macros/tpc_raw.C
index 495ab3b7ec3..311e0a3117b 100644
--- a/EVE/alice-macros/tpc_raw.C
+++ b/EVE/alice-macros/tpc_raw.C
@@ -15,13 +15,13 @@
 #include <TEvePointSet.h>
 #include <TEveTreeTools.h>
 
-#include <RAW/AliRawReader.h>
-#include <RAW/AliAltroRawStreamV3.h>
-#include <TPC/AliTPCRawStreamV3.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveTPCData.h>
-#include <EVE/EveDet/AliEveTPCSector2D.h>
-#include <EVE/EveDet/AliEveTPCSector3D.h>
+#include <AliRawReader.h>
+#include <AliAltroRawStreamV3.h>
+#include <AliTPCRawStreamV3.h>
+#include <AliEveEventManager.h>
+#include <AliEveTPCData.h>
+#include <AliEveTPCSector2D.h>
+#include <AliEveTPCSector3D.h>
 #endif
 
 // Macro to visualise rootified raw-data from TPC.
diff --git a/EVE/alice-macros/track_fitter.C b/EVE/alice-macros/track_fitter.C
index 3f0f283f970..60d1fae5102 100644
--- a/EVE/alice-macros/track_fitter.C
+++ b/EVE/alice-macros/track_fitter.C
@@ -15,8 +15,8 @@
 #include <TEveManager.h>
 #include <TEveSelection.h>
 
-#include <EVE/EveBase/AliEveTrackFitter.h>
-#include <EVE/EveBase/AliEveCosmicRayFitter.h>
+#include <AliEveTrackFitter.h>
+#include <AliEveCosmicRayFitter.h>
 #endif
 
 void track_fitter(Int_t mode = 1)
diff --git a/EVE/alice-macros/trd_analyse.C b/EVE/alice-macros/trd_analyse.C
index effa0e6cb4e..3371b3fc46e 100644
--- a/EVE/alice-macros/trd_analyse.C
+++ b/EVE/alice-macros/trd_analyse.C
@@ -7,15 +7,15 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TEvePointSet.h>
 
-#include <STEER/STEERBase/AliPID.h>
-#include <TRD/AliTRDhit.h>
-#include <TRD/AliTRDarrayADC.h>
-#include <TRD/AliTRDcluster.h>
-#include <TRD/AliTRDtrackV1.h>
-#include <TRD/AliTRDReconstructor.h>
-#include <TRD/AliTRDrecoParam.h>
-#include <TRD/AliTRDseedV1.h>
-#include <EVE/EveDet/AliEveTRDData.h>
+#include <AliPID.h>
+#include <AliTRDhit.h>
+#include <AliTRDarrayADC.h>
+#include <AliTRDcluster.h>
+#include <AliTRDtrackV1.h>
+#include <AliTRDReconstructor.h>
+#include <AliTRDrecoParam.h>
+#include <AliTRDseedV1.h>
+#include <AliEveTRDData.h>
 #endif
 
 //
diff --git a/EVE/alice-macros/trd_digits.C b/EVE/alice-macros/trd_digits.C
index aa35c6ca005..6963fa61b1d 100644
--- a/EVE/alice-macros/trd_digits.C
+++ b/EVE/alice-macros/trd_digits.C
@@ -18,14 +18,14 @@
 #include <TEveElement.h>
 #include <TEvePointSet.h>
 
-#include <STEER/STEER/AliCluster.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <TRD/AliTRDarrayADC.h>
-#include <TRD/AliTRDcluster.h>
-#include <TRD/AliTRDgeometry.h>
-#include <TRD/AliTRDdigitsManager.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveTRDModuleImp.h>
+#include <AliCluster.h>
+#include <AliRunLoader.h>
+#include <AliTRDarrayADC.h>
+#include <AliTRDcluster.h>
+#include <AliTRDgeometry.h>
+#include <AliTRDdigitsManager.h>
+#include <AliEveEventManager.h>
+#include <AliEveTRDModuleImp.h>
 #else
 class TEvePointSet;
 class TEveElement;
diff --git a/EVE/alice-macros/trd_gtutracks.C b/EVE/alice-macros/trd_gtutracks.C
index 77fc2411c25..4af4bf5ca6f 100644
--- a/EVE/alice-macros/trd_gtutracks.C
+++ b/EVE/alice-macros/trd_gtutracks.C
@@ -6,18 +6,18 @@
 #include <TEveManager.h>
 #include <TEveElement.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <STEER/STEER/AliLoader.h>
-#include <STEER/STEER/AliDataLoader.h>
-#include <STEER/STEER/AliTreeLoader.h>
-#include <TRD/AliTRDarrayADC.h>
-#include <TRD/AliTRDgeometry.h>
-#include <TRD/AliTRDtrackletWord.h>
-#include <TRD/AliTRDtrackletMCM.h>
-#include <TRD/AliTRDtrackGTU.h>
-#include <TRD/AliTRDtrackletGTU.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveTRDData.h>
+#include <AliRunLoader.h>
+#include <AliLoader.h>
+#include <AliDataLoader.h>
+#include <AliTreeLoader.h>
+#include <AliTRDarrayADC.h>
+#include <AliTRDgeometry.h>
+#include <AliTRDtrackletWord.h>
+#include <AliTRDtrackletMCM.h>
+#include <AliTRDtrackGTU.h>
+#include <AliTRDtrackletGTU.h>
+#include <AliEveEventManager.h>
+#include <AliEveTRDData.h>
 #endif
 
 TEveElementList *
diff --git a/EVE/alice-macros/trd_hits.C b/EVE/alice-macros/trd_hits.C
index 3a52e51cb38..9150ed8cc36 100644
--- a/EVE/alice-macros/trd_hits.C
+++ b/EVE/alice-macros/trd_hits.C
@@ -14,8 +14,8 @@
 #include <TEveManager.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 TEvePointSet*
diff --git a/EVE/alice-macros/trd_hits_z_split.C b/EVE/alice-macros/trd_hits_z_split.C
index 5f85c6ef951..0091218726e 100644
--- a/EVE/alice-macros/trd_hits_z_split.C
+++ b/EVE/alice-macros/trd_hits_z_split.C
@@ -15,8 +15,8 @@
 #include <TEveManager.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 void trd_hits_z_split(const char *varexp    = "fX:fY:fZ:fZ",
diff --git a/EVE/alice-macros/trd_loader.C b/EVE/alice-macros/trd_loader.C
index 7ee762fdbe5..611df5fe696 100644
--- a/EVE/alice-macros/trd_loader.C
+++ b/EVE/alice-macros/trd_loader.C
@@ -22,7 +22,7 @@
 #include <TEveManager.h>
 #include <TEveTreeTools.h>
 
-#include <EVE/EveDet/AliEveTRDLoader.h>
+#include <AliEveTRDLoader.h>
 #endif
 
 AliEveTRDLoader* trd_loader(Int_t event=0)
diff --git a/EVE/alice-macros/trd_qaRec.C b/EVE/alice-macros/trd_qaRec.C
index 66c34b695bb..692d8ce7de4 100644
--- a/EVE/alice-macros/trd_qaRec.C
+++ b/EVE/alice-macros/trd_qaRec.C
@@ -6,15 +6,15 @@
 #include <TROOT.h>
 #include <TEveManager.h>
 
+#include <AliCDBManager.h>
+#include <AliTRDarrayADC.h>
+#include <AliTRDReconstructor.h>
+#include <AliTRDrecoParam.h>
+#include <AliTRDtrackV1.h>
 #include <PWGPP/TRD/info/AliTRDtrackInfo.h>
-#include <STEER/CDB/AliCDBManager.h>
-#include <TRD/AliTRDarrayADC.h>
-#include <TRD/AliTRDReconstructor.h>
-#include <TRD/AliTRDrecoParam.h>
-#include <TRD/AliTRDtrackV1.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveTRDTrackList.h>
-#include <EVE/EveDet/AliEveTRDData.h>
+#include <AliEveEventManager.h>
+#include <AliEveTRDTrackList.h>
+#include <AliEveTRDData.h>
 #endif
 
 void trd_qaRec()
diff --git a/EVE/alice-macros/trd_rawloader.C b/EVE/alice-macros/trd_rawloader.C
index b9b51109323..0c64e8a1635 100644
--- a/EVE/alice-macros/trd_rawloader.C
+++ b/EVE/alice-macros/trd_rawloader.C
@@ -20,8 +20,8 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TEveManager.h>
 
-#include <EVE/EveDet/AliEveTRDLoader.h>
-#include <EVE/EveDet/AliEveTRDLoaderImp.h>
+#include <AliEveTRDLoader.h>
+#include <AliEveTRDLoaderImp.h>
 #endif
 
 
diff --git a/EVE/alice-macros/trd_tracklets.C b/EVE/alice-macros/trd_tracklets.C
index eee4cd7d623..a8e76777343 100644
--- a/EVE/alice-macros/trd_tracklets.C
+++ b/EVE/alice-macros/trd_tracklets.C
@@ -5,15 +5,15 @@
 #include <TEveManager.h>
 #include <TEveElement.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <STEER/STEER/AliLoader.h>
-#include <STEER/STEER/AliDataLoader.h>
-#include <STEER/STEER/AliTreeLoader.h>
-#include <TRD/AliTRDarrayADC.h>
-#include <TRD/AliTRDtrackletWord.h>
-#include <TRD/AliTRDtrackletMCM.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveTRDData.h>
+#include <AliRunLoader.h>
+#include <AliLoader.h>
+#include <AliDataLoader.h>
+#include <AliTreeLoader.h>
+#include <AliTRDarrayADC.h>
+#include <AliTRDtrackletWord.h>
+#include <AliTRDtrackletMCM.h>
+#include <AliEveEventManager.h>
+#include <AliEveTRDData.h>
 #endif
 
 TEveElementList *trd_tracklets()
diff --git a/EVE/alice-macros/trd_tracks.C b/EVE/alice-macros/trd_tracks.C
index 62e6ad4f086..2be2e60af89 100644
--- a/EVE/alice-macros/trd_tracks.C
+++ b/EVE/alice-macros/trd_tracks.C
@@ -2,13 +2,13 @@
 #include <TGLViewer.h>
 #include <TEveManager.h>
 
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDfriend.h>
-#include <TRD/AliTRDarrayADC.h>
-#include <TRD/AliTRDReconstructor.h>
-#include <TRD/AliTRDtrackV1.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveTRDTrackList.h>
+#include <AliESDEvent.h>
+#include <AliESDfriend.h>
+#include <AliTRDarrayADC.h>
+#include <AliTRDReconstructor.h>
+#include <AliTRDtrackV1.h>
+#include <AliEveEventManager.h>
+#include <AliEveTRDTrackList.h>
 #endif
 
 void trd_tracks(TEveElement *cont = 0)
diff --git a/EVE/alice-macros/vplot_tpc.C b/EVE/alice-macros/vplot_tpc.C
index 468dcaa02fe..76d4e7f47b8 100644
--- a/EVE/alice-macros/vplot_tpc.C
+++ b/EVE/alice-macros/vplot_tpc.C
@@ -16,12 +16,12 @@
 #include <TEveScene.h>
 #include <TEvePointSet.h>
 
-#include <STEER/STEER/AliCluster.h>
-#include <STEER/ESD/AliESDEvent.h>
-#include <STEER/ESD/AliESDVertex.h>
-#include <STEER/STEER/AliRunLoader.h>
-#include <TPC/AliTPCClustersRow.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliCluster.h>
+#include <AliESDEvent.h>
+#include <AliESDVertex.h>
+#include <AliRunLoader.h>
+#include <AliTPCClustersRow.h>
+#include <AliEveEventManager.h>
 #endif
 
 TEveViewer *gVPTPCView   = 0;
diff --git a/EVE/alice-macros/vzero_digits.C b/EVE/alice-macros/vzero_digits.C
index 441c57feaa2..4c4c2e39bb2 100644
--- a/EVE/alice-macros/vzero_digits.C
+++ b/EVE/alice-macros/vzero_digits.C
@@ -20,9 +20,9 @@
 #include <TEveQuadSet.h>
 #include <TEveTrans.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <VZERO/AliVZEROdigit.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliVZEROdigit.h>
+#include <AliEveEventManager.h>
 #endif
 
 
diff --git a/EVE/alice-macros/vzero_dump.C b/EVE/alice-macros/vzero_dump.C
index 7ed3b4df9c1..357352c9c95 100644
--- a/EVE/alice-macros/vzero_dump.C
+++ b/EVE/alice-macros/vzero_dump.C
@@ -1,6 +1,7 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
-#include <STEER/ESD/AliESDEvent.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliESDEvent.h>
+#include <AliESDVZERO.h>
+#include <AliEveEventManager.h>
 #endif
 
 void vzero_dump()
diff --git a/EVE/alice-macros/vzero_hits.C b/EVE/alice-macros/vzero_hits.C
index 227dba6963a..a717f4f4c9b 100644
--- a/EVE/alice-macros/vzero_hits.C
+++ b/EVE/alice-macros/vzero_hits.C
@@ -13,8 +13,8 @@
 #include <TEveManager.h>
 #include <TEveTreeTools.h>
 
-#include <STEER/STEER/AliRunLoader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
+#include <AliRunLoader.h>
+#include <AliEveEventManager.h>
 #endif
 
 TEvePointSet*
diff --git a/EVE/alice-macros/vzero_raw.C b/EVE/alice-macros/vzero_raw.C
index 95a5d9ce58b..0a81891a809 100644
--- a/EVE/alice-macros/vzero_raw.C
+++ b/EVE/alice-macros/vzero_raw.C
@@ -11,9 +11,9 @@
 #include <TStyle.h>
 #include <TEveManager.h>
 
-#include <RAW/AliRawReader.h>
-#include <EVE/EveBase/AliEveEventManager.h>
-#include <EVE/EveDet/AliEveVZEROModule.h>
+#include <AliRawReader.h>
+#include <AliEveEventManager.h>
+#include <AliEveVZEROModule.h>
 #else
 class AliRawReader;
 class AliEveVZEROModule;
diff --git a/EVE/macros/visscan_init.C b/EVE/macros/visscan_init.C
index ea29bbb03a5..48cf7d82426 100644
--- a/EVE/macros/visscan_init.C
+++ b/EVE/macros/visscan_init.C
@@ -68,16 +68,16 @@ void visscan_init(const TString& cdburi = "",
 
   mv->SetDepth(-10);
 
-  TEveUtil::LoadMacro("geom_gentle.C");
+  TEveUtil::LoadMacro("geom_gentle.C+");
   mv->InitGeomGentle(geom_gentle(), geom_gentle_rphi(), geom_gentle_rhoz(), 0);
 
   if (showTrd) {
-    TEveUtil::LoadMacro("geom_gentle_trd.C");
+    TEveUtil::LoadMacro("geom_gentle_trd.C+");
     mv->InitGeomGentleTrd(geom_gentle_trd());
   }
 
   if (gShowMuonRPhi || gShowMuonRhoZ) {
-    TEveUtil::LoadMacro("geom_gentle_muon.C");
+    TEveUtil::LoadMacro("geom_gentle_muon.C+");
     mv->InitGeomGentleMuon(geom_gentle_muon(kFALSE), gShowMuonRPhi, gShowMuonRhoZ, kFALSE);
   }
 
@@ -89,30 +89,30 @@ void visscan_init(const TString& cdburi = "",
 
   exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Track",   "kine_tracks.C+", "kine_tracks", "", kFALSE));
 
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits ITS", "its_hits.C",    "its_hits",    "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits TPC", "tpc_hits.C",    "tpc_hits",    "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits T0",  "t0_hits.C",     "t0_hits",     "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits FMD", "fmd_hits.C",    "fmd_hits",    "", kFALSE));
-  //  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits ACORDE", "acorde_hits.C",    "acorde_hits",    "", kFALSE));
-  //  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits EMCAL", "emcal_hits.C",    "emcal_hits",    "", kFALSE));
-  //  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits TOF",  "tof_hits.C",     "tof_hits",     "", kFALSE));
-  //  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits TRD", "trd_hits.C",    "trd_hits",    "", kFALSE));
-  //  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits VZERO", "vzero_hits.C",    "vzero_hits",    "", kFALSE));
-
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "DIG ITS",     "its_digits.C",  "its_digits",  "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "DIG TPC",     "tpc_digits.C",  "tpc_digits",  "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "DIG TOF",     "tof_digits.C",  "tof_digits",  "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "DIG HMPID",   "hmpid_digits.C","hmpid_digits","", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "DIG FMD",     "fmd_digits.C",  "fmd_digits",  "", kFALSE));
-
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW ITS",     "its_raw.C",     "its_raw",     "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW TPC",     "tpc_raw.C",     "tpc_raw",     "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW TOF",     "tof_raw.C",     "tof_raw",     "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW HMPID",   "hmpid_raw.C",   "hmpid_raw",   "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW T0",      "t0_raw.C",      "t0_raw",      "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW FMD",     "fmd_raw.C",     "fmd_raw",     "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW VZERO",   "vzero_raw.C",   "vzero_raw",   "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW ACORDE",  "acorde_raw.C",  "acorde_raw",  "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits ITS", "its_hits.C+",    "its_hits",    "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits TPC", "tpc_hits.C+",    "tpc_hits",    "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits T0",  "t0_hits.C+",     "t0_hits",     "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits FMD", "fmd_hits.C+",    "fmd_hits",    "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits ACORDE", "acorde_hits.C+",    "acorde_hits",    "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits EMCAL", "emcal_hits.C+",    "emcal_hits",    "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits TOF",  "tof_hits.C+",     "tof_hits",     "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits TRD", "trd_hits.C+",    "trd_hits",    "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hits VZERO", "vzero_hits.C+",    "vzero_hits",    "", kFALSE));
+
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "DIG ITS",     "its_digits.C+",  "its_digits",  "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "DIG TPC",     "tpc_digits.C+",  "tpc_digits",  "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "DIG TOF",     "tof_digits.C+",  "tof_digits",  "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "DIG HMPID",   "hmpid_digits.C+","hmpid_digits","", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "DIG FMD",     "fmd_digits.C+",  "fmd_digits",  "", kFALSE));
+
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW ITS",     "its_raw.C+",     "its_raw",     "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW TPC",     "tpc_raw.C+",     "tpc_raw",     "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW TOF",     "tof_raw.C+",     "tof_raw",     "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW HMPID",   "hmpid_raw.C+",   "hmpid_raw",   "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW T0",      "t0_raw.C+",      "t0_raw",      "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW FMD",     "fmd_raw.C+",     "fmd_raw",     "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW VZERO",   "vzero_raw.C+",   "vzero_raw",   "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW ACORDE",  "acorde_raw.C+",  "acorde_raw",  "", kFALSE));
 
   exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC PVTX",             "primary_vertex.C+", "primary_vertex",             "",                kTRUE));
   exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC PVTX Ellipse",     "primary_vertex.C+", "primary_vertex_ellipse",     "",                kTRUE));
@@ -124,13 +124,13 @@ void visscan_init(const TString& cdburi = "",
   exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC PVTX Ellipse TPC", "primary_vertex.C+", "primary_vertex_ellipse_tpc", "",                kFALSE));
   exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC PVTX Box TPC",     "primary_vertex.C+", "primary_vertex_box_tpc",     "kFALSE, 3, 3, 3", kFALSE));
 
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC V0",   "esd_V0_points.C",       "esd_V0_points_onfly"));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC V0",   "esd_V0_points.C",       "esd_V0_points_offline"));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC V0",   "esd_V0.C",              "esd_V0"));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC CSCD", "esd_cascade_points.C",  "esd_cascade_points"));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC CSCD", "esd_cascade.C",         "esd_cascade"));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC KINK", "esd_kink_points.C",     "esd_kink_points"));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC KINK", "esd_kink.C",            "esd_kink"));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC V0",   "esd_V0_points.C+",       "esd_V0_points_onfly"));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC V0",   "esd_V0_points.C+",       "esd_V0_points_offline"));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC V0",   "esd_V0.C+",              "esd_V0"));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC CSCD", "esd_cascade_points.C+",  "esd_cascade_points"));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC CSCD", "esd_cascade.C+",         "esd_cascade"));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC KINK", "esd_kink_points.C+",     "esd_kink_points"));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC KINK", "esd_kink.C+",            "esd_kink"));
 
   exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC Tracks",              "esd_tracks.C+", "esd_tracks",              "", kFALSE));
   exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC Tracks ITS standalone",          "esd_tracks.C+", "esd_tracks_ITS_standalone",              "", kFALSE));
@@ -139,27 +139,27 @@ void visscan_init(const TString& cdburi = "",
   exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC Tracks MI",           "esd_tracks.C+", "esd_tracks_MI",           "", kFALSE));
   exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC Tracks by category",  "esd_tracks.C+", "esd_tracks_by_category",  "", kTRUE));
   exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC Tracks by anal cuts", "esd_tracks.C+", "esd_tracks_by_anal_cuts", "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC Tracks Lego", "lego.C", "lego", "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC Tracks Beams Info", "beams_info.C", "beams_info", "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC Tracks Lego", "lego.C+", "lego", "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC Tracks Beams Info", "beams_info.C+", "beams_info", "", kFALSE));
 
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC Tracklets SPD", "esd_spd_tracklets.C", "esd_spd_tracklets", "", kTRUE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC Tracklets SPD", "esd_spd_tracklets.C+", "esd_spd_tracklets", "", kTRUE));
 
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC ZDC",      "esd_zdc.C", "esd_zdc", "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "REC ZDC",      "esd_zdc.C+", "esd_zdc", "", kFALSE));
 
   exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "REC Clusters",     "clusters.C+",     "clusters", "", kFALSE));
   exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "REC Clusters ITS", "its_clusters.C+", "its_clusters"));
   exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "REC Clusters TPC", "tpc_clusters.C+", "tpc_clusters"));
   exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "REC Clusters TRD", "trd_clusters.C+", "trd_clusters"));
   exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "REC Clusters TOF", "tof_clusters.C+", "tof_clusters"));
-  //  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "REC Clusters HMPID", "hmpid_clusters.C+", "hmpid_clusters"));
-  //  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "REC Clusters PHOS", "phos_clusters.C+", "phos_clusters"));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "REC Clusters HMPID", "hmpid_clusters.C+", "hmpid_clusters"));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "REC Clusters PHOS", "phos_clusters.C+", "phos_clusters"));
 
   exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "REC Clusters TPC", "vplot_tpc.C+",    "vplot_tpc", "", kFALSE));
 
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kAOD, "ANA HF",   "aod_HF.C",   "aod_HF",   "", kFALSE));
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kAOD, "ANA Jets", "jetplane.C", "jetplane", "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kAOD, "ANA HF",   "aod_HF.C+",   "aod_HF",   "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kAOD, "ANA Jets", "jetplane.C+", "jetplane", "", kFALSE));
 
-  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "DUMP VZERO",   "vzero_dump.C",   "vzero_dump",   "", kFALSE));
+  exec->AddMacro(new AliEveMacro(AliEveMacro::kESD, "DUMP VZERO",   "vzero_dump.C+",   "vzero_dump",   "", kFALSE));
   
   if (showMuon)
   {
diff --git a/EVE/macros/visscan_local.C b/EVE/macros/visscan_local.C
index cb04aed6a6b..7e2119e12d3 100644
--- a/EVE/macros/visscan_local.C
+++ b/EVE/macros/visscan_local.C
@@ -1,3 +1,7 @@
+#include <TString.h>
+#include <TROOT.h>
+
+
 void visscan_local(const TString& path = ".", Bool_t showMuon = kTRUE, Bool_t showTrd = kFALSE)
 {
   gROOT->ProcessLine(TString::Format(".x visscan_init.C(\"local://$ALICE_ROOT/OCDB\", \"%s\", %d, %d)",
diff --git a/EVE/macros/visscan_mc.C b/EVE/macros/visscan_mc.C
index 7d40f30176d..714b34fb4d6 100644
--- a/EVE/macros/visscan_mc.C
+++ b/EVE/macros/visscan_mc.C
@@ -1,3 +1,6 @@
+#include <TString.h>
+#include <TROOT.h>
+
 void visscan_mc(const TString& path = ".", Bool_t showMuon = kTRUE, Bool_t showTrd = kFALSE)
 {
   gROOT->ProcessLine(TString::Format(".x visscan_init.C(\"mcideal://\", \"%s\", %d, %d)",
diff --git a/EVE/macros/visscan_mcfull.C b/EVE/macros/visscan_mcfull.C
index 603eb831a74..9a21b9838b1 100644
--- a/EVE/macros/visscan_mcfull.C
+++ b/EVE/macros/visscan_mcfull.C
@@ -1,3 +1,6 @@
+#include <TString.h>
+#include <TROOT.h>
+
 void visscan_mcfull(const TString& path = ".", Bool_t showMuon = kTRUE, Bool_t showTrd = kFALSE)
 {
   gROOT->ProcessLine(TString::Format(".x visscan_init.C(\"mcfull://\", \"%s\", %d, %d)",
diff --git a/EVE/macros/visscan_mcideal.C b/EVE/macros/visscan_mcideal.C
index c108d241596..8b38795723d 100644
--- a/EVE/macros/visscan_mcideal.C
+++ b/EVE/macros/visscan_mcideal.C
@@ -1,3 +1,6 @@
+#include <TString.h>
+#include <TROOT.h>
+
 void visscan_mcideal(const TString& path = ".", Bool_t showMuon = kTRUE, Bool_t showTrd = kFALSE)
 {
   gROOT->ProcessLine(TString::Format(".x visscan_init.C(\"mcideal://\", \"%s\", %d, %d)",
diff --git a/EVE/macros/visscan_mcresidual.C b/EVE/macros/visscan_mcresidual.C
index 213fee86e7b..bb577506b68 100644
--- a/EVE/macros/visscan_mcresidual.C
+++ b/EVE/macros/visscan_mcresidual.C
@@ -1,3 +1,6 @@
+#include <TString.h>
+#include <TROOT.h>
+
 void visscan_mcresidual(const TString& path = ".", Bool_t showMuon = kTRUE, Bool_t showTrd = kFALSE)
 {
   gROOT->ProcessLine(TString::Format(".x visscan_init.C(\"mcresidual://\", \"%s\", %d, %d)",
diff --git a/EVE/macros/visscan_raw.C b/EVE/macros/visscan_raw.C
index 1a1e077f9ca..0b8027e04c2 100644
--- a/EVE/macros/visscan_raw.C
+++ b/EVE/macros/visscan_raw.C
@@ -1,3 +1,6 @@
+#include <TString.h>
+#include <TROOT.h>
+
 void visscan_raw(const TString& path = ".", Bool_t showMuon = kTRUE, Bool_t showTrd = kFALSE)
 {
   gROOT->ProcessLine(TString::Format(".x visscan_init.C(\"raw://\", \"%s\", %d, %d)",
diff --git a/EVE/macros/visscan_raw_raw.C b/EVE/macros/visscan_raw_raw.C
index 1e77289cf51..085b558e0ac 100644
--- a/EVE/macros/visscan_raw_raw.C
+++ b/EVE/macros/visscan_raw_raw.C
@@ -1,5 +1,13 @@
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <EveBase/AliEveEventManager.h>
+
+#include <TString.h>
+#include <TROOT.h>
+#endif
+
 void visscan_raw_raw(const TString& path = ".", Bool_t showMuon = kTRUE, Bool_t showTrd = kFALSE)
 {
+  
   AliEveEventManager::SearchRawForCentralReconstruction();
   gROOT->ProcessLine(TString::Format(".x visscan_init.C(\"raw://\", \"%s\", %d, %d)",
 				     path.Data(), showMuon, showTrd));
diff --git a/EVE/test-macros/compileEveMacros.C b/EVE/test-macros/compileEveMacros.C
index 09a173c6b92..428a3dac7fc 100644
--- a/EVE/test-macros/compileEveMacros.C
+++ b/EVE/test-macros/compileEveMacros.C
@@ -22,8 +22,9 @@
 /* Compiles all AliEve macros
  * 
  * Usage: 
- *  1. Launch alieve from terminal
- *  2. ROOT command prompt from terminal execute this script: .x compileEveMacros.C
+ *  1. cd $ALICE_ROOT/EVE/test-macros/
+ *  2. Launch alieve from terminal: alieve
+ *  3. from terminal execute this script: .x compileEveMacros.C
  *  3. Wait for compilation to finish
  * 
  * NOTE:
@@ -90,4 +91,4 @@ void compileEveMacros( const char * macDir="", Option_t *opt="")
   delete listOfFailedMacros;
   delete listOfMacros;
   delete curDir;
-}
\ No newline at end of file
+}