diff --git a/src/as/asDbLib.h b/src/as/asDbLib.h
index 66b281eef..e2cc0edae 100644
--- a/src/as/asDbLib.h
+++ b/src/as/asDbLib.h
@@ -21,6 +21,9 @@ of this distribution.
 #ifndef INCdbAsLibh
 #define INCdbAsLibh
 
+#include "callback.h"
+#include "shareLib.h"
+
 typedef struct {
     CALLBACK	callback;
     long	status;
diff --git a/src/db/db_access.c b/src/db/db_access.c
index 440614e72..e0e22cb84 100644
--- a/src/db/db_access.c
+++ b/src/db/db_access.c
@@ -1608,7 +1608,7 @@ int		no_elements
     return(0);
 }
 
-int dbPutNotifyMapType (PUTNOTIFY *ppn, short oldtype)
+epicsShareFunc int epicsShareAPI dbPutNotifyMapType (PUTNOTIFY *ppn, short oldtype)
 {
     switch(oldtype) {
     case(oldDBR_STRING):
diff --git a/src/db/iocInit.c b/src/db/iocInit.c
index 5255a6f78..2e4212306 100644
--- a/src/db/iocInit.c
+++ b/src/db/iocInit.c
@@ -79,6 +79,7 @@ of this distribution.
 #include "errMdef.h"
 #include "recSup.h"
 #include "envDefs.h"
+#include "rsrv.h"
 #include "dbStaticLib.h"
 #include "initHooks.h"