diff --git a/src/db/db_test.c b/src/db/db_test.c
index 59c066956..af83fb724 100644
--- a/src/db/db_test.c
+++ b/src/db/db_test.c
@@ -44,6 +44,7 @@
 #define epicsExportSharedSymbols
 #include        "db_access_routines.h"
 #include        "dbNotify.h"
+#include        "db_test.h"
 
 /* function declarations */
 static void print_returned();
diff --git a/src/iocsh/Makefile b/src/iocsh/Makefile
index 614b30a22..ba44c20a3 100644
--- a/src/iocsh/Makefile
+++ b/src/iocsh/Makefile
@@ -33,6 +33,14 @@ LIBSRCS += ioccrfRegister
 LIBSRCS += asTestRegister
 
 LIBRARY_IOC = iocsh
-iocsh_DLL_LIBS  = miscIoc dbIoc registryIoc Com
+
+iocsh_OBJS += $(EPICS_BASE_BIN)/registerRecordDeviceDriver.o
+
+iocsh_DLL_LIBS  = miscIoc rsrvIoc dbtoolsIoc asIoc dbIoc registryIoc dbStaticIoc Com
+registryIoc_DIR=$(EPICS_BASE_LIB)
+dbtoolsIoc_DIR=$(EPICS_BASE_LIB)
+miscIoc_DIR=$(EPICS_BASE_LIB)
+rsrvIoc_DIR=$(EPICS_BASE_LIB)
 
 include $(TOP)/configure/RULES
+
diff --git a/src/iocsh/dbAccessRegister.c b/src/iocsh/dbAccessRegister.c
index 590fccad3..8273b8cda 100644
--- a/src/iocsh/dbAccessRegister.c
+++ b/src/iocsh/dbAccessRegister.c
@@ -12,12 +12,12 @@ of this distribution.
 #include <stdio.h>
 #include <ctype.h>
 
-#include "ioccrf.h"
 #include "dbAccess.h"
 #include "dbLoadTemplate.h"
 #include "registryRecordType.h"
 #define epicsExportSharedSymbols
 #include "dbAccessRegister.h"
+#include "ioccrf.h"
 
 /* dbLoadDatabase */
 static ioccrfArg dbLoadDatabaseArg0 = { "file name",ioccrfArgString,0};
diff --git a/src/iocsh/dbTestRegister.c b/src/iocsh/dbTestRegister.c
index 5348e918a..5f7af10ae 100644
--- a/src/iocsh/dbTestRegister.c
+++ b/src/iocsh/dbTestRegister.c
@@ -12,13 +12,13 @@ of this distribution.
 #include <stdio.h>
 #include <ctype.h>
 
-#include "ioccrf.h"
 #include "dbTest.h"
 #include "db_test.h"
 #include "dbLock.h"
 #include "dbScan.h"
 #define epicsExportSharedSymbols
 #include "dbTestRegister.h"
+#include "ioccrf.h"
 
 /* dba */
 static ioccrfArg dbaArg0 = { "record name",ioccrfArgString,0};
diff --git a/src/misc/Makefile b/src/misc/Makefile
index 9578e9b7f..7784dbf03 100644
--- a/src/misc/Makefile
+++ b/src/misc/Makefile
@@ -11,4 +11,9 @@ LIBSRCS +=  iocInit.c
 LIBSRCS +=  asSubRecordFunctions.c
 LIBRARY_IOC = miscIoc
 
+miscIoc_DLL_LIBS  = rsrvIoc asIoc dbIoc registryIoc dbStaticIoc Com
+rsrvIoc_DIR=$(EPICS_BASE_LIB)
+asIoc_DIR=$(EPICS_BASE_LIB)
+registryIoc_DIR=$(EPICS_BASE_LIB)
+
 include $(TOP)/configure/RULES
diff --git a/src/misc/iocInit.c b/src/misc/iocInit.c
index 40473371e..417c7ef20 100644
--- a/src/misc/iocInit.c
+++ b/src/misc/iocInit.c
@@ -80,12 +80,15 @@ of this distribution.
 #include "recSup.h"
 #include "envDefs.h"
 #include "rsrv.h"
-#include "epicsRelease.h"
 epicsShareFunc int epicsShareAPI asInit (void);
 #include "dbStaticLib.h"
 #include "db_access_routines.h"
 #include "initHooks.h"
 
+#define epicsExportSharedSymbols
+#include "epicsRelease.h"
+#include "iocInit.h"
+
 LOCAL int initialized=FALSE;
 
 /* define forward references*/
diff --git a/src/misc/iocInit.h b/src/misc/iocInit.h
index 25fa87c85..5f092bd7e 100644
--- a/src/misc/iocInit.h
+++ b/src/misc/iocInit.h
@@ -13,7 +13,7 @@ of this distribution.
 extern "C" {
 #endif
 
-epicsShareFunc int epicsShareAPI iocInit()
+epicsShareFunc int epicsShareAPI iocInit();
 
 #ifdef __cplusplus
 }
diff --git a/src/registry/registerRecordDeviceDriver.c b/src/registry/registerRecordDeviceDriver.c
index 47c4f3b0f..eb35af35e 100644
--- a/src/registry/registerRecordDeviceDriver.c
+++ b/src/registry/registerRecordDeviceDriver.c
@@ -9,12 +9,13 @@
 #include "devSup.h"
 #include "drvSup.h"
 #include "cantProceed.h"
+#define epicsExportSharedSymbols
 #include "registry.h"
 #include "registryRecordType.h"
 #include "registryDeviceSupport.h"
 #include "registryDriverSupport.h"
 
-int registerRecordDeviceDriver(struct dbBase *pdbbase)
+int epicsShareAPI registerRecordDeviceDriver(struct dbBase *pdbbase)
 {
     dbRecordType *pdbRecordType;
     recordTypeLocation *precordTypeLocation;
diff --git a/src/registry/registryRecordType.h b/src/registry/registryRecordType.h
index aec2447d3..c918e7163 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 */
-int registerRecordDeviceDriver(
+epicsShareFunc int epicsShareAPI registerRecordDeviceDriver(
     struct dbBase *pdbbase);
 
 #ifdef __cplusplus
diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c
index 539ceb303..431b65972 100644
--- a/src/rsrv/caservertask.c
+++ b/src/rsrv/caservertask.c
@@ -51,6 +51,7 @@
 
 #define GLBLSOURCE
 #include "server.h"
+#include "rsrv.h"
 
 #define DELETE_TASK(NAME)\
 if(threadNameToId(NAME)!=0)threadDestroy(threadNameToId(NAME));
@@ -471,7 +472,7 @@ LOCAL void log_one_client (struct client *client, unsigned level)
 /*
  *  casr()
  */
-void casr epicsShareAPI (unsigned level)
+void epicsShareAPI casr(unsigned level)
 {
     size_t bytes_reserved;
     struct client   *client;
diff --git a/src/util/Makefile b/src/util/Makefile
index e1c39894b..df7060ed2 100644
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -7,7 +7,7 @@ PROD_LIBS  = ca Com
 #
 # Added winmm user32 for the non-dll build
 #
-SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32
+iocLogServer_SYS_LIBS_WIN32 := ws2_32
 PROD_DEFAULT = ca_test iocLogServer startCArepeater 
 PROD_WIN32   = ca_test iocLogServer