diff --git a/src/error.c b/src/error.c
index 05adf95999adfc01011f1aa972b76ee25d21aab8..e4c628a17c1ccfd0cc3dc29acb867f5c8eed7e9d 100644
--- a/src/error.c
+++ b/src/error.c
@@ -14,8 +14,9 @@
 #include "main.h"
 #include "builtin_functions.h"
 #include "backend.h"
+#include "operators.h"
 
-RCSID("$Id: error.c,v 1.16 1998/04/10 15:20:48 grubba Exp $");
+RCSID("$Id: error.c,v 1.17 1998/04/13 14:19:40 grubba Exp $");
 
 #undef ATTRIBUTE
 #define ATTRIBUTE(X)
@@ -89,16 +90,16 @@ void push_error(char *description)
 struct svalue throw_value = { T_INT };
 int throw_severity;
 
-static char *in_error;
+static const char *in_error;
 /* FIXME: NOTE: This function uses a static buffer.
  * Check sizes of arguments passed!
  */
-void va_error(char *fmt, va_list args) ATTRIBUTE((noreturn))
+void va_error(const char *fmt, va_list args) ATTRIBUTE((noreturn))
 {
   char buf[2000];
   if(in_error)
   {
-    char *tmp=in_error;
+    const char *tmp=in_error;
     in_error=0;
     fatal("Recursive error() calls, original error: %s",tmp);
   }
@@ -129,14 +130,14 @@ void va_error(char *fmt, va_list args) ATTRIBUTE((noreturn))
   pike_throw();  /* Hope someone is catching, or we will be out of balls. */
 }
 
-void new_error(char *name, char *text, struct svalue *oldsp, INT32 args,
-	       char *file, int line) ATTRIBUTE((noreturn))
+void new_error(const char *name, const char *text, struct svalue *oldsp,
+	       INT32 args, const char *file, int line) ATTRIBUTE((noreturn))
 {
   int i;
 
   if(in_error)
   {
-    char *tmp=in_error;
+    const char *tmp=in_error;
     in_error=0;
     fatal("Recursive error() calls, original error: %s",tmp);
   }
@@ -203,7 +204,7 @@ void fatal_on_error(void *msg)
   abort();
 }
 
-void error(char *fmt,...) ATTRIBUTE((noreturn,format (printf, 1, 2)))
+void error(const char *fmt,...) ATTRIBUTE((noreturn,format (printf, 1, 2)))
 {
   va_list args;
   va_start(args,fmt);
@@ -212,7 +213,7 @@ void error(char *fmt,...) ATTRIBUTE((noreturn,format (printf, 1, 2)))
 }
 
 
-void debug_fatal(char *fmt, ...) ATTRIBUTE((noreturn,format (printf, 1, 2)))
+void debug_fatal(const char *fmt, ...) ATTRIBUTE((noreturn,format (printf, 1, 2)))
 {
   va_list args;
   static int in_fatal = 0;
diff --git a/src/error.h b/src/error.h
index 115189e2b82b659504febfecb5d6c936de2e3f3e..9aa2225d07f09a460248fc847969504674a015d1 100644
--- a/src/error.h
+++ b/src/error.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: error.h,v 1.16 1998/04/11 13:19:14 grubba Exp $
+ * $Id: error.h,v 1.17 1998/04/13 14:19:41 grubba Exp $
  */
 #ifndef ERROR_H
 #define ERROR_H
@@ -91,13 +91,13 @@ extern int throw_severity;
 /* Prototypes begin here */
 JMP_BUF *init_recovery(JMP_BUF *r);
 void pike_throw(void) ATTRIBUTE((noreturn));
-void va_error(char *fmt, va_list args) ATTRIBUTE((noreturn));
+void va_error(const char *fmt, va_list args) ATTRIBUTE((noreturn));
 void exit_on_error(void *msg);
 void fatal_on_error(void *msg);
-void error(char *fmt,...) ATTRIBUTE((noreturn,format (printf, 1, 2)));
-void new_error(char *name, char *text, struct svalue *oldsp, INT32 args,
-	       char *file, int line) ATTRIBUTE((noreturn));
-void debug_fatal(char *fmt, ...) ATTRIBUTE((noreturn,format (printf, 1, 2)));
+void error(const char *fmt,...) ATTRIBUTE((noreturn,format (printf, 1, 2)));
+void new_error(const char *name, const char *text, struct svalue *oldsp,
+	       INT32 args, const char *file, int line) ATTRIBUTE((noreturn));
+void debug_fatal(const char *fmt, ...) ATTRIBUTE((noreturn,format (printf, 1, 2)));
 /* Prototypes end here */
 
 #define fatal \