Index: trunk/MagicSoft/Cosy/catalog/SlaPlanets.cc
===================================================================
--- trunk/MagicSoft/Cosy/catalog/SlaPlanets.cc	(revision 7787)
+++ trunk/MagicSoft/Cosy/catalog/SlaPlanets.cc	(revision 8376)
@@ -1,9 +1,11 @@
 #include "SlaPlanets.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include "slalib.h"
 
 ClassImp(SlaPlanets);
+
+using namespace std;
 
 SlaPlanets::SlaPlanets(MObservatory::LocationName_t key) : Slalib(key), fDt(slaDt(2000.0)/60./60./24.)
Index: trunk/MagicSoft/Cosy/catalog/Slalib.cc
===================================================================
--- trunk/MagicSoft/Cosy/catalog/Slalib.cc	(revision 7787)
+++ trunk/MagicSoft/Cosy/catalog/Slalib.cc	(revision 8376)
@@ -2,5 +2,5 @@
 
 #include <time.h>
-#include <iostream.h>  // cout
+#include <iostream>  // cout
 
 #include "coord.h"
@@ -9,4 +9,6 @@
 
 ClassImp(Slalib);
+
+using namespace std;
 
 Slalib::Slalib(MObservatory::LocationName_t key) : MObservatory(key)
Index: trunk/MagicSoft/Cosy/catalog/StarCatalog.cc
===================================================================
--- trunk/MagicSoft/Cosy/catalog/StarCatalog.cc	(revision 7787)
+++ trunk/MagicSoft/Cosy/catalog/StarCatalog.cc	(revision 8376)
@@ -1,6 +1,6 @@
 #include "StarCatalog.h"
 
-#include <iomanip.h>   // cout
-#include <iostream.h>  // cout
+#include <iomanip>   // cout
+#include <iostream>  // cout
 
 #include <TSystem.h>
@@ -15,4 +15,6 @@
 
 ClassImp(StarCatalog);
+
+using namespace std;
 
 StarCatalog::StarCatalog(MObservatory::LocationName_t key) : SlaStars(key), fW(768), fH(576), fAstro(0), /*fSao(NULL), fSrt(NULL), fEntries(0),*/ fSinAngle(0), fCosAngle(1), fBox(768)
@@ -136,5 +138,5 @@
     {
         const int mag = (10 - (star->GetMag()>1 ? (int)star->GetMag() : 1))/2;
-        Double_t color = 0xf0; //0x0f;       
+        Int_t color = 0xf0; //0x0f;
 	// DrawStars flips the picture in X defaultwise now
         DrawCircle(color, img, 768-(int)star->GetX(), (int)star->GetY(), mag);
@@ -155,5 +157,5 @@
 {
     // For an apropriate unit conversion to pixels [pix/rad]
-    const Double_t scale = TMath::RadToDeg()*sqrt(768*768 + 576*576)/(fAstro->GetRadiusFOV()*2);
+    const Double_t scale = TMath::RadToDeg()*TMath::Sqrt(768*768 + 576*576)/(fAstro->GetRadiusFOV()*2);
 
     // Offsets to shift [-n/2;n/2] to [0;n] and to