diff --git a/src/dlopen.c b/src/dlopen.c
index 64c176085fea1e69301be092c0ca1c9029851cc8..1781fd2e67f15271dd0444793df91dccc9738c5d 100644
--- a/src/dlopen.c
+++ b/src/dlopen.c
@@ -79,7 +79,7 @@ size_t STRNLEN(char *s, size_t maxlen)
 
 #else /* PIKE_CONCAT */
 
-RCSID("$Id: dlopen.c,v 1.12 2001/02/01 10:27:29 hubbe Exp $");
+RCSID("$Id: dlopen.c,v 1.13 2001/04/23 19:06:52 marcus Exp $");
 
 #endif
 
@@ -258,7 +258,7 @@ static void htable_free(struct Htable *h, void(*hfree)(void *))
 
 /****************************************************************/
 
-static int filesize(char *filename)
+static int filesize(const char *filename)
 {
   struct stat st;
 #ifdef DLDEBUG
@@ -268,7 +268,7 @@ static int filesize(char *filename)
   return st.st_size;
 }
 
-static char *read_file(char *name, size_t *len)
+static char *read_file(const char *name, size_t *len)
 {
   ptrdiff_t tmp;
   char *buffer;
@@ -600,7 +600,7 @@ static parse_link_info(struct DLHandle *ret,
     char *end;
 
 #ifdef DLDEBUG    
-    fprintf(stderr,"Parse link info ptr=%d\n",ptr,l);
+    fprintf(stderr,"Parse link info ptr=%d\n",ptr);
     FLUSH();
 #endif
 
@@ -1255,7 +1255,7 @@ static int dl_load_file(struct DLHandle *ret,
 
 static void init_dlopen(void);
 
-struct DLHandle *dlopen(char *name, int flags)
+struct DLHandle *dlopen(const char *name, int flags)
 {
   struct DLHandle *ret;
   struct DLTempData tmpdata;
diff --git a/src/fdlib.c b/src/fdlib.c
index 1178860b798b74b1a3961c3ea8032b568f9e51d0..5bba2d2b48c13f33d8ee3f8fc9a7a046606d24a8 100644
--- a/src/fdlib.c
+++ b/src/fdlib.c
@@ -3,7 +3,7 @@
 #include "pike_error.h"
 #include <math.h>
 
-RCSID("$Id: fdlib.c,v 1.47 2000/12/01 08:09:47 hubbe Exp $");
+RCSID("$Id: fdlib.c,v 1.48 2001/04/23 19:06:53 marcus Exp $");
 
 #ifdef HAVE_WINSOCK_H
 
@@ -92,7 +92,7 @@ void fd_exit()
   mt_destroy(&fd_mutex);
 }
 
-int debug_fd_stat(char *file, struct stat *buf)
+int debug_fd_stat(const char *file, struct stat *buf)
 {
   ptrdiff_t l = strlen(file);
   char fname[MAX_PATH];
@@ -114,7 +114,7 @@ int debug_fd_stat(char *file, struct stat *buf)
   return stat(file, buf);
 }
 
-PMOD_EXPORT FD debug_fd_open(char *file, int open_mode, int create_mode)
+PMOD_EXPORT FD debug_fd_open(const char *file, int open_mode, int create_mode)
 {
   HANDLE x;
   FD fd;
diff --git a/src/fdlib.h b/src/fdlib.h
index f337e068a2abfabcb1459aa8a3a12f2b36ca7185..426b5774ce83b62a99e44b428ca786924313cdf4 100644
--- a/src/fdlib.h
+++ b/src/fdlib.h
@@ -1,5 +1,5 @@
 /*
- * $Id: fdlib.h,v 1.38 2000/12/23 07:33:49 hubbe Exp $
+ * $Id: fdlib.h,v 1.39 2001/04/23 19:06:54 marcus Exp $
  */
 #ifndef FDLIB_H
 #define FDLIB_H
@@ -116,8 +116,8 @@ PMOD_EXPORT char *debug_fd_info(int fd);
 PMOD_EXPORT int debug_fd_query_properties(int fd, int guess);
 void fd_init();
 void fd_exit();
-PMOD_EXPORT int debug_fd_stat(char *file, struct stat *buf);
-PMOD_EXPORT FD debug_fd_open(char *file, int open_mode, int create_mode);
+PMOD_EXPORT int debug_fd_stat(const char *file, struct stat *buf);
+PMOD_EXPORT FD debug_fd_open(const char *file, int open_mode, int create_mode);
 PMOD_EXPORT FD debug_fd_socket(int domain, int type, int proto);
 PMOD_EXPORT int debug_fd_pipe(int fds[2] DMALLOC_LINE_ARGS);
 PMOD_EXPORT FD debug_fd_accept(FD fd, struct sockaddr *addr, ACCEPT_SIZE_T *addrlen);
diff --git a/src/pike_dlfcn.h b/src/pike_dlfcn.h
index 3afdf7263320b67fe8d2b890e6783e8a041e0127..aa3ed802b40f6aed75083bd1fb154a5a012692bd 100644
--- a/src/pike_dlfcn.h
+++ b/src/pike_dlfcn.h
@@ -13,7 +13,7 @@
 
 void *dlsym(DLHANDLE *handle, char *name);
 const char *dlerror(void);
-DLHANDLE *dlopen(char *name, int flags);
+DLHANDLE *dlopen(const char *name, int flags);
 int dlclose(DLHANDLE *h);
 
 #endif