diff --git a/bind.c b/bind.c
index d5bd86f..a717fa5 100644
--- a/bind.c
+++ b/bind.c
@@ -36,10 +36,10 @@ int help(int f, int n)
 	char *fname = NULL;	/* ptr to file returned by flook() */
 
 	/* first check if we are already here */
-	bp = bfind("emacs.hlp", FALSE, BFINVS);
+	bp = bfind( hlpfname, FALSE, BFINVS);
 
 	if (bp == NULL) {
-		fname = flook(pathname[1], FALSE);
+		fname = flook( hlpfname, FALSE);
 		if (fname == NULL) {
 			mlwrite("(Help file is not online)");
 			return FALSE;
@@ -467,7 +467,7 @@ int startup(char *sfname)
 	if (*sfname != 0)
 		fname = flook(sfname, TRUE);
 	else
-		fname = flook(pathname[0], TRUE);
+		fname = flook( rcfname, TRUE);
 
 	/* if it isn't around, don't sweat it */
 	if (fname == NULL)
diff --git a/buffer.c b/buffer.c
index 77b7bc2..ace29f0 100644
--- a/buffer.c
+++ b/buffer.c
@@ -451,7 +451,7 @@ int anycb(void)
  * and the "cflag" is TRUE, create it. The "bflag" is
  * the settings for the flags in in buffer.
  */
-struct buffer *bfind(char *bname, int cflag, int bflag)
+struct buffer *bfind( const char *bname, int cflag, int bflag)
 {
 	struct buffer *bp;
 	struct buffer *sb;	/* buffer to insert after */
diff --git a/buffer.h b/buffer.h
index 3768346..04ce0b4 100644
--- a/buffer.h
+++ b/buffer.h
@@ -17,6 +17,6 @@ int anycb( void) ;
 int bclear( struct buffer *bp) ;
 int unmark( int f, int n) ;
 /* Lookup a buffer by name. */
-struct buffer *bfind( char *bname, int cflag, int bflag) ;
+struct buffer *bfind( const char *bname, int cflag, int bflag) ;
 
 #endif
diff --git a/flook.h b/flook.h
index 3779644..8466659 100644
--- a/flook.h
+++ b/flook.h
@@ -1,6 +1,9 @@
 #include "estruct.h"
 
 
+#define rcfname		pathname[ 0]
+#define hlpfname	pathname[ 1]
+
 extern const char *pathname[] ;