Index: /trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREventHeader.hxx
===================================================================
--- /trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREventHeader.hxx	(revision 5111)
+++ /trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREventHeader.hxx	(revision 5112)
@@ -32,5 +32,4 @@
 #include <stdlib.h>
 #include <math.h>
-#include <string>
 // @endcode
 
@@ -124,5 +123,5 @@
   // reads EventHeader from binary input stream
   Int_t read ( ifstream &is ) {
-    is.read ( (char *)this, sizeof( float ) * 273 ); 
+    is.read ( (char *)&(this->EVTH[0]), sizeof( float ) * 273 ); 
     return is.gcount();
   }
@@ -130,5 +129,5 @@
   // writes EventHeader to binary output stream
   Int_t write ( ofstream &os ) {
-    os.write ( (char *)this, sizeof( float ) * 273 ); 
+    os.write ( (char *)&(this->EVTH[0]), sizeof( float ) * 273 ); 
     return 0;
   }
Index: /trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORParticle.hxx
===================================================================
--- /trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORParticle.hxx	(revision 5111)
+++ /trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORParticle.hxx	(revision 5112)
@@ -27,10 +27,12 @@
 #include "TObject.h"
 
-#include <iostream.h>
-#include <iomanip.h>
-#include <fstream.h>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
 #include <stdlib.h>
 #include <math.h>
 // @endcode
+
+using namespace std;
 
 // @subsection Class {\em CORParticle}: Definition
@@ -69,6 +71,5 @@
   // reads photon from binary input stream
   Int_t read ( ifstream &is ) {
-    int n;
-    is.read ( (char *)this, 7 * sizeof( Float_t ) );   // 
+    is.read ( (char *)(&this->w), 7 * sizeof( Float_t ) );   // 
     return is.gcount();
   }
@@ -76,5 +77,5 @@
   // writes photon to binary output stream
   Int_t write ( ofstream &os ) {
-    os.write ( (char *)this, 7 * sizeof( Float_t ) );
+    os.write ( (char *)(&this->w), 7 * sizeof( Float_t ) );
     return 0;
   }
Index: /trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORStatfile.hxx
===================================================================
--- /trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORStatfile.hxx	(revision 5111)
+++ /trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORStatfile.hxx	(revision 5112)
@@ -27,6 +27,6 @@
 #include "TObject.h"
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <math.h>
@@ -36,4 +36,6 @@
 #define NPLONG 1041
 // @endcode
+
+using namespace std;
 
 // @subsection Class {\em CORStatfile}: Definition