diff --git a/src/main.c b/src/main.c
index ddbf2b35022034b9c524d648407457c41945c757..4280f5d22570e0bd2fa0a7a9e67eaaad0dee42a3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: main.c,v 1.105 2000/10/10 00:02:51 hubbe Exp $");
+RCSID("$Id: main.c,v 1.106 2000/11/06 17:03:32 grubba Exp $");
 #include "fdlib.h"
 #include "backend.h"
 #include "module.h"
@@ -571,14 +571,14 @@ int dbm_main(int argc, char **argv)
   }
   UNSETJMP(back);
 
-  do_exit(num);
+  pike_do_exit(num);
   return num; /* avoid warning */
 }
 
 #undef ATTRIBUTE
 #define ATTRIBUTE(X)
 
-DECLSPEC(noreturn) void do_exit(int num) ATTRIBUTE((noreturn))
+DECLSPEC(noreturn) void pike_do_exit(int num) ATTRIBUTE((noreturn))
 {
   call_callback(&exit_callbacks, (void *)0);
   free_callback_list(&exit_callbacks);
diff --git a/src/main.h b/src/main.h
index 3979605f863b0ce81e89760c60acc8f1869b3d23..868d058c0fe387a1a5cf06272952adae3a7d545d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: main.h,v 1.13 2000/08/21 21:37:12 grubba Exp $
+ * $Id: main.h,v 1.14 2000/11/06 17:03:32 grubba Exp $
  */
 #ifndef MAIN_H
 #define MAIN_H
@@ -36,7 +36,7 @@ struct callback *add_exit_callback(callback_func call,
 				   void *arg,
 				   callback_func free_func);
 int dbm_main(int argc, char **argv);
-DECLSPEC(noreturn) void do_exit(int num) ATTRIBUTE((noreturn));
+DECLSPEC(noreturn) void pike_do_exit(int num) ATTRIBUTE((noreturn));
 void low_init_main(void);
 void exit_main(void);
 void init_main(void);
diff --git a/src/threads.c b/src/threads.c
index 21210f690a07a80c521f115821d2976288551dac..0f4d330e1a88fc9256a9db4c3fe04d5a33a19a2c 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: threads.c,v 1.142 2000/11/06 16:46:42 mast Exp $");
+RCSID("$Id: threads.c,v 1.143 2000/11/06 17:03:32 grubba Exp $");
 
 PMOD_EXPORT int num_threads = 1;
 PMOD_EXPORT int threads_disabled = 0;
@@ -633,7 +633,7 @@ TH_RETURN_TYPE new_thread_func(void * data)
     if(throw_severity == THROW_EXIT)
     {
       free((char *) data);
-      do_exit(throw_value.u.integer);
+      pike_do_exit(throw_value.u.integer);
     }
   } else {
     INT32 args=arg.args->size;