diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h
index 24d00c1b4..32c4a3487 100644
--- a/Source/Swig/swig.h
+++ b/Source/Swig/swig.h
@@ -204,13 +204,13 @@ extern void         SwigScanner_idstart(SwigScanner *, char *idchar);
 extern SwigType   *NewSwigType(int typecode);
 extern void        SwigType_del_element(SwigType *t);
 extern void        SwigType_add_pointer(SwigType *t);
-extern void        SwigType_add_memberpointer(SwigType *t, String_or_char *qual);
+extern void        SwigType_add_memberpointer(SwigType *t, const String_or_char *qual);
 extern void        SwigType_del_pointer(SwigType *t);
-extern void        SwigType_add_array(SwigType *t, String_or_char *size);
+extern void        SwigType_add_array(SwigType *t, const String_or_char *size);
 extern SwigType   *SwigType_pop_arrays(SwigType *t);
 extern void        SwigType_add_reference(SwigType *t);
 extern void        SwigType_del_reference(SwigType *t);
-extern void        SwigType_add_qualifier(SwigType *t, String_or_char *qual);
+extern void        SwigType_add_qualifier(SwigType *t, const String_or_char *qual);
 extern void        SwigType_del_qualifier(SwigType *t);
 extern void        SwigType_add_function(SwigType *t, ParmList *parms);
 extern void        SwigType_add_template(SwigType *t, ParmList *parms);
diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c
index 249b5daf3..d4a07fcb8 100644
--- a/Source/Swig/typeobj.c
+++ b/Source/Swig/typeobj.c
@@ -394,7 +394,7 @@ SwigType_isreference(SwigType *t) {
  * ----------------------------------------------------------------------------- */
 
 void
-SwigType_add_qualifier(SwigType *t, String *qual) {
+SwigType_add_qualifier(SwigType *t, const String_or_char *qual) {
   char temp[256], newq[256];
   int  sz, added = 0;
   char *q, *cqual;
@@ -480,7 +480,7 @@ SwigType_isqualifier(SwigType *t) {
  * ----------------------------------------------------------------------------- */
 
 void
-SwigType_add_memberpointer(SwigType *t, String_or_char *name) {
+SwigType_add_memberpointer(SwigType *t, const String_or_char *name) {
   String *temp = NewStringf("m(%s).", name);
   Insert(t,0,temp);
   Delete(temp);
@@ -522,7 +522,7 @@ SwigType_ismemberpointer(SwigType *t) {
  * ----------------------------------------------------------------------------- */
 
 void
-SwigType_add_array(SwigType *t, String *size) {
+SwigType_add_array(SwigType *t, const String_or_char *size) {
   char temp[512];
   strcpy(temp,"a(");
   strcat(temp,Char(size));