diff --git a/modules/database/src/ioc/Makefile b/modules/database/src/ioc/Makefile
index 15894cd0d..5d823095f 100644
--- a/modules/database/src/ioc/Makefile
+++ b/modules/database/src/ioc/Makefile
@@ -11,7 +11,7 @@ TOP = ../../../..
 
 include $(TOP)/configure/CONFIG
 
-USR_CPPFLAGS += -DUSE_TYPED_RSET -DUSE_TYPED_DSET
+USR_CPPFLAGS += -DUSE_TYPED_RSET -DUSE_TYPED_DSET -DUSE_TYPED_DRVET
 
 # Shared library ABI version.
 SHRLIB_VERSION = $(EPICS_DATABASE_MAJOR_VERSION).$(EPICS_DATABASE_MINOR_VERSION).$(EPICS_DATABASE_MAINTENANCE_VERSION)
diff --git a/modules/database/src/ioc/dbStatic/Makefile b/modules/database/src/ioc/dbStatic/Makefile
index bb178df41..e9bd95b8d 100644
--- a/modules/database/src/ioc/dbStatic/Makefile
+++ b/modules/database/src/ioc/dbStatic/Makefile
@@ -11,8 +11,6 @@
 
 SRC_DIRS += $(IOCDIR)/dbStatic
 
-USR_CFLAGS += -DUSE_TYPED_DRVET
-
 INC += dbBase.h
 INC += dbFldTypes.h
 INC += dbStaticLib.h
diff --git a/modules/database/src/tools/registerRecordDeviceDriver.pl b/modules/database/src/tools/registerRecordDeviceDriver.pl
index 940b422d9..4cb39fbba 100644
--- a/modules/database/src/tools/registerRecordDeviceDriver.pl
+++ b/modules/database/src/tools/registerRecordDeviceDriver.pl
@@ -164,7 +164,7 @@ if (%drivers) {
     print $out "};\n\n";
 
     # List of pointers to each drvet
-    print $out "static struct drvet *drvsl[] = {\n";
+    print $out "static drvet *drvsl[] = {\n";
     print $out join(",\n", map {"    pvar_drvet_$_"} @drivers);
     print $out "};\n\n";
 }