diff --git a/asyn.Makefile b/asyn.Makefile
index 84a8c5b912a352b9ba4248fe949920f97ea844e5..af3793780642e7b6477ceaeb669beb93be3d4deb 100644
--- a/asyn.Makefile
+++ b/asyn.Makefile
@@ -186,14 +186,10 @@ SOURCES += $(ASYNPORTCLIENT)/asynPortClient.cpp
 
 DBDS += $(DEVEPICS)/devAsynOctet.dbd
 DBDS += $(DEVEPICS)/devAsynInt32.dbd
-DBDS += $(DEVEPICS)/devAsynInt8Array.dbd
-DBDS += $(DEVEPICS)/devAsynInt16Array.dbd
-DBDS += $(DEVEPICS)/devAsynInt32Array.dbd
+DBDS += $(DEVEPICS)/devAsynXXXArray.dbd
 DBDS += $(DEVEPICS)/devAsynInt32TimeSeries.dbd
 DBDS += $(DEVEPICS)/devAsynUInt32Digital.dbd
 DBDS += $(DEVEPICS)/devAsynFloat64.dbd
-DBDS += $(DEVEPICS)/devAsynFloat32Array.dbd
-DBDS += $(DEVEPICS)/devAsynFloat64Array.dbd
 DBDS += $(DEVEPICS)/devAsynFloat64TimeSeries.dbd
 DBDS += $(DEVEPICS)/devAsynInt64.dbd
 DBDS += $(DEVEPICS)/devAsynInt64Array.dbd
@@ -215,19 +211,15 @@ HEADERS   += $(DEVEPICS)/asynEpicsUtils.h
 SOURCES   += $(DEVEPICS)/devAsynOctet.c
 SOURCES   += $(DEVEPICS)/asynEpicsUtils.c
 SOURCES   += $(DEVEPICS)/devAsynInt32.c
-SOURCES   += $(DEVEPICS)/devAsynInt8Array.c
-SOURCES   += $(DEVEPICS)/devAsynInt16Array.c
-SOURCES   += $(DEVEPICS)/devAsynInt32Array.c
 SOURCES   += $(DEVEPICS)/devAsynInt32TimeSeries.c
 SOURCES   += $(DEVEPICS)/devAsynUInt32Digital.c
 SOURCES   += $(DEVEPICS)/devAsynFloat64.c
-SOURCES   += $(DEVEPICS)/devAsynFloat32Array.c
-SOURCES   += $(DEVEPICS)/devAsynFloat64Array.c
+SOURCES   += $(DEVEPICS)/devAsynXXXArray.cpp
 SOURCES   += $(DEVEPICS)/devAsynFloat64TimeSeries.c
+SOURCES   += $(DEVEPICS)/devEpicsPvt.c
 
 # ESS Supports only Base 7+ in E3
 SOURCES   += $(DEVEPICS)/devAsynInt64.c
-SOURCES   += $(DEVEPICS)/devAsynInt64Array.c
 SOURCES   += $(DEVEPICS)/devAsynInt64TimeSeries.c
 #