diff --git a/pvAccessApp/rpcService/rpcServer.h b/pvAccessApp/rpcService/rpcServer.h
index e3918e7..677067c 100644
--- a/pvAccessApp/rpcService/rpcServer.h
+++ b/pvAccessApp/rpcService/rpcServer.h
@@ -10,7 +10,7 @@
 #include <pv/sharedPtr.h>
 #include <pv/pvAccess.h>
 
-#include <rpcService.h>
+#include <pv/rpcService.h>
 #include <pv/serverContext.h>
 
 namespace epics { namespace pvAccess { 
diff --git a/testApp/client/MockClientImpl.cpp b/testApp/client/MockClientImpl.cpp
index ea36214..60b4e2b 100644
--- a/testApp/client/MockClientImpl.cpp
+++ b/testApp/client/MockClientImpl.cpp
@@ -5,8 +5,8 @@
 #include <epicsExit.h>
 #include <pv/pvAccess.h>
 #include <iostream>
-#include <lock.h>
-#include <standardPVField.h>
+#include <pv/lock.h>
+#include <pv/standardPVField.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;