diff --git a/src/registry/Makefile b/src/registry/Makefile
index 16a26824c..d820395ff 100644
--- a/src/registry/Makefile
+++ b/src/registry/Makefile
@@ -25,7 +25,7 @@ LIBSRCS += registryDeviceSupport.c
 LIBSRCS += registryDriverSupport.c
 
 LIBRARY_IOC = registryIoc
-registryIoc_DLL_LIBS  = dbStaticIoc Com
+registryIoc_DLL_LIBS  = Com
 
 OBJS_IOC = registerRecordDeviceDriver
 
diff --git a/src/registry/registryDeviceSupport.c b/src/registry/registryDeviceSupport.c
index e11088713..9f1ff6018 100644
--- a/src/registry/registryDeviceSupport.c
+++ b/src/registry/registryDeviceSupport.c
@@ -11,14 +11,14 @@ of this distribution.
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "registry.h"
 #include "dbBase.h"
 #include "devSup.h"
 #define epicsExportSharedSymbols
 #include "registryDeviceSupport.h"
+#include "registry.h"
 
 const char *deviceSupport = "device support";
-static void *registryID = &deviceSupport;
+static void *registryID = (void *)&deviceSupport;
 
 
 epicsShareFunc int epicsShareAPI registryDeviceSupportAdd(
diff --git a/src/registry/registryDriverSupport.c b/src/registry/registryDriverSupport.c
index 8cc9fa5d2..140e53f43 100644
--- a/src/registry/registryDriverSupport.c
+++ b/src/registry/registryDriverSupport.c
@@ -11,14 +11,14 @@ of this distribution.
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "registry.h"
 #include "dbBase.h"
 #include "drvSup.h"
 #define epicsExportSharedSymbols
 #include "registryDriverSupport.h"
+#include "registry.h"
 
 const char *driverSupport = "driver support";
-static void *registryID = &driverSupport;
+static void *registryID = (void *)&driverSupport;
 
 
 epicsShareFunc int epicsShareAPI registryDriverSupportAdd(
diff --git a/src/registry/registryRecordType.c b/src/registry/registryRecordType.c
index 4a0440486..657a65222 100644
--- a/src/registry/registryRecordType.c
+++ b/src/registry/registryRecordType.c
@@ -11,13 +11,13 @@ of this distribution.
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "registry.h"
 #include "dbBase.h"
 #define epicsExportSharedSymbols
 #include "registryRecordType.h"
+#include "registry.h"
 
 const char *recordType = "record type";
-static void *registryID = &recordType;
+static void *registryID = (void *)&recordType;
 
 
 epicsShareFunc int epicsShareAPI registryRecordTypeAdd(
diff --git a/src/registry/registryRecordType.h b/src/registry/registryRecordType.h
index c918e7163..aec2447d3 100644
--- a/src/registry/registryRecordType.h
+++ b/src/registry/registryRecordType.h
@@ -25,7 +25,7 @@ epicsShareFunc recordTypeLocation * epicsShareAPI registryRecordTypeFind(
     const char *name);
 
 /* The following function is generated by registerRecordDeviceDriver/pl */
-epicsShareFunc int epicsShareAPI registerRecordDeviceDriver(
+int registerRecordDeviceDriver(
     struct dbBase *pdbbase);
 
 #ifdef __cplusplus