Index: trunk/MagicSoft/Cosy/base/coord.h
===================================================================
--- trunk/MagicSoft/Cosy/base/coord.h	(revision 926)
+++ trunk/MagicSoft/Cosy/base/coord.h	(revision 1109)
@@ -4,5 +4,15 @@
 #include <math.h>          // floor
 
-#include "slalib/slamac.h" // D2PI
+/* pi/180:  degrees to radians */
+const double kDeg2Rad = 0.017453292519943295769236907684886127134428718885417;
+
+/* 180/pi:  radians to degrees */
+const double kRad2Deg = 57.295779513082320876798154814105170332405472466564;
+
+/* pi/2:  90 degrees in radians */
+const double kPiDiv2 = 1.5707963267948966192313216916397514420985846996876;
+
+/* 2pi */
+const double k2Pi = 6.2831853071795864769252867665590057683943387987502;
 
 class Deg
@@ -19,5 +29,5 @@
     double operator()() { return fDeg; }
 
-    operator double() const { return fDeg*D2PI/360.0; }
+    operator double() const { return fDeg*kDeg2Rad; }
 };
 
@@ -118,10 +128,10 @@
 inline double Rad2Deg(double rad)
 {
-    return 360.0/D2PI*rad;
+    return kRad2Deg*rad;
 }
 
 inline double Deg2Rad(double rad)
 {
-    return D2PI/360.0*rad;
+    return kDeg2Rad*rad;
 }
 #endif
Index: trunk/MagicSoft/Cosy/base/msgqueue.h
===================================================================
--- trunk/MagicSoft/Cosy/base/msgqueue.h	(revision 926)
+++ trunk/MagicSoft/Cosy/base/msgqueue.h	(revision 1109)
@@ -2,5 +2,5 @@
 #define MSGQUEUE_H
 
-#include <pthread.h>
+#include "threads.h"
 
 #define WM_NULL 0x0000
Index: trunk/MagicSoft/Cosy/base/timer.h
===================================================================
--- trunk/MagicSoft/Cosy/base/timer.h	(revision 926)
+++ trunk/MagicSoft/Cosy/base/timer.h	(revision 1109)
@@ -2,5 +2,5 @@
 #define TIMER_H
 
-#include <unistd.h> // gettimeofday
+struct timeval;
 
 class Timer