diff --git a/src/as/Makefile b/src/as/Makefile
index 1ec77aa13..d6efdcd80 100644
--- a/src/as/Makefile
+++ b/src/as/Makefile
@@ -2,16 +2,18 @@ TOP=../..
 include $(TOP)/configure/CONFIG
 
 LIBSRCS += asLib.c
-asLibrary_SRCS += asDbLib.c
-asLibrary_SRCS += asCa.c
 
-LIBRARY_HOST = As
-LIBRARY_IOC = as
-DLL_LIBS  = Db Com
+asIoc_SRCS += asDbLib.c
+asIoc_SRCS += asCa.c
 
-PROD_LIBS = As dbStatic Com
-As_DIR=.
+LIBRARY_HOST = asHost
+LIBRARY_IOC = asIoc
 
+asHost_DLL_LIBS  = dbStaticHost Com
+asIoc_DLL_LIBS  = dbStaticIoc Com
+
+asHost_DIR=.
+PROD_LIBS = asHost dbStaticHost Com
 PROD = ascheck
 
 include $(TOP)/configure/RULES
diff --git a/src/bpt/Makefile b/src/bpt/Makefile
index ba1dc2d82..06c98a8cc 100644
--- a/src/bpt/Makefile
+++ b/src/bpt/Makefile
@@ -3,21 +3,23 @@ include $(TOP)/configure/CONFIG
 
 INC += cvtTable.h
 
-makeBpt_SRCS += makeBpt.c
-PROD += makeBpt
-
 MENUS += menuConvert.h
 
-bpt_SRCS += cvtBpt.c
-
-LIBRARY_IOC = bpt
-DLL_LIBS = Db Com
-
 BPTS += bptTypeJdegC.dbd
 BPTS += bptTypeJdegF.dbd
 BPTS += bptTypeKdegC.dbd
 BPTS += bptTypeKdegF.dbd
 
+LIBSRCS += cvtBpt.c
+LIBRARY_IOC = bptIoc
+
+bptHost_DLL_LIBS = dbStaticHost Com
+bptIoc_DLL_LIBS = dbStaticIoc Com
+
+PROD_LIBS = dbStaticHost Com
+PROD += makeBpt
+
+
 include $(TOP)/configure/RULES
 
 $(BPTS): $(INSTALL_PROD)
diff --git a/src/db/Makefile b/src/db/Makefile
index 1064f998c..013f2053a 100644
--- a/src/db/Makefile
+++ b/src/db/Makefile
@@ -30,31 +30,30 @@ MENUS += menuScan.h
 MENUS += menuYesNo.h
 
 RECTYPES += dbCommon.h
-USER_DBDFLAGS += -I ..
 
 DBDINSTALL +=  dbCommonRecord.dbd 
 DBDINSTALL +=  menuGlobal.dbd
 
-SRCS += dbLock.c
-SRCS += dbAccess.c
-SRCS += dbBkpt.c
-SRCS += dbConvert.c
-SRCS += dbFastLinkConv.c
-SRCS += dbNotify.c 
-SRCS += dbScan.c
-SRCS += dbEvent.c
-SRCS += dbTest.c
-SRCS += db_access.c
-SRCS += db_test.c
-SRCS += recGbl.c
-SRCS += callback.c
-SRCS += dbCa.c 
-SRCS += initHooks.c 
-SRCS += dbcar.c 
+LIBSRCS += dbLock.c
+LIBSRCS += dbAccess.c
+LIBSRCS += dbBkpt.c
+LIBSRCS += dbConvert.c
+LIBSRCS += dbFastLinkConv.c
+LIBSRCS += dbNotify.c 
+LIBSRCS += dbScan.c
+LIBSRCS += dbEvent.c
+LIBSRCS += dbTest.c
+LIBSRCS += db_access.c
+LIBSRCS += db_test.c
+LIBSRCS += recGbl.c
+LIBSRCS += callback.c
+LIBSRCS += dbCa.c 
+LIBSRCS += initHooks.c 
+LIBSRCS += dbcar.c 
 
 OBJS_IOC += iocInit
 
-LIBRARY_IOC = db
+LIBRARY_IOC = dbIoc
 DLL_LIBS = dbStaticIoc Com
 
 include $(TOP)/configure/RULES
@@ -62,4 +61,4 @@ include $(TOP)/configure/RULES
 dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd
 	$(RM) $@
 	$(EPICS_BASE_HOST_BIN)/dbToRecordtypeH$(HOSTEXE) \
-		$(USER_DBDFLAGS) $<
+		$(DBDFLAGS) $<
diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile
index c7d91b28f..e03729c59 100644
--- a/src/dbStatic/Makefile
+++ b/src/dbStatic/Makefile
@@ -2,8 +2,6 @@ TOP=../..
 
 include $(TOP)/configure/CONFIG
 
-#       includes to install from this sub-project
-#
 INC += alarm.h
 INC += alarmString.h
 INC += dbBase.h
@@ -13,30 +11,21 @@ INC += link.h
 INC += special.h
 INC += guigroup.h
 
-#       Sources to compile & put into lib:
-#
 LIBSRCS += dbStaticLib.c
 LIBSRCS += dbYacc.c
 LIBSRCS += dbPvdLib.c
 dbStaticHost_SRCS += dbStaticNoRun.c 
 dbStaticIoc_SRCS += dbStaticRun.c
 
-
-#       Library to build:
-#
 LIBRARY_HOST += dbStaticHost
 LIBRARY_IOC += dbStaticIoc
 
-DLL_LIBS = Com
+dbStaticHost_DLL_LIBS = Com
+dbStaticIoc_DLL_LIBS = Com
 
-#       Products to build:
-#
-PROD = dbReadTest dbExpand dbToMenuH dbToRecordtypeH
-
-#       libs needed by PROD:
-#
 PROD_LIBS := dbStaticHost Com
 dbStaticHost_DIR=.
+PROD = dbReadTest dbExpand dbToMenuH dbToRecordtypeH
 
 include $(TOP)/configure/RULES
 
diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile
index 5f86e3073..4e8084741 100644
--- a/src/dbtools/Makefile
+++ b/src/dbtools/Makefile
@@ -2,12 +2,14 @@ TOP=../..
 
 include $(TOP)/configure/CONFIG
 
-YACCOPT := -l
-LEXOPT  := -L
+#YACCOPT := -l
+#LEXOPT  := -L
 
-dbSubs_SRCS += dbLoadTemplate.c
+LIBSRCS += dbLoadTemplate.c
 
-LIBRARY = dbSubs
+LIBRARY_IOC = dbtoolsIoc
+
+dbtoolsIoc_DLL_LIBS  = dbStaticIoc Com
 
 HTMLS += dbLoadTemplate.html
 
diff --git a/src/libCom/Makefile b/src/libCom/Makefile
index 766a41950..dd5dbf60e 100644
--- a/src/libCom/Makefile
+++ b/src/libCom/Makefile
@@ -3,78 +3,8 @@ include $(TOP)/configure/CONFIG
 
 LIBCOM = $(TOP)/src/libCom
 
-
-# From cxxTemplates
-SRC_DIRS += $(LIBCOM)/cxxTemplates
-
-INC += resourceLib.h
-INC += tsDLList.h
-INC += tsSLList.h
-INC += tsMinMax.h
-INC += tsBTree.h
-
-# From osi
-SRC_DIRS += $(LIBCOM)/osi
-
-INC += dbDefs.h
-INC += epicsTypes.h
+#epicsVersion is created by this Makefile
 INC += epicsVersion.h
-INC += gsd_sync_defs.h
-INC += shareLib.h
-#INC += createSoftLinks.sh
-INC += unixFileName.h
-
-INC += devSup.h
-INC += drvSup.h
-INC += caeventmask.h
-INC += asLib.h
-INC += registryDeviceSupport.h
-INC += registryDriverSupport.h
-INC += registryRecordType.h
-INC += cadef.h
-INC += caerr.h
-INC += asDbLib.h
-
-INC += osiFileName.h
-INC += osiSock.h
-INC += osdSock.h
-
-INC += osiInterrupt.h
-INC += osdInterrupt.h
-INC += osiRing.h
-INC += osdRing.h
-INC += osiSem.h
-INC += osdSem.h
-INC += epicsAssert.h
-INC += osiFindGlobalSymbol.h
-INC += osdFindGlobalSymbol.h
-INC += osiPoolStatus.h
-INC += osdPoolStatus.h
-INC += osiThread.h
-INC += osdThread.h
-INC += osiTime.h
-INC += osdTime.h
-INC += osiSigPipeIgnore.h
-INC += osdSigPipeIgnore.h
-INC += tsStamp.h
-INC += osiMutex.h
-INC += osiEvent.h
-
-
-SRCS += osdSock.c
-SRCS += osiSock.c
-SRCS += osdAssert.c
-SRCS += osdFindGlobalSymbol.c
-SRCS += osdInterrupt.c
-SRCS += osdPoolStatus.c
-SRCS += osdRing.c
-SRCS += osdSem.c
-SRCS += osdThread.c
-SRCS += osiThread.cpp
-SRCS += osdTime.cpp
-SRCS += osiTime.cpp
-SRCS += osdSigPipeIgnore.c
-#tsStamp code is part of osiTime and osdTime
 
 SRC_DIRS += $(LIBCOM)/bucketLib
 INC += bucketLib.h
@@ -94,6 +24,14 @@ SRC_DIRS += $(LIBCOM)/cvtFast
 INC += cvtFast.h
 SRCS += cvtFast.c
 
+# From cxxTemplates
+SRC_DIRS += $(LIBCOM)/cxxTemplates
+INC += resourceLib.h
+INC += tsDLList.h
+INC += tsSLList.h
+INC += tsMinMax.h
+INC += tsBTree.h
+
 SRC_DIRS += $(LIBCOM)/dbmf
 INC += dbmf.h
 SRCS += dbmf.c
@@ -133,6 +71,10 @@ INC += gpHash.h
 SRCS += gpHashLib.c
 HTMLS += gpHash/gpHash.html
 
+SRC_DIRS += $(LIBCOM)/logClient
+INC += logClient.h
+SRCS += logClient.c
+
 SRC_DIRS += $(LIBCOM)/macLib
 INC += macLib.h
 SRCS += macCore.c
@@ -140,17 +82,70 @@ SRCS += macUtil.c
 
 SRC_DIRS += $(LIBCOM)/misc
 INC += adjustment.h
+INC += asDbLib.h
+INC += asLib.h
+INC += cadef.h
+INC += caerr.h
+INC += caeventmask.h
 INC += cantProceed.h
+INC += dbDefs.h
+INC += devSup.h
+INC += drvSup.h
 INC += epicsString.h
+INC += epicsTypes.h
+INC += gsd_sync_defs.h
+INC += registryDeviceSupport.h
+INC += registryDriverSupport.h
+INC += registryRecordType.h
+INC += shareLib.h
+INC += truncateFile.h
+INC += unixFileName.h
+SRCS += aToIPAddr.c
 SRCS += adjustment.c
 SRCS += cantProceed.c
 SRCS += epicsString.c
-SRCS += aToIPAddr.c
-INC += truncateFile.h
 SRCS += truncateFile.c
-SRC_DIRS += $(LIBCOM)/logClient
-INC += logClient.h
-SRCS += logClient.c
+
+# From osi
+SRC_DIRS += $(LIBCOM)/osi
+INC += osiFileName.h
+INC += osiSock.h
+INC += osdSock.h
+INC += osiInterrupt.h
+INC += osdInterrupt.h
+INC += osiRing.h
+INC += osdRing.h
+INC += osiSem.h
+INC += osdSem.h
+INC += epicsAssert.h
+INC += osiFindGlobalSymbol.h
+INC += osdFindGlobalSymbol.h
+INC += osiPoolStatus.h
+INC += osdPoolStatus.h
+INC += osiThread.h
+INC += osdThread.h
+INC += osiTime.h
+INC += osdTime.h
+INC += osiSigPipeIgnore.h
+INC += osdSigPipeIgnore.h
+INC += tsStamp.h
+INC += osiMutex.h
+INC += osiEvent.h
+
+SRCS += osdSock.c
+SRCS += osiSock.c
+SRCS += osdAssert.c
+SRCS += osdFindGlobalSymbol.c
+SRCS += osdInterrupt.c
+SRCS += osdPoolStatus.c
+SRCS += osdRing.c
+SRCS += osdSem.c
+SRCS += osdThread.c
+SRCS += osiThread.cpp
+SRCS += osdTime.cpp
+SRCS += osiTime.cpp
+SRCS += osdSigPipeIgnore.c
+#tsStamp code is part of osiTime and osdTime
 
 SRC_DIRS += $(LIBCOM)/taskwd
 INC += taskwd.h
diff --git a/src/misc/Makefile b/src/misc/Makefile
index dcffa0345..0a1d58a4c 100644
--- a/src/misc/Makefile
+++ b/src/misc/Makefile
@@ -2,8 +2,7 @@
 TOP=../..
 include $(TOP)/configure/CONFIG
 
-LIBRARY = misc
-
-miscLib_SRCS =  epicsRelease.c
+LIBSRCS +=  epicsRelease.c
+LIBRARY_IOC = miscIoc
 
 include $(TOP)/configure/RULES
diff --git a/src/rec/Makefile b/src/rec/Makefile
index af8b40fec..bcce02be1 100644
--- a/src/rec/Makefile
+++ b/src/rec/Makefile
@@ -1,12 +1,10 @@
 TOP=../..
 include $(TOP)/configure/CONFIG
 
-
 INC += egDefs.h
 INC += erDefs.h
 INC += ereventDefs.h
 
-#USER_DBDFLAGS += -I .. -I $(EPICS_BASE)/dbd
 RECTYPES += aaiRecord.h
 RECTYPES += aaoRecord.h
 RECTYPES += aiRecord.h
diff --git a/src/registry/Makefile b/src/registry/Makefile
index b897248b3..8cf6cb5e7 100644
--- a/src/registry/Makefile
+++ b/src/registry/Makefile
@@ -15,14 +15,15 @@ INC += registry.h
 
 SCRIPTS += registerRecordDeviceDriver.pl
 
-registry_SRCS += registry.c
-registry_SRCS += registryRecordType.c
-registry_SRCS += registryDeviceSupport.c
-registry_SRCS += registryDriverSupport.c
+LIBSRCS += registry.c
+LIBSRCS += registryRecordType.c
+LIBSRCS += registryDeviceSupport.c
+LIBSRCS += registryDriverSupport.c
 
-LIBRARY = registry
+LIBRARY_IOC = registryIoc
+registryIoc_DLL_LIBS  = dbStaticIoc Com
 
-OBJS = registerRecordDeviceDriver
+OBJS_IOC = registerRecordDeviceDriver
 
 include $(TOP)/configure/RULES
 
diff --git a/src/rsrv/Makefile b/src/rsrv/Makefile
index be52c283b..dcd978313 100644
--- a/src/rsrv/Makefile
+++ b/src/rsrv/Makefile
@@ -5,11 +5,15 @@ include $(TOP)/configure/CONFIG
 USR_INCLUDES = -I../../ca
 USR_CFLAGS += -UUNIX -DiocCore
 
-rsrv_SRCS = \
-	caserverio.c caservertask.c camsgtask.c camessage.c \
-	cast_server.c online_notify.c 
-LIBRARY = rsrv
-DLL_LIBS = Db As Com 
+LIBSRCS += caserverio.c
+LIBSRCS += caservertask.c
+LIBSRCS += camsgtask.c
+LIBSRCS += camessage.c
+LIBSRCS += cast_server.c
+LIBSRCS += online_notify.c 
+
+LIBRARY_IOC = rsrvIoc
+rsrvIoc_DLL_LIBS = libdbStaticIoc libasIoc Com 
 SYS_DLL_LIBS := ws2_32
 
 include $(TOP)/configure/RULES
diff --git a/src/util/Makefile b/src/util/Makefile
index 45a14ddb7..e1c39894b 100644
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -2,7 +2,7 @@ TOP=../..
 
 include $(TOP)/configure/CONFIG
 
-PROD_LIBS         := ca Com
+PROD_LIBS  = ca Com
 
 #
 # Added winmm user32 for the non-dll build