diff --git a/src/dbStatic/dbStaticLib.c b/src/dbStatic/dbStaticLib.c
index 2c2df6c46..47490e588 100644
--- a/src/dbStatic/dbStaticLib.c
+++ b/src/dbStatic/dbStaticLib.c
@@ -1202,7 +1202,7 @@ long epicsShareAPI dbWriteBreaktableFP(DBBASE *pdbbase,FILE *fp)
     return(0);
 }
 
-long epicsShareAPI dbFindRecordType(DBENTRY *pdbentry,char *recordType)
+long epicsShareAPI dbFindRecordType(DBENTRY *pdbentry,const char *recordType)
 {
     dbBase	*pdbbase = pdbentry->pdbbase;
     GPHENTRY	*phash;
@@ -3617,7 +3617,7 @@ void  epicsShareAPI dbDumpRecordType(DBBASE *pdbbase,char *recordTypeName)
 	printf("indvalFlddes %d name %s\n",pdbRecordType->indvalFlddes,
 	    pdbRecordType->pvalFldDes->name);
 	printf("struct rset * %p rec_size %d\n",
-	    pdbRecordType->prset,pdbRecordType->rec_size);
+	    (void *)pdbRecordType->prset,pdbRecordType->rec_size);
 	if(recordTypeName) break;
     }
 }
@@ -3735,7 +3735,7 @@ void  epicsShareAPI dbDumpDevice(DBBASE *pdbbase,char *recordTypeName)
 	    printf("\t     name: %s\n",pdevSup->name);
 	    printf("\t   choice: %s\n",pdevSup->choice);
 	    printf("\tlink_type: %d\n",pdevSup->link_type);
-	    printf("\t    pdset: %p\n",pdevSup->pdset);
+	    printf("\t    pdset: %p\n",(void *)pdevSup->pdset);
 	}
 	if(recordTypeName) break;
     }
diff --git a/src/dbStatic/dbStaticLib.h b/src/dbStatic/dbStaticLib.h
index 325507a6b..4c5ed961b 100644
--- a/src/dbStatic/dbStaticLib.h
+++ b/src/dbStatic/dbStaticLib.h
@@ -124,7 +124,7 @@ epicsShareFunc char ** epicsShareAPI dbGetChoices(DBENTRY *pdbentry);
 epicsShareFunc void epicsShareAPI dbDumpRecDes(DBBASE *pdbbase,char *recordTypeName);
 /*End obsolete routines*/
 
-epicsShareFunc long epicsShareAPI dbFindRecordType(DBENTRY *pdbentry,char *recordTypename);
+epicsShareFunc long epicsShareAPI dbFindRecordType(DBENTRY *pdbentry,const char *recordTypename);
 epicsShareFunc long epicsShareAPI dbFirstRecordType(DBENTRY *pdbentry);
 epicsShareFunc long epicsShareAPI dbNextRecordType(DBENTRY *pdbentry);
 epicsShareFunc char * epicsShareAPI dbGetRecordTypeName(DBENTRY *pdbentry);
diff --git a/src/registry/registerRecordDeviceDriver.pl b/src/registry/registerRecordDeviceDriver.pl
index 610ce4822..48325da63 100755
--- a/src/registry/registerRecordDeviceDriver.pl
+++ b/src/registry/registerRecordDeviceDriver.pl
@@ -57,7 +57,7 @@ if($numberRecordType>0) {
     #NOTE the following caused a compiler error on vxWorks
     #    print "extern computeSizeOffset $recordType[$i]RecordSizeOffset;\n";
     }
-    print "\nstatic char *recordTypeNames[$numberRecordType] = {\n";
+    print "\nstatic const char * const recordTypeNames[$numberRecordType] = {\n";
     for ($i=0; $i<$numberRecordType; $i++) {
         print "    \"$recordType[$i]\"";
         if($i < $numberRecordType-1) { print ",";}
@@ -65,7 +65,7 @@ if($numberRecordType>0) {
     }
     print "};\n\n";
 
-    print "static recordTypeLocation rtl[$i] = {\n";
+    print "static const recordTypeLocation rtl[$i] = {\n";
     for ($i=0; $i<$numberRecordType; $i++) {
         print "    {&$recordType[$i]RSET, $recordType[$i]RecordSizeOffset}";
         if($i < $numberRecordType-1) { print ",";}
@@ -79,7 +79,7 @@ if($numberDeviceSupport>0) {
     for ($i=0; $i<$numberDeviceSupport; $i++) {
         print "extern struct dset $deviceSupport[$i];\n";
     }
-    print "\nstatic char *deviceSupportNames[$numberDeviceSupport] = {\n";
+    print "\nstatic const char * const deviceSupportNames[$numberDeviceSupport] = {\n";
     for ($i=0; $i<$numberDeviceSupport; $i++) {
         print "    \"$deviceSupport[$i]\"";
         if($i < $numberDeviceSupport-1) { print ",";}
@@ -87,7 +87,7 @@ if($numberDeviceSupport>0) {
     }
     print "};\n\n";
 
-    print "static struct dset *devsl[$i] = {\n";
+    print "static const struct dset * const devsl[$i] = {\n";
     for ($i=0; $i<$numberDeviceSupport; $i++) {
         print "    &$deviceSupport[$i]";
         if($i < $numberDeviceSupport-1) { print ",";}
diff --git a/src/registry/registryDeviceSupport.c b/src/registry/registryDeviceSupport.c
index 546782317..511fc454b 100644
--- a/src/registry/registryDeviceSupport.c
+++ b/src/registry/registryDeviceSupport.c
@@ -22,7 +22,7 @@ static void *registryID = (void *)&deviceSupport;
 
 
 epicsShareFunc int epicsShareAPI registryDeviceSupportAdd(
-    const char *name,struct dset *pdset)
+    const char *name,const struct dset *pdset)
 {
     return(registryAdd(registryID,name,(void *)pdset));
 }
diff --git a/src/registry/registryDeviceSupport.h b/src/registry/registryDeviceSupport.h
index 81cf08eb2..713a78920 100644
--- a/src/registry/registryDeviceSupport.h
+++ b/src/registry/registryDeviceSupport.h
@@ -8,7 +8,7 @@ extern "C" {
 #endif
 
 epicsShareFunc int epicsShareAPI registryDeviceSupportAdd(
-    const char *name,struct dset *pdset);
+    const char *name,const struct dset *pdset);
 epicsShareFunc struct dset * epicsShareAPI registryDeviceSupportFind(
     const char *name);
 
diff --git a/src/registry/registryRecordType.c b/src/registry/registryRecordType.c
index 9e053fdea..be3ee4fae 100644
--- a/src/registry/registryRecordType.c
+++ b/src/registry/registryRecordType.c
@@ -21,7 +21,7 @@ static void *registryID = (void *)&recordType;
 
 
 epicsShareFunc int epicsShareAPI registryRecordTypeAdd(
-    const char *name,recordTypeLocation *prtl)
+    const char *name,const recordTypeLocation *prtl)
 {
     return(registryAdd(registryID,name,(void *)prtl));
 }
diff --git a/src/registry/registryRecordType.h b/src/registry/registryRecordType.h
index 4446a8964..55905aaa3 100644
--- a/src/registry/registryRecordType.h
+++ b/src/registry/registryRecordType.h
@@ -20,7 +20,7 @@ extern "C" {
 #endif
 
 epicsShareFunc int epicsShareAPI registryRecordTypeAdd(
-    const char *name,recordTypeLocation *prtl);
+    const char *name,const recordTypeLocation *prtl);
 epicsShareFunc recordTypeLocation * epicsShareAPI registryRecordTypeFind(
     const char *name);