diff --git a/FDBLibTLS/FDBLibTLSPlugin.cpp b/FDBLibTLS/FDBLibTLSPlugin.cpp
index 2709dfd234..6bcdb48600 100644
--- a/FDBLibTLS/FDBLibTLSPlugin.cpp
+++ b/FDBLibTLS/FDBLibTLSPlugin.cpp
@@ -20,9 +20,9 @@
 
 #include "boost/config.hpp"
 
-#include "FDBLibTLSPlugin.h"
-#include "FDBLibTLSPolicy.h"
-#include "Trace.h"
+#include "FDBLibTLS/FDBLibTLSPlugin.h"
+#include "FDBLibTLS/FDBLibTLSPolicy.h"
+#include "flow/Trace.h"
 
 #include <string.h>
 
diff --git a/FDBLibTLS/FDBLibTLSPlugin.h b/FDBLibTLS/FDBLibTLSPlugin.h
index b316ca9598..60466dbde6 100644
--- a/FDBLibTLS/FDBLibTLSPlugin.h
+++ b/FDBLibTLS/FDBLibTLSPlugin.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "ITLSPlugin.h"
+#include "fdbrpc/ITLSPlugin.h"
 #include "ReferenceCounted.h"
 
 #include <tls.h>
diff --git a/FDBLibTLS/FDBLibTLSPolicy.cpp b/FDBLibTLS/FDBLibTLSPolicy.cpp
index 003978573d..728ff871d6 100644
--- a/FDBLibTLS/FDBLibTLSPolicy.cpp
+++ b/FDBLibTLS/FDBLibTLSPolicy.cpp
@@ -18,9 +18,9 @@
  * limitations under the License.
  */
 
-#include "FDBLibTLSPolicy.h"
-#include "FDBLibTLSSession.h"
-#include "Trace.h"
+#include "FDBLibTLS/FDBLibTLSPolicy.h"
+#include "FDBLibTLS/FDBLibTLSSession.h"
+#include "flow/Trace.h"
 
 #include <openssl/bio.h>
 #include <openssl/err.h>
diff --git a/FDBLibTLS/FDBLibTLSPolicy.h b/FDBLibTLS/FDBLibTLSPolicy.h
index 6a2563a68a..fec32de3d8 100644
--- a/FDBLibTLS/FDBLibTLSPolicy.h
+++ b/FDBLibTLS/FDBLibTLSPolicy.h
@@ -23,11 +23,11 @@
 
 #pragma once
 
-#include "ITLSPlugin.h"
+#include "fdbrpc/ITLSPlugin.h"
 #include "ReferenceCounted.h"
 
-#include "FDBLibTLSPlugin.h"
-#include "FDBLibTLSVerify.h"
+#include "FDBLibTLS/FDBLibTLSPlugin.h"
+#include "FDBLibTLS/FDBLibTLSVerify.h"
 
 #include <string>
 #include <vector>
diff --git a/FDBLibTLS/FDBLibTLSSession.cpp b/FDBLibTLS/FDBLibTLSSession.cpp
index d754e60854..cd97d04107 100644
--- a/FDBLibTLS/FDBLibTLSSession.cpp
+++ b/FDBLibTLS/FDBLibTLSSession.cpp
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#include "FDBLibTLSSession.h"
-#include "Trace.h"
+#include "FDBLibTLS/FDBLibTLSSession.h"
+#include "flow/Trace.h"
 
 #include <openssl/bio.h>
 #include <openssl/err.h>
diff --git a/FDBLibTLS/FDBLibTLSSession.h b/FDBLibTLS/FDBLibTLSSession.h
index 7bf1edc32c..2028efd469 100644
--- a/FDBLibTLS/FDBLibTLSSession.h
+++ b/FDBLibTLS/FDBLibTLSSession.h
@@ -23,12 +23,12 @@
 
 #pragma once
 
-#include "ITLSPlugin.h"
+#include "fdbrpc/ITLSPlugin.h"
 #include "ReferenceCounted.h"
 
-#include "FDBLibTLSPolicy.h"
-#include "FDBLibTLSVerify.h"
-#include "IRandom.h"
+#include "FDBLibTLS/FDBLibTLSPolicy.h"
+#include "FDBLibTLS/FDBLibTLSVerify.h"
+#include "flow/IRandom.h"
 
 #include <tls.h>
 
diff --git a/FDBLibTLS/FDBLibTLSVerify.cpp b/FDBLibTLS/FDBLibTLSVerify.cpp
index 43f30debc8..594389916f 100644
--- a/FDBLibTLS/FDBLibTLSVerify.cpp
+++ b/FDBLibTLS/FDBLibTLSVerify.cpp
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-#include "FDBLibTLSVerify.h"
+#include "FDBLibTLS/FDBLibTLSVerify.h"
 
 #include <openssl/objects.h>
 
diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk
index 637bfd1743..b3385ed97f 100644
--- a/FDBLibTLS/local.mk
+++ b/FDBLibTLS/local.mk
@@ -23,6 +23,6 @@
 FDBLibTLS_BUILD_SOURCES +=
 
 
-FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -Iflow -Ifdbrpc -DUSE_UCONTEXT
+FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -I. -Iflow -Ifdbrpc -DUSE_UCONTEXT
 
 lib/libFDBLibTLS.a: bin/coverage.FDBLibTLS.xml
diff --git a/FDBLibTLS/plugin-test.cpp b/FDBLibTLS/plugin-test.cpp
index df6f0443f9..f06b0c8808 100644
--- a/FDBLibTLS/plugin-test.cpp
+++ b/FDBLibTLS/plugin-test.cpp
@@ -30,10 +30,10 @@
 
 #include <boost/circular_buffer.hpp>
 
-#include "ITLSPlugin.h"
+#include "fdbrpc/ITLSPlugin.h"
 #include "ReferenceCounted.h"
 
-#include "FDBLibTLSPlugin.h"
+#include "FDBLibTLS/FDBLibTLSPlugin.h"
 
 #define TESTDATA "./testdata/"
 
diff --git a/FDBLibTLS/verify-test.cpp b/FDBLibTLS/verify-test.cpp
index 206b5de282..4912b960bd 100644
--- a/FDBLibTLS/verify-test.cpp
+++ b/FDBLibTLS/verify-test.cpp
@@ -27,11 +27,11 @@
 
 #include <openssl/objects.h>
 
-#include "ITLSPlugin.h"
+#include "fdbrpc/ITLSPlugin.h"
 #include "ReferenceCounted.h"
 
-#include "FDBLibTLSPlugin.h"
-#include "FDBLibTLSPolicy.h"
+#include "FDBLibTLS/FDBLibTLSPlugin.h"
+#include "FDBLibTLS/FDBLibTLSPolicy.h"
 
 struct FDBLibTLSVerifyTest {
 	FDBLibTLSVerifyTest(std::string input):