Index: trunk/MagicSoft/Simulation/Detector/include-MC/MCCphoton.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-MC/MCCphoton.hxx	(revision 5078)
+++ trunk/MagicSoft/Simulation/Detector/include-MC/MCCphoton.hxx	(revision 5103)
@@ -27,12 +27,14 @@
 #include "TObject.h"
 
-#include <iostream.h>
-#include <iomanip.h>
-#include <fstream.h>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
 #include <stdlib.h>
-#include <string.h>
+#include <string>
 #include <math.h>
 
 #include "jcmacros.h"
+
+using namespace std;
 
 // const char variables to use in MCCphoton::isA() function
Index: trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader.hxx	(revision 5078)
+++ trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader.hxx	(revision 5103)
@@ -27,7 +27,7 @@
 #include <TObject.h>
 
-#include <iostream.h>
-#include <iomanip.h>
-#include <fstream.h>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
 #include <stdlib.h>
 #include <math.h>
Index: trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader_2.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader_2.hxx	(revision 5078)
+++ trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader_2.hxx	(revision 5103)
@@ -27,7 +27,7 @@
 #include "TObject.h"
 
-#include <iostream.h>
-#include <iomanip.h>
-#include <fstream.h>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
 #include <stdlib.h>
 #include <math.h>
Index: trunk/MagicSoft/Simulation/Detector/include-MC/MCRunHeader.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-MC/MCRunHeader.hxx	(revision 5078)
+++ trunk/MagicSoft/Simulation/Detector/include-MC/MCRunHeader.hxx	(revision 5103)
@@ -27,11 +27,13 @@
 #include "TObject.h"
 
-#include <iostream.h>
-#include <iomanip.h>
-#include <fstream.h>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
 #include <stdlib.h>
 #include <math.h>
 
 #define SIZE_OF_MCRUNHEADER    272   /* floats */
+
+using namespace std;
 
 // @endcode