diff --git a/cint/src/v6_input.cxx b/cint/src/v6_input.cxx
index 7113ac51d167e32a49410d59a17ea821fafeae64..0513bee937f13433f20954b206bd7c2d9f31cd13 100644
--- a/cint/src/v6_input.cxx
+++ b/cint/src/v6_input.cxx
@@ -36,8 +36,8 @@ void G__set_history_size(int s)
 }
 
 #ifdef G__GNUREADLINE
-extern char *readline G__P((char* prompt));
-extern int add_history G__P((char* str));
+extern char *readline(const char* prompt);
+extern int add_history(const char* str);
 
 /************************************************************
 * G__input_history()
@@ -258,9 +258,9 @@ char *G__input(const char *prompt)
 * complete on compiled function names (if this is the first word in 
 * the line, or on filenames if not.) */
 
-char **completion_matches(char *text,char *(*entry_function) (char*,int));
+char **completion_matches(const char *text,char *(*entry_function) (const char*,int));
 
-char **G__funcname_completion(char *text,int /* start */,int /* end */)
+char **G__funcname_completion(const char *text,int /* start */,int /* end */)
 {
   char **matchs;
   matchs = (char **)NULL;
@@ -278,7 +278,7 @@ char **G__funcname_completion(char *text,int /* start */,int /* end */)
 
 
 #ifdef G__GNUREADLINE
-extern char **(*rl_attempted_completion_function)(char*,int,int);
+extern char **(*rl_attempted_completion_function)(const char*,int,int);
 extern char *rl_basic_word_break_characters;
 
 int G__init_readline()
diff --git a/cint/src/v6_var.cxx b/cint/src/v6_var.cxx
index d812719bc239a7932d57e2d0714e7df57199841e..f266ed31007465516a0506a4700e0adb78723861 100644
--- a/cint/src/v6_var.cxx
+++ b/cint/src/v6_var.cxx
@@ -27,7 +27,7 @@ extern "C" {
 
 int G__filescopeaccess(int filenum, int statictype);
 static G__value G__allocvariable(G__value result, G__value para[], G__var_array* varglobal, G__var_array* varlocal, int paran, int varhash, char* item, char* varname, int parameter00);
-static int G__asm_gen_stvar(long G__struct_offset, int ig15, int paran, G__var_array* var, char* item, long store_struct_offset, int var_type, G__value* presult);
+static int G__asm_gen_stvar(long G__struct_offset, int ig15, int paran, G__var_array* var, const char* item, long store_struct_offset, int var_type, G__value* presult);
 //--
 //--
 
@@ -4685,7 +4685,7 @@ static G__value G__allocvariable(G__value result, G__value para[], G__var_array*
 #undef G__ALLOC_VAR_REF
 
 //______________________________________________________________________________
-static int G__asm_gen_stvar(long G__struct_offset, int ig15, int paran, G__var_array* var, char* item, long store_struct_offset, int var_type, G__value* /*presult*/)
+static int G__asm_gen_stvar(long G__struct_offset, int ig15, int paran, G__var_array* var, const char* item, long store_struct_offset, int var_type, G__value* /*presult*/)
 {
    // -- FIXME: Describe me!
    //