diff --git a/src/ca/Makefile b/src/ca/Makefile
index 77de12d..640dd40 100644
--- a/src/ca/Makefile
+++ b/src/ca/Makefile
@@ -2,9 +2,17 @@ TOP = ../..
 include $(TOP)/configure/CONFIG
 
 LIBRARY += pvAccessCA
-pvAccessCA_LIBS += ca pvAccess pvData Com
+pvAccessCA_LIBS += ca pvAccess pvData
+ifdef WITH_MICROBENCH
+  LIB_LIBS += pvMB
+endif
+LIB_LIBS += Com
+
+# needed for Windows
+LIB_SYS_LIBS_WIN32 += ws2_32
 
 INC += pv/caProvider.h
+INC += pv/caStatus.h
 
 pvAccessCA_SRCS += caProvider.cpp
 pvAccessCA_SRCS += caChannel.cpp
diff --git a/src/ca/caChannel.cpp b/src/ca/caChannel.cpp
index cbc31e5..d65f142 100644
--- a/src/ca/caChannel.cpp
+++ b/src/ca/caChannel.cpp
@@ -12,7 +12,7 @@
 #include <pv/pvAccess.h>
 
 #include "caChannel.h"
-#include "caStatus.h"
+#include <pv/caStatus.h>
 
 using namespace epics::pvData;
 using std::string;
diff --git a/src/ca/caStatus.cpp b/src/ca/caStatus.cpp
index 7f97221..9eab588 100644
--- a/src/ca/caStatus.cpp
+++ b/src/ca/caStatus.cpp
@@ -4,7 +4,7 @@
  * in file LICENSE that is included with this distribution.
  */
 
-#include "caStatus.h"
+#include <pv/caStatus.h>
 
 namespace epics {
 namespace pvAccess {
diff --git a/src/ca/caStatus.h b/src/ca/pv/caStatus.h
similarity index 100%
rename from src/ca/caStatus.h
rename to src/ca/pv/caStatus.h