diff --git a/xxxApp/src/Makefile b/xxxApp/src/Makefile
index a8ea40c155bacfc490347c68f743723f4976886c..392dcf2d619cd0cd740d06554aeb93e0f8ae82b9 100644
--- a/xxxApp/src/Makefile
+++ b/xxxApp/src/Makefile
@@ -38,13 +38,45 @@ else
 ifeq ($(EPICS_HOST_ARCH), cygwin-x86)
 DBD  += iocxxxCygwin.dbd
 else
-DBD  += iocxxx.dbd
+ifeq ($(OS_CLASS), vxWorks)
 DBD  += iocxxxVX.dbd
+else
+ifeq ($(OS_CLASS), Linux)
 DBD  += iocxxxLinux.dbd
+else
+ifeq ($(OS_CLASS), solaris)
 DBD  += iocxxx_solaris.dbd
+else
+DBD  += iocxxx.dbd
+endif
+endif
+endif
+endif
+endif
+
+# If your host supports libpcap and libnet and you want to build Canberra network
+# support, set LINUX_NET_INSTALLED to YES in <synApps>/configure/CONFIG_SITE.
+iocxxxLinux_DBD += xxxCommonInclude.dbd
+ifneq ($(OS_CLASS), Linux)
+iocxxxLinux_DBD += mcaCanberraSupport.dbd
+else
+ifeq ($(LINUX_NET_INSTALLED), YES)
+iocxxxLinux_DBD += mcaCanberraSupport.dbd
+endif
+endif
+# If your host supports parallel port or USB interfaces to Saturn DXP, set
+# LINUX_USB_INSTALLED to YES in <synApps>/configure/CONFIG_SITE.
+ifneq ($(OS_CLASS), Linux)
+iocxxxLinux_DBD += dxpSupport.dbd
+else
+ifeq ($(OS_CLASS), Linux)
+ifeq ($(LINUX_USB_INSTALLED), YES)
+iocxxxLinux_DBD += dxpSupport.dbd
+endif
 endif
 endif
 
+
 # <name>_registerRecordDeviceDriver.cpp will be created from <name>.dbd
 xxx_SRCS_DEFAULT  += iocxxx_registerRecordDeviceDriver.cpp          xxxMain.cpp
 xxx_SRCS_vxWorks  += iocxxxVX_registerRecordDeviceDriver.cpp
@@ -94,10 +126,12 @@ xxx_vxWorks_LIBS += oms DeltaTau
 #The following adds support from base/src/vxWorks
 xxx_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
-#xxx_Linux_LIBS  += dxp handel
-# If libnet IS installed on your HOST Linux system;
-# uncomment the following line.
-#xxx_Linux_LIBS  += mcaCanberra
+ifeq ($(LINUX_USB_INSTALLED), YES)
+xxx_Linux_LIBS  += dxp handel
+endif
+ifeq ($(LINUX_NET_INSTALLED), YES)
+xxxLinux_LIBS += mcaCanberra
+endif
 
 xxx_cygwin_LIBS += dxp handel
 
@@ -138,12 +172,9 @@ xxx_SYS_LIBS_vxWorks += -nil-
 
 # This is needed by areaDetector on Linux and WIN32
 xxx_LIBS_WIN32        += PvAPI
-
-ifeq ($(EPICS_HOST_ARCH), linux-x86)
 ifeq ($(LINUX_TIFF_INSTALLED), YES)
 xxx_LIBS_Linux        += PvAPI
 endif
-endif
 
 # This is needed by dxp on cygwin and WIN32
 xxx_SYS_LIBS_cygwin32 += DLPORTIO PlxApi setupapi
diff --git a/xxxApp/src/iocxxxLinuxInclude.dbd b/xxxApp/src/iocxxxLinuxInclude.dbd
index 5e9da4916b2947238c403166aacd35996a137946..2b57661a38f1108f4adb4922c9442685cc3eaf40 100644
--- a/xxxApp/src/iocxxxLinuxInclude.dbd
+++ b/xxxApp/src/iocxxxLinuxInclude.dbd
@@ -1,9 +1,2 @@
 # stuff for Linux ioc
 include "xxxCommonInclude.dbd"
-# If your host supports libpcap and libnet and you want to build Canberra network
-# support uncomment the following line
-# (Support build is commented out of mca/mcaApp/CanberraSrc/Makefile)
-#include "mcaCanberraSupport.dbd"
-# If you want to build parallel port or USB interfaces to Saturn DXP uncomment the following line
-#include "dxpSupport.dbd"
-