diff --git a/src/makeBaseApp/top/caClientApp/Makefile b/src/makeBaseApp/top/caClientApp/Makefile
index a42bfb2ac..47011375c 100644
--- a/src/makeBaseApp/top/caClientApp/Makefile
+++ b/src/makeBaseApp/top/caClientApp/Makefile
@@ -7,16 +7,11 @@ include $(TOP)/configure/CONFIG
 
 PROD_HOST += caExample
 caExample_SRCS	+= caExample.c
-caExample_LIBS	+= ca
-caExample_LIBS	+= Com
+caExample_LIBS	+= $(EPICS_BASE_HOST_LIBS)
 
 PROD_HOST += caMonitor
 caMonitor_SRCS	+= caMonitor.c
-caMonitor_LIBS	+= ca
-caMonitor_LIBS	+= Com
-
-ca_DIR           = $(EPICS_BASE_LIB)
-Com_DIR          = $(EPICS_BASE_LIB)
+caMonitor_LIBS	+= $(EPICS_BASE_HOST_LIBS)
 
 include $(TOP)/configure/RULES
 #----------------------------------------
diff --git a/src/makeBaseApp/top/caServerApp/Makefile b/src/makeBaseApp/top/caServerApp/Makefile
index b30fb3f2b..2fa6f0bc5 100644
--- a/src/makeBaseApp/top/caServerApp/Makefile
+++ b/src/makeBaseApp/top/caServerApp/Makefile
@@ -12,16 +12,12 @@ TOP=..
 
 include $(TOP)/configure/CONFIG
 
-PROD_LIBS := cas ca gdd Com
-cas_DIR = $(INSTALL_LIB)
-ca_DIR = $(INSTALL_LIB)
-gdd_DIR = $(INSTALL_LIB)
-Com_DIR = $(INSTALL_LIB)
+PROD_LIBS += $(EPICS_BASE_HOST_LIBS)
 
 #
 # Added ws2_32 winmm user32 for the non-dll build
 #
-SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32
+SYS_PROD_LIBS_WIN32 += ws2_32 advapi32 user32
 
 SRCS += main.cc
 SRCS += exServer.cc
diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile b/src/makeBaseApp/top/exampleApp/src/Makefile
index 5822b0835..b1530a849 100644
--- a/src/makeBaseApp/top/exampleApp/src/Makefile
+++ b/src/makeBaseApp/top/exampleApp/src/Makefile
@@ -20,7 +20,6 @@ _APPNAME_Ioc_SRCS += devXxxSoft.c
 _APPNAME_Ioc_SRCS += dbSubExample.c
 
 _APPNAME_Ioc_LIBS += $(EPICS_BASE_IOC_LIBS)
-_APPNAME_Ioc_SYS_LIBS_solaris += c
 
 #=============================
 
@@ -43,8 +42,7 @@ _APPNAME__LIBS += _APPNAME_Ioc
 
 #The following builds sncExample as a component of _APPNAME_
 #_APPNAME__SRCS += sncExample.stt
-#_APPNAME__LIBS += seq
-#_APPNAME__LIBS += pv
+#_APPNAME__LIBS += seq pv
 
 _APPNAME__LIBS += $(EPICS_BASE_IOC_LIBS)
 
@@ -52,8 +50,7 @@ _APPNAME__LIBS += $(EPICS_BASE_IOC_LIBS)
 #PROD_HOST += sncExample
 #sncExample_SNCFLAGS += +m
 #sncExample_SRCS += sncExample.stt
-#sncExample_LIBS += seq
-#sncExample_LIBS += pv
+#sncExample_LIBS += seq pv
 #sncExample_LIBS += $(EPICS_BASE_HOST_LIBS)
 
 #===========================
diff --git a/src/makeBaseApp/top/exampleApp/src/dbSubExample.c b/src/makeBaseApp/top/exampleApp/src/dbSubExample.c
index ecd8c5455..9e581d56c 100644
--- a/src/makeBaseApp/top/exampleApp/src/dbSubExample.c
+++ b/src/makeBaseApp/top/exampleApp/src/dbSubExample.c
@@ -27,7 +27,7 @@ static registryFunctionRef mySubRef[] = {
     {"mySubProcess",(REGISTRYFUNCTION)mySubProcess}
 };
 
-epicsShareFunc void epicsShareAPI mySub(void)
+void epicsShareAPI mySub(void)
 {
     registryFunctionRefAdd(mySubRef,NELEMENTS(mySubRef));
 }
diff --git a/src/makeBaseApp/top/simpleApp/src/Makefile b/src/makeBaseApp/top/simpleApp/src/Makefile
index dd892d525..60843b9ac 100644
--- a/src/makeBaseApp/top/simpleApp/src/Makefile
+++ b/src/makeBaseApp/top/simpleApp/src/Makefile
@@ -5,52 +5,42 @@ include $(TOP)/configure/CONFIG
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 #=============================
 
+
 #_APPNAME_.dbd will be created from _APPNAME_Include.dbd
 DBD += _APPNAME_.dbd
 
-#_APPNAME__registerRecordDeviceDriver.cpp will be created from _APPNAME_.dbd
-_APPNAME__SRCS += _APPNAME__registerRecordDeviceDriver.cpp
+# If you are building source files remove comment from following statements
+#LIBRARY_IOC += _APPNAME_Ioc
+#_APPNAME_Ioc_LIBS += $(EPICS_BASE_IOC_LIBS)
+
+## Build and add other local sources like this:
+#_APPNAME_Ioc_SRCS += xxx.c xxx.cpp xxx.stt
+
+#The following creates an application
+PROD_IOC = _APPNAME_
 
 #=============================
 
 PROD_IOC = _APPNAME_
 
-## Build and add other local sources like this:
-#_APPNAME__SRCS += xxx.c xxx.cpp xxx.stt
+#_APPNAME__registerRecordDeviceDriver.cpp will be created from _APPNAME_.dbd
+_APPNAME__SRCS += _APPNAME__registerRecordDeviceDriver.cpp
 
 ## If _APPNAME_ is to be built for both vxWorks and for the host then
 _APPNAME__SRCS_DEFAULT += _APPNAME_Main.cpp
 _APPNAME__SRCS_vxWorks += -nil-
 
-## The following adds support from base/src/vxWorks
-_APPNAME__OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
-
-##Define all possible libraries
-## Use win32 object libs for registered support
-_APPNAME__LIBS_win32 += recIocObj
-_APPNAME__LIBS_win32 += softDevIocObj
-_APPNAME__LIBS_win32 += testDevIocObj
-_APPNAME__LIBS_DEFAULT += recIoc
-_APPNAME__LIBS_DEFAULT += softDevIoc
-_APPNAME__LIBS_DEFAULT += testDevIoc
-
-_APPNAME__LIBS += iocsh
-_APPNAME__LIBS += miscIoc
-_APPNAME__LIBS += rsrvIoc
-_APPNAME__LIBS += dbtoolsIoc
-_APPNAME__LIBS += asIoc
-_APPNAME__LIBS += dbIoc
-_APPNAME__LIBS += registryIoc
-_APPNAME__LIBS += dbStaticIoc
-_APPNAME__LIBS += ca
-_APPNAME__LIBS += Com
 
 ## For sequence programs, use
 #_APPNAME__SRCS += sncExample.stt
-#_APPNAME__LIBS += seq
-#_APPNAME__LIBS += pv
-#seq_DIR    = $(SNCSEQ_LIB)
-#pv_DIR     = $(SNCSEQ_LIB)
+#_APPNAME__LIBS += seq pv
+
+## The following adds support from base/src/vxWorks
+_APPNAME__OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
+
+# If you are building source files remove comment from following statement
+#_APPNAME__LIBS += _APPNAME_Ioc
+_APPNAME__LIBS += $(EPICS_BASE_IOC_LIBS)
 
 
 include $(TOP)/configure/RULES