diff --git a/src/Makefile b/src/Makefile
index 4741972..c915322 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,9 +3,6 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I$(INSTALL_LOCATION)/include
-
 PVDATA_SRC = $(TOP)/src
 
 include $(PVDATA_SRC)/misc/Makefile
diff --git a/src/copy/Makefile b/src/copy/Makefile
index fd9f468..cfd73f6 100644
--- a/src/copy/Makefile
+++ b/src/copy/Makefile
@@ -2,8 +2,8 @@
 
 SRC_DIRS += $(PVDATA_SRC)/copy
 
-INC += createRequest.h
-INC += pvCopy.h
+INC += pv/createRequest.h
+INC += pv/pvCopy.h
 
 LIBSRCS += createRequest.cpp
 LIBSRCS += pvCopy.cpp
diff --git a/src/factory/Makefile b/src/factory/Makefile
index 23f211e..cb6619c 100644
--- a/src/factory/Makefile
+++ b/src/factory/Makefile
@@ -2,7 +2,7 @@
 
 SRC_DIRS += $(PVDATA_SRC)/factory
 
-INC += factory.h
+INC += pv/factory.h
 LIBSRCS += TypeFunc.cpp
 LIBSRCS += FieldCreateFactory.cpp
 LIBSRCS += PVField.cpp
diff --git a/src/misc/Makefile b/src/misc/Makefile
index 89b6856..82e6107 100644
--- a/src/misc/Makefile
+++ b/src/misc/Makefile
@@ -2,29 +2,29 @@
 
 SRC_DIRS += $(PVDATA_SRC)/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 += sharedVector.h
-INC += templateMeta.h
-INC += current_function.h
+INC += pv/noDefaultMethods.h
+INC += pv/lock.h
+INC += pv/requester.h
+INC += pv/serialize.h
+INC += pv/bitSet.h
+INC += pv/byteBuffer.h
+INC += pv/epicsException.h
+INC += pv/serializeHelper.h
+INC += pv/event.h
+INC += pv/thread.h
+INC += pv/executor.h
+INC += pv/timeFunction.h
+INC += pv/timer.h
+INC += pv/queue.h
+INC += pv/messageQueue.h
+INC += pv/destroyable.h
+INC += pv/status.h
+INC += pv/sharedPtr.h
+INC += pv/localStaticLock.h
+INC += pv/typeCast.h
+INC += pv/sharedVector.h
+INC += pv/templateMeta.h
+INC += pv/current_function.h
 
 LIBSRCS += byteBuffer.cpp
 LIBSRCS += bitSet.cpp
diff --git a/src/misc/parseToPOD.cpp b/src/misc/parseToPOD.cpp
index d3c1598..4ac3788 100644
--- a/src/misc/parseToPOD.cpp
+++ b/src/misc/parseToPOD.cpp
@@ -12,7 +12,7 @@
 #include <epicsConvert.h>
 
 #define epicsExportSharedSymbols
-#include "typeCast.h"
+#include "pv/typeCast.h"
 
 using std::string;
 
diff --git a/src/misc/typeCast.cpp b/src/misc/typeCast.cpp
index a3aecbe..14587e7 100644
--- a/src/misc/typeCast.cpp
+++ b/src/misc/typeCast.cpp
@@ -8,7 +8,7 @@
 #include <sstream>
 
 #define epicsExportSharedSymbols
-#include "typeCast.h"
+#include "pv/typeCast.h"
 
 using epics::pvData::castUnsafe;
 using epics::pvData::ScalarType;
diff --git a/src/monitor/Makefile b/src/monitor/Makefile
index 7488c79..27ca0ad 100644
--- a/src/monitor/Makefile
+++ b/src/monitor/Makefile
@@ -2,8 +2,8 @@
 
 SRC_DIRS += $(PVDATA_SRC)/monitor
 
-INC += monitor.h
-INC += monitorPlugin.h
+INC += pv/monitor.h
+INC += pv/monitorPlugin.h
 
 LIBSRCS += monitor.cpp
-LIBSRCS += monitorPlugin.cpp
\ No newline at end of file
+LIBSRCS += monitorPlugin.cpp
diff --git a/src/property/Makefile b/src/property/Makefile
index f417542..f99a9ed 100644
--- a/src/property/Makefile
+++ b/src/property/Makefile
@@ -2,15 +2,15 @@
 
 SRC_DIRS += $(PVDATA_SRC)/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
+INC += pv/alarm.h
+INC += pv/pvAlarm.h
+INC += pv/control.h
+INC += pv/pvControl.h
+INC += pv/display.h
+INC += pv/pvDisplay.h
+INC += pv/pvEnumerated.h
+INC += pv/timeStamp.h
+INC += pv/pvTimeStamp.h
 
 LIBSRCS += alarm.cpp
 LIBSRCS += pvAlarm.cpp
diff --git a/src/pv/Makefile b/src/pv/Makefile
index 00719b4..2b7a374 100644
--- a/src/pv/Makefile
+++ b/src/pv/Makefile
@@ -2,11 +2,11 @@
 
 SRC_DIRS += $(PVDATA_SRC)/pv
 
-INC += pvType.h
-INC += pvIntrospect.h
-INC += pvData.h
-INC += convert.h
-INC += standardField.h
-INC += standardPVField.h
-INC += pvSubArrayCopy.h
+INC += pv/pvType.h
+INC += pv/pvIntrospect.h
+INC += pv/pvData.h
+INC += pv/convert.h
+INC += pv/standardField.h
+INC += pv/standardPVField.h
+INC += pv/pvSubArrayCopy.h
 
diff --git a/src/pvMisc/Makefile b/src/pvMisc/Makefile
index 6809118..6cd8005 100644
--- a/src/pvMisc/Makefile
+++ b/src/pvMisc/Makefile
@@ -2,7 +2,7 @@
 
 SRC_DIRS += $(PVDATA_SRC)/pvMisc
 
-INC += bitSetUtil.h
+INC += pv/bitSetUtil.h
 
 LIBSRCS += bitSetUtil.cpp