Index: trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREvent.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREvent.hxx	(revision 3045)
+++ trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREvent.hxx	(revision 3046)
@@ -13,10 +13,5 @@
 #define COREvent_Class
 
-#ifdef __ROOT__
 #include "TROOT.h"
-#include "TObject.h"
-#else // not __ROOT__
-#include "Rtypes.h"
-#endif
 
 #include "COREventHeader.hxx"
Index: trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREventEnd.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREventEnd.hxx	(revision 3045)
+++ trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREventEnd.hxx	(revision 3046)
@@ -24,10 +24,6 @@
 
 // @code
-#ifdef __ROOT__
 #include "TROOT.h"
 #include "TObject.h"
-#else // not __ROOT__
-#include "Rtypes.h"
-#endif
 
 #include <iostream.h>
Index: trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREventHeader.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREventHeader.hxx	(revision 3045)
+++ trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREventHeader.hxx	(revision 3046)
@@ -24,10 +24,6 @@
 
 // @code
-#ifdef __ROOT__
 #include "TROOT.h"
 #include "TObject.h"
-#else // not __ROOT__
-#include "Rtypes.h"
-#endif
 
 #include <iostream.h>
Index: trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORParticle.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORParticle.hxx	(revision 3045)
+++ trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORParticle.hxx	(revision 3046)
@@ -24,10 +24,6 @@
 
 // @code
-#ifdef __ROOT__
 #include "TROOT.h"
 #include "TObject.h"
-#else // not __ROOT__
-#include "Rtypes.h"
-#endif
 
 #include <iostream.h>
Index: trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORRunEnd.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORRunEnd.hxx	(revision 3045)
+++ trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORRunEnd.hxx	(revision 3046)
@@ -24,10 +24,6 @@
 
 // @code
-#ifdef __ROOT__
 #include "TROOT.h"
 #include "TObject.h"
-#else // not __ROOT__
-#include "Rtypes.h"
-#endif
 
 #include <iostream.h>
Index: trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORRunHeader.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORRunHeader.hxx	(revision 3045)
+++ trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORRunHeader.hxx	(revision 3046)
@@ -24,10 +24,6 @@
 
 // @code
-#ifdef __ROOT__
 #include "TROOT.h"
 #include "TObject.h"
-#else // not __ROOT__
-#include "Rtypes.h"
-#endif
 
 #include <iostream.h>
Index: trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORStatfile.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORStatfile.hxx	(revision 3045)
+++ trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORStatfile.hxx	(revision 3046)
@@ -24,10 +24,6 @@
 
 // @code
-#ifdef __ROOT__
 #include "TROOT.h"
 #include "TObject.h"
-#else // not __ROOT__
-#include "Rtypes.h"
-#endif
 
 #include <iostream.h>
Index: trunk/MagicSoft/Simulation/Detector/include-MC/MCCphoton.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-MC/MCCphoton.hxx	(revision 3045)
+++ trunk/MagicSoft/Simulation/Detector/include-MC/MCCphoton.hxx	(revision 3046)
@@ -24,10 +24,6 @@
 
 // @code
-#ifdef __ROOT__
 #include "TROOT.h"
 #include "TObject.h"
-#else // not __ROOT__
-#include "Rtypes.h"
-#endif
 
 #include <iostream.h>
Index: trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader.hxx	(revision 3045)
+++ trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader.hxx	(revision 3046)
@@ -24,10 +24,6 @@
 
 // @code
-#ifdef __ROOT__
-#include "TROOT.h"
-#include "TObject.h"
-#else // not __ROOT__
-#include "Rtypes.h"
-#endif
+#include <MAGIC.h>
+#include <TObject.h>
 
 #include <iostream.h>
Index: trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader_2.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader_2.hxx	(revision 3045)
+++ trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader_2.hxx	(revision 3046)
@@ -24,10 +24,6 @@
 
 // @code
-#ifdef __ROOT__
 #include "TROOT.h"
 #include "TObject.h"
-#else // not __ROOT__
-#include "Rtypes.h"
-#endif
 
 #include <iostream.h>
Index: trunk/MagicSoft/Simulation/Detector/include-MC/MCRunHeader.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-MC/MCRunHeader.hxx	(revision 3045)
+++ trunk/MagicSoft/Simulation/Detector/include-MC/MCRunHeader.hxx	(revision 3046)
@@ -24,10 +24,6 @@
 
 // @code
-#ifdef __ROOT__
 #include "TROOT.h"
 #include "TObject.h"
-#else // not __ROOT__
-#include "Rtypes.h"
-#endif
 
 #include <iostream.h>