--- indi/src/apogee/ApogeeUsbLinux.cpp	2007-04-15 21:14:46.000000000 +0200
+++ indi.new/src/apogee/ApogeeUsbLinux.cpp	2007-10-13 12:15:14.000000000 +0200
@@ -21,7 +21,7 @@
 //
 
 #include <assert.h>
-#include <sys/io.h>
+//#include <sys/io.h>
 #include <sys/time.h>                                                           
 #include <sys/resource.h>
 #include <sys/ioctl.h>
--- indi/src/apogee/CameraIO_LinuxISA.cpp	2007-04-15 21:14:46.000000000 +0200
+++ indi.new/src/apogee/CameraIO_LinuxISA.cpp	2007-10-13 12:11:04.000000000 +0200
@@ -22,7 +22,7 @@
 //////////////////////////////////////////////////////////////////////
 
 #include <assert.h>
-#include <sys/io.h>                                                           
+//#include <sys/io.h>                                                           
 #include <sys/time.h>                                                           
 #include <sys/resource.h>                                                           
 #include <sys/ioctl.h>
--- indi/src/apogee/CameraIO_LinuxPCI.cpp	2007-04-15 21:14:46.000000000 +0200
+++ indi.new/src/apogee/CameraIO_LinuxPCI.cpp	2007-10-13 12:12:30.000000000 +0200
@@ -22,7 +22,7 @@
 //////////////////////////////////////////////////////////////////////
 
 #include <assert.h>
-#include <sys/io.h>                                                           
+//#include <sys/io.h>                                                           
 #include <sys/time.h>                                                           
 #include <sys/resource.h>                                                           
 #include <sys/ioctl.h>
--- indi/src/indicom.c	2007-04-15 23:06:20.000000000 +0200
+++ indi.new/src/indicom.c	2007-10-13 12:25:38.000000000 +0200
@@ -236,10 +236,6 @@
                 #if defined(__GLIBC__) && (__GLIBC_MINOR__ >=1   && !defined(__UCLIBC__))
 		/* GNU version */
 		sincos( DegToRad(Degrees), &Sin, &Cos );
-                #else
-		/* For older GLIBC versions */
-	        Sin = ::sin( DegToRad(Degrees) );
-		Cos = ::cos( DegToRad(Degrees) );
 		#endif
 		#else
 		/* ANSI-compliant version */