Index: trunk/MagicSoft/Cosy/base/MStarList.cc
===================================================================
--- trunk/MagicSoft/Cosy/base/MStarList.cc	(revision 7796)
+++ trunk/MagicSoft/Cosy/base/MStarList.cc	(revision 8376)
@@ -1,5 +1,7 @@
 #include "MStarList.h"
 
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
 
 void MStarList::RemoveTwins(Double_t radius)
Index: trunk/MagicSoft/Cosy/base/MStarList.h
===================================================================
--- trunk/MagicSoft/Cosy/base/MStarList.h	(revision 7796)
+++ trunk/MagicSoft/Cosy/base/MStarList.h	(revision 8376)
@@ -31,6 +31,7 @@
     }
 
-    void Delete(Int_t i)    { delete fStars.RemoveAt(i); }
-    void Delete(MStar *obj) { delete fStars.Remove(obj); }
+    void Delete(Option_t *o="") { }
+    void Delete(Int_t i)        { delete fStars.RemoveAt(i); }
+    void Delete(MStar *obj)     { delete fStars.Remove(obj); }
 
     Int_t GetMax() const { return fStars.GetLast()+1; }
Index: trunk/MagicSoft/Cosy/base/MStopwatch.h
===================================================================
--- trunk/MagicSoft/Cosy/base/MStopwatch.h	(revision 7796)
+++ trunk/MagicSoft/Cosy/base/MStopwatch.h	(revision 8376)
@@ -8,4 +8,5 @@
 public:
     void Print(Float_t i);
+    void Print(Option_t *o="") const { }
 };
 
Index: trunk/MagicSoft/Cosy/base/MThread.cc
===================================================================
--- trunk/MagicSoft/Cosy/base/MThread.cc	(revision 7796)
+++ trunk/MagicSoft/Cosy/base/MThread.cc	(revision 8376)
@@ -1,5 +1,5 @@
 #include <MThread.h>
 
-#include <iostream.h>
+#include <iostream>
 
 #include <pthread.h>
@@ -8,4 +8,6 @@
 #undef DEBUG
 //#define DEBUG
+
+using namespace std;
 
 // ----------------------------------------------------------------------
Index: trunk/MagicSoft/Cosy/base/MTimeout.cc
===================================================================
--- trunk/MagicSoft/Cosy/base/MTimeout.cc	(revision 7796)
+++ trunk/MagicSoft/Cosy/base/MTimeout.cc	(revision 8376)
@@ -3,5 +3,5 @@
 #include <TSystem.h>
 
-MTimeout::MTimeout(unsigned long ms=500) : fTimeout((ULong_t)gSystem->Now()+ms)
+MTimeout::MTimeout(unsigned long ms) : fTimeout((ULong_t)gSystem->Now()+ms)
 {
     // Use SetTime to change the timing
@@ -14,5 +14,5 @@
 }
 
-void MTimeout::Start(unsigned long ms=500)
+void MTimeout::Start(unsigned long ms)
 {
     fTimeout = (ULong_t)gSystem->Now()+ms;
Index: trunk/MagicSoft/Cosy/base/coord.h
===================================================================
--- trunk/MagicSoft/Cosy/base/coord.h	(revision 7796)
+++ trunk/MagicSoft/Cosy/base/coord.h	(revision 8376)
@@ -3,5 +3,5 @@
 
 #include <math.h>          // floor
-#include <fstream.h>
+#include <iostream>
 
 #include "MAGIC.h"
@@ -37,6 +37,6 @@
 class XY
 {
-    friend ifstream& operator>>(ifstream &in, XY &xy);
-    friend ofstream& operator<<(ofstream &in, XY &xy);
+    friend istream& operator>>(istream &in, XY &xy);
+    friend ostream& operator<<(ostream &in, XY &xy);
 
 protected:
@@ -73,6 +73,6 @@
 };
 
-inline ifstream& operator>>(ifstream &in,  XY &xy) { in  >> xy.fX; in  >> xy.fY; return in; }
-inline ofstream& operator<<(ofstream &out, const XY &xy) { out << xy.X() << " " << xy.Y(); return out; }
+inline std::istream& operator>>(std::istream &in,  XY &xy) { in  >> xy.fX; in  >> xy.fY; return in; }
+inline std::ostream& operator<<(std::ostream &out, const XY &xy) { out << xy.X() << " " << xy.Y(); return out; }
 
 class AltAz : public XY
Index: trunk/MagicSoft/Cosy/base/log.h
===================================================================
--- trunk/MagicSoft/Cosy/base/log.h	(revision 7796)
+++ trunk/MagicSoft/Cosy/base/log.h	(revision 8376)
@@ -2,5 +2,5 @@
 #define COSY_Log
 
-#include <ostream.h>
+#include <ostream>
 
 #ifndef MARS_MLog
Index: trunk/MagicSoft/Cosy/base/msgqueue.cc
===================================================================
--- trunk/MagicSoft/Cosy/base/msgqueue.cc	(revision 7796)
+++ trunk/MagicSoft/Cosy/base/msgqueue.cc	(revision 8376)
@@ -1,5 +1,5 @@
 #include "msgqueue.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include <unistd.h>        // usleep
@@ -7,4 +7,6 @@
 
 #undef DEBUG
+
+using namespace std;
 
 // --------------------------------------------------------------------------