diff --git a/pvDataApp/Makefile b/pvDataApp/Makefile
index e66a3e1..7a79091 100644
--- a/pvDataApp/Makefile
+++ b/pvDataApp/Makefile
@@ -1,109 +1,16 @@
+# Makefile for the pvData library
+
 TOP = ..
 include $(TOP)/configure/CONFIG
 
-PVDATA = $(TOP)/pvDataApp/
+PVDATAAPP = $(TOP)/pvDataApp
 
-SRC_DIRS += $(PVDATA)/misc
-
-INC += noDefaultMethods.h
-INC += lock.h
-INC += requester.h
-INC += serialize.h
-INC += bitSet.h
-INC += byteBuffer.h
-INC += epicsException.h
-INC += serializeHelper.h
-INC += event.h
-INC += thread.h
-INC += executor.h
-INC += timeFunction.h
-INC += timer.h
-INC += queue.h
-INC += messageQueue.h
-INC += destroyable.h
-INC += status.h
-INC += sharedPtr.h
-INC += localStaticLock.h
-INC += typeCast.h
-INC += printer.h
-INC += sharedVector.h
-INC += templateMeta.h
-INC += current_function.h
-
-LIBSRCS += byteBuffer.cpp
-LIBSRCS += bitSet.cpp
-LIBSRCS += epicsException.cpp
-LIBSRCS += requester.cpp
-LIBSRCS += serializeHelper.cpp
-LIBSRCS += event.cpp
-LIBSRCS += executor.cpp
-LIBSRCS += timeFunction.cpp
-LIBSRCS += timer.cpp
-LIBSRCS += status.cpp
-LIBSRCS += messageQueue.cpp
-LIBSRCS += localStaticLock.cpp
-LIBSRCS += typeCast.cpp
-LIBSRCS += parseToPOD.cpp
-
-SRC_DIRS += $(PVDATA)/pv
-
-INC += pvType.h
-INC += pvIntrospect.h
-INC += pvData.h
-INC += convert.h
-INC += standardField.h
-INC += standardPVField.h
-INC += pvSubArrayCopy.h
-
-SRC_DIRS += $(PVDATA)/factory
-
-INC += factory.h
-LIBSRCS += TypeFunc.cpp
-LIBSRCS += FieldCreateFactory.cpp
-LIBSRCS += PVAuxInfoImpl.cpp
-LIBSRCS += PVField.cpp
-LIBSRCS += PVScalar.cpp
-LIBSRCS += PVArray.cpp
-LIBSRCS += PVScalarArray.cpp
-LIBSRCS += PVStructure.cpp
-LIBSRCS += PVStructureArray.cpp
-LIBSRCS += PVUnion.cpp
-LIBSRCS += PVUnionArray.cpp
-LIBSRCS += PVDataCreateFactory.cpp
-LIBSRCS += Convert.cpp
-LIBSRCS += pvSubArrayCopy.cpp
-LIBSRCS += Compare.cpp
-LIBSRCS += StandardField.cpp
-LIBSRCS += StandardPVField.cpp
-LIBSRCS += printer.cpp
-
-SRC_DIRS += $(PVDATA)/property
-
-INC += alarm.h
-INC += pvAlarm.h
-INC += control.h
-INC += pvControl.h
-INC += display.h
-INC += pvDisplay.h
-INC += pvEnumerated.h
-INC += timeStamp.h
-INC += pvTimeStamp.h
-
-LIBSRCS += alarm.cpp 
-LIBSRCS += pvAlarm.cpp 
-LIBSRCS += pvControl.cpp 
-LIBSRCS += pvDisplay.cpp 
-LIBSRCS += pvEnumerated.cpp 
-LIBSRCS += timeStamp.cpp
-LIBSRCS += pvTimeStamp.cpp
-
-SRC_DIRS += $(PVDATA)/pvMisc
-INC += bitSetUtil.h
-LIBSRCS += bitSetUtil.cpp 
-
-SRC_DIRS += $(PVDATA)/monitor
-INC += monitor.h
-LIBSRCS += monitor.cpp
+include $(PVDATAAPP)/misc/Makefile
+include $(PVDATAAPP)/pv/Makefile
+include $(PVDATAAPP)/factory/Makefile
+include $(PVDATAAPP)/property/Makefile
+include $(PVDATAAPP)/pvMisc/Makefile
+include $(PVDATAAPP)/monitor/Makefile
 
 LIBRARY = pvData
 pvData_LIBS += Com
diff --git a/pvDataApp/factory/Makefile b/pvDataApp/factory/Makefile
new file mode 100644
index 0000000..1c071b4
--- /dev/null
+++ b/pvDataApp/factory/Makefile
@@ -0,0 +1,24 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVDATAAPP)/factory
+
+INC += factory.h
+LIBSRCS += TypeFunc.cpp
+LIBSRCS += FieldCreateFactory.cpp
+LIBSRCS += PVAuxInfoImpl.cpp
+LIBSRCS += PVField.cpp
+LIBSRCS += PVScalar.cpp
+LIBSRCS += PVArray.cpp
+LIBSRCS += PVScalarArray.cpp
+LIBSRCS += PVStructure.cpp
+LIBSRCS += PVStructureArray.cpp
+LIBSRCS += PVUnion.cpp
+LIBSRCS += PVUnionArray.cpp
+LIBSRCS += PVDataCreateFactory.cpp
+LIBSRCS += Convert.cpp
+LIBSRCS += pvSubArrayCopy.cpp
+LIBSRCS += Compare.cpp
+LIBSRCS += StandardField.cpp
+LIBSRCS += StandardPVField.cpp
+LIBSRCS += printer.cpp
+
diff --git a/pvDataApp/misc/Makefile b/pvDataApp/misc/Makefile
new file mode 100644
index 0000000..bcdf086
--- /dev/null
+++ b/pvDataApp/misc/Makefile
@@ -0,0 +1,44 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVDATAAPP)/misc
+
+INC += noDefaultMethods.h
+INC += lock.h
+INC += requester.h
+INC += serialize.h
+INC += bitSet.h
+INC += byteBuffer.h
+INC += epicsException.h
+INC += serializeHelper.h
+INC += event.h
+INC += thread.h
+INC += executor.h
+INC += timeFunction.h
+INC += timer.h
+INC += queue.h
+INC += messageQueue.h
+INC += destroyable.h
+INC += status.h
+INC += sharedPtr.h
+INC += localStaticLock.h
+INC += typeCast.h
+INC += printer.h
+INC += sharedVector.h
+INC += templateMeta.h
+INC += current_function.h
+
+LIBSRCS += byteBuffer.cpp
+LIBSRCS += bitSet.cpp
+LIBSRCS += epicsException.cpp
+LIBSRCS += requester.cpp
+LIBSRCS += serializeHelper.cpp
+LIBSRCS += event.cpp
+LIBSRCS += executor.cpp
+LIBSRCS += timeFunction.cpp
+LIBSRCS += timer.cpp
+LIBSRCS += status.cpp
+LIBSRCS += messageQueue.cpp
+LIBSRCS += localStaticLock.cpp
+LIBSRCS += typeCast.cpp
+LIBSRCS += parseToPOD.cpp
+
diff --git a/pvDataApp/monitor/Makefile b/pvDataApp/monitor/Makefile
new file mode 100644
index 0000000..295f5bd
--- /dev/null
+++ b/pvDataApp/monitor/Makefile
@@ -0,0 +1,8 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVDATAAPP)/monitor
+
+INC += monitor.h
+
+LIBSRCS += monitor.cpp
+
diff --git a/pvDataApp/property/Makefile b/pvDataApp/property/Makefile
new file mode 100644
index 0000000..283bc09
--- /dev/null
+++ b/pvDataApp/property/Makefile
@@ -0,0 +1,22 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVDATAAPP)/property
+
+INC += alarm.h
+INC += pvAlarm.h
+INC += control.h
+INC += pvControl.h
+INC += display.h
+INC += pvDisplay.h
+INC += pvEnumerated.h
+INC += timeStamp.h
+INC += pvTimeStamp.h
+
+LIBSRCS += alarm.cpp
+LIBSRCS += pvAlarm.cpp
+LIBSRCS += pvControl.cpp
+LIBSRCS += pvDisplay.cpp
+LIBSRCS += pvEnumerated.cpp
+LIBSRCS += timeStamp.cpp
+LIBSRCS += pvTimeStamp.cpp
+
diff --git a/pvDataApp/pv/Makefile b/pvDataApp/pv/Makefile
new file mode 100644
index 0000000..afd0602
--- /dev/null
+++ b/pvDataApp/pv/Makefile
@@ -0,0 +1,12 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVDATAAPP)/pv
+
+INC += pvType.h
+INC += pvIntrospect.h
+INC += pvData.h
+INC += convert.h
+INC += standardField.h
+INC += standardPVField.h
+INC += pvSubArrayCopy.h
+
diff --git a/pvDataApp/pvMisc/Makefile b/pvDataApp/pvMisc/Makefile
new file mode 100644
index 0000000..b942450
--- /dev/null
+++ b/pvDataApp/pvMisc/Makefile
@@ -0,0 +1,8 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVDATAAPP)/pvMisc
+
+INC += bitSetUtil.h
+
+LIBSRCS += bitSetUtil.cpp
+