From 2cfcee0e2d0c1060bbe4d4c90faca1ecb7e8cc32 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Tue, 26 Jan 2016 15:51:10 -0500
Subject: [PATCH] fixup inconsistent includes

---
 src/ca/pv/caChannel.h              | 2 +-
 src/mb/pvAccessMB.cpp              | 2 +-
 src/pva/pv/pvaVersion.h            | 2 +-
 src/remote/blockingTCPAcceptor.cpp | 2 +-
 src/rpcClient/rpcClient.cpp        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ca/pv/caChannel.h b/src/ca/pv/caChannel.h
index ebeb437..46c9304 100644
--- a/src/ca/pv/caChannel.h
+++ b/src/ca/pv/caChannel.h
@@ -12,7 +12,7 @@
 /* for CA */
 #include <cadef.h>
 
-#include <caProvider.h>
+#include <pv/caProvider.h>
 
 namespace epics {
 namespace pvAccess {
diff --git a/src/mb/pvAccessMB.cpp b/src/mb/pvAccessMB.cpp
index 8cd5b96..fb33716 100644
--- a/src/mb/pvAccessMB.cpp
+++ b/src/mb/pvAccessMB.cpp
@@ -1,3 +1,3 @@
-#include "pvAccessMB.h"
+#include "pv/pvAccessMB.h"
 
 MB_DECLARE(channelGet, 100000);
diff --git a/src/pva/pv/pvaVersion.h b/src/pva/pv/pvaVersion.h
index 969c5b2..2ea2f13 100644
--- a/src/pva/pv/pvaVersion.h
+++ b/src/pva/pv/pvaVersion.h
@@ -22,7 +22,7 @@
 
 #include <shareLib.h>
 
-#include "pvaVersionNum.h"
+#include "pv/pvaVersionNum.h"
 
 namespace epics {
 namespace pvAccess {
diff --git a/src/remote/blockingTCPAcceptor.cpp b/src/remote/blockingTCPAcceptor.cpp
index 32ce611..940309a 100644
--- a/src/remote/blockingTCPAcceptor.cpp
+++ b/src/remote/blockingTCPAcceptor.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <pv/blockingTCP.h>
-#include "codec.h"
+#include <pv/codec.h>
 #include <pv/remote.h>
 #include <pv/logger.h>
 
diff --git a/src/rpcClient/rpcClient.cpp b/src/rpcClient/rpcClient.cpp
index 329ac2c..aedab53 100644
--- a/src/rpcClient/rpcClient.cpp
+++ b/src/rpcClient/rpcClient.cpp
@@ -16,7 +16,7 @@
 #include <pv/logger.h>
 #include <pv/rpcService.h>
 
-#include "rpcClient.h"
+#include "pv/rpcClient.h"
 
 
 using namespace epics::pvData;