Index: auxdir/tclmico.cc
--- auxdir/tclmico.cc.orig	2003-10-13 11:49:22.000000000 +0200
+++ auxdir/tclmico.cc	2003-10-13 20:02:21.000000000 +0200
@@ -48,9 +48,9 @@
     TclDispatcher *disp = event->disp;
     CORBA::Long handle = event->handle;
 
-    set<FileEvent *, less<FileEvent *> > seen;
+    std::set<FileEvent *, std::less<FileEvent *> > seen;
     while (42) {
-	list<FileEvent *>::iterator i;
+	std::list<FileEvent *>::iterator i;
 	for (i = disp->fevents.begin(); i != disp->fevents.end(); ++i) {
 	    if ((*i)->handle != handle)
 		continue;
@@ -82,7 +82,7 @@
     TimerEvent *event = (TimerEvent *)_event;
     TclDispatcher *disp = event->disp;
 
-    list<TimerEvent *>::iterator i;
+    std::list<TimerEvent *>::iterator i;
     for (i = disp->tevents.begin(); i != disp->tevents.end(); ++i) {
         if ((*i) == event) {
 	  disp->tevents.erase(i);
@@ -99,13 +99,13 @@
 
 TclDispatcher::~TclDispatcher ()
 {
-    list<FileEvent *>::iterator i;
+    std::list<FileEvent *>::iterator i;
     for (i = fevents.begin(); i != fevents.end(); ++i) {
 	(*i)->cb->callback (this, Remove);
 	delete *i;
     }
 
-    list<TimerEvent *>::iterator j;
+    std::list<TimerEvent *>::iterator j;
     for (j = tevents.begin(); j != tevents.end(); ++j) {
 	(*j)->cb->callback (this, Remove);
 	delete *j;
@@ -125,7 +125,7 @@
     ev = 0;
     int mask = 0;
 
-    list<FileEvent *>::iterator i;
+    std::list<FileEvent *>::iterator i;
     for (i = fevents.begin(); i != fevents.end(); ++i) {
 	if ((*i)->handle != handle)
 	    continue;
@@ -185,7 +185,7 @@
 TclDispatcher::remove (CORBA::DispatcherCallback *cb, Event e)
 {
     if (e == All || e == Timer) {
-	list<TimerEvent *>::iterator i, next;
+	std::list<TimerEvent *>::iterator i, next;
 	for (i = tevents.begin(); i != tevents.end(); i = next) {
 	    next = i;
 	    ++next;
@@ -197,7 +197,7 @@
 	}
     }
     if (e == All || e == Read || e == Write || e == Except) {
-	list<FileEvent *>::iterator i, next;
+	std::list<FileEvent *>::iterator i, next;
 	for (i = fevents.begin(); i != fevents.end(); i = next) {
 	    next = i;
 	    ++next;
Index: include/mico/os-math.h
--- include/mico/os-math.h.orig	2003-10-13 11:49:32.000000000 +0200
+++ include/mico/os-math.h	2003-10-13 20:02:21.000000000 +0200
@@ -296,11 +296,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <sys/types.h>
-
-#if !defined(__GNUG__) || !defined(__sgi)
-// conflict for initstate ()
-#include <math.h>
-#endif
+#include <cmath>
 
 #ifdef HAVE_FLOAT_H
 #include <float.h>
@@ -360,6 +356,7 @@
 
     static MICO_Boolean is_infinity (MICO_Double d)
     {
+        using namespace std;
 #if defined(HAVE_ISINF)
 	return isinf (d);
 #elif defined(HAVE_FINITE) && defined(HAVE_ISNAN)
@@ -371,6 +368,7 @@
 
     static MICO_Boolean is_nan (MICO_Double d)
     {
+        using namespace std;
 #if defined(HAVE_ISNAN)
 	return isnan (d);
 #else
@@ -419,6 +417,7 @@
 
     static MICO_Boolean is_infinityl (MICO_LongDouble d)
     {
+        using namespace std;
 #if defined(HAVE_ISINFL)
 	return isinfl (d);
 #elif defined(HAVE_ISINF)
@@ -430,6 +429,7 @@
 
     static MICO_Boolean is_nanl (MICO_LongDouble d)
     {
+        using namespace std;
 #if defined(HAVE_ISNANL)
 	return isnanl (d);
 #elif defined(HAVE_ISNAN)
Index: Makefile
--- Makefile.orig	2003-10-13 11:49:22.000000000 +0200
+++ Makefile	2003-10-13 20:02:21.000000000 +0200
@@ -73,7 +73,7 @@
 		$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \
 		$(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \
 	fi
-	-ldconfig
+#	-ldconfig
 
 install-cd:
 	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done