diff --git a/modules/database/src/ioc/rsrv/camessage.c b/modules/database/src/ioc/rsrv/camessage.c
index 2f0c17d2f..dc0115ed8 100644
--- a/modules/database/src/ioc/rsrv/camessage.c
+++ b/modules/database/src/ioc/rsrv/camessage.c
@@ -17,6 +17,8 @@
  *          Ralph Lange <Ralph.Lange@bessy.de>
  */
 
+#define USE_TYPED_DBEVENT
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/modules/database/src/ioc/rsrv/server.h b/modules/database/src/ioc/rsrv/server.h
index b674fe79c..5ddae8779 100644
--- a/modules/database/src/ioc/rsrv/server.h
+++ b/modules/database/src/ioc/rsrv/server.h
@@ -150,7 +150,7 @@ struct event_ext {
     ELLNODE                 node;
     caHdrLargeArray         msg;
     struct channel_in_use   *pciu;
-    struct event_block      *pdbev;     /* ptr to db event block */
+    struct evSubscrip       *pdbev;     /* ptr to db event block */
     unsigned                size;       /* for speed */
     unsigned                mask;
     char                    modified;   /* mod & ev flw ctrl enbl */