diff --git a/build.json b/build.json
index 659b24d0768a702ad132b9693d1b8949d315f3ed..385e2c9675ec79e98fa00ef5bda79ad0aaf8aa27 100644
--- a/build.json
+++ b/build.json
@@ -282,8 +282,7 @@
         "src/core/tsi/fake_transport_security.h",
         "src/core/tsi/ssl_transport_security.h",
         "src/core/tsi/transport_security.h",
-        "src/core/tsi/transport_security_interface.h",
-        "src/core/tsi/transport_security_test_lib.h"
+        "src/core/tsi/transport_security_interface.h"
       ],
       "deps": [
         "gpr"
diff --git a/src/cpp/client/credentials.cc b/src/cpp/client/credentials.cc
index 430582b263bb4cedbb8a9d9830f4924aee5ac4a5..cac1d3d106ca5ca2f2585c4a6b2530c1bd157805 100644
--- a/src/cpp/client/credentials.cc
+++ b/src/cpp/client/credentials.cc
@@ -34,7 +34,7 @@
 
 #include <string>
 
-#include <grpc/grpc_security_google.h>
+#include <grpc/grpc_security.h>
 #include <grpc/support/log.h>
 
 #include <grpc++/credentials.h>
diff --git a/src/cpp/server/server_credentials.cc b/src/cpp/server/server_credentials.cc
index fe6c8f9a986f480f0a5cef2dc8c6f87a3ff109f4..f9ca1622bacdfd3f6a0767691bb6fd215f44774e 100644
--- a/src/cpp/server/server_credentials.cc
+++ b/src/cpp/server/server_credentials.cc
@@ -32,7 +32,7 @@
  */
 
 
-#include <grpc/grpc_security_google.h>
+#include <grpc/grpc_security.h>
 
 #include <grpc++/server_credentials.h>
 
diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj
index 9a8c0e2edda2ee52c60a3d6782384b61eb1354e3..9f3ec8c597cd9cda6a33df96077d229834934953 100644
--- a/vsprojects/vs2013/grpc.vcxproj
+++ b/vsprojects/vs2013/grpc.vcxproj
@@ -91,7 +91,6 @@
     <ClInclude Include="..\..\src\core\tsi\ssl_transport_security.h" />
     <ClInclude Include="..\..\src\core\tsi\transport_security.h" />
     <ClInclude Include="..\..\src\core\tsi\transport_security_interface.h" />
-    <ClInclude Include="..\..\src\core\tsi\transport_security_test_lib.h" />
     <ClInclude Include="..\..\src\core\channel\census_filter.h" />
     <ClInclude Include="..\..\src\core\channel\channel_args.h" />
     <ClInclude Include="..\..\src\core\channel\channel_stack.h" />
diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj b/vsprojects/vs2013/grpc_unsecure.vcxproj
index 9a8c0e2edda2ee52c60a3d6782384b61eb1354e3..9f3ec8c597cd9cda6a33df96077d229834934953 100644
--- a/vsprojects/vs2013/grpc_unsecure.vcxproj
+++ b/vsprojects/vs2013/grpc_unsecure.vcxproj
@@ -91,7 +91,6 @@
     <ClInclude Include="..\..\src\core\tsi\ssl_transport_security.h" />
     <ClInclude Include="..\..\src\core\tsi\transport_security.h" />
     <ClInclude Include="..\..\src\core\tsi\transport_security_interface.h" />
-    <ClInclude Include="..\..\src\core\tsi\transport_security_test_lib.h" />
     <ClInclude Include="..\..\src\core\channel\census_filter.h" />
     <ClInclude Include="..\..\src\core\channel\channel_args.h" />
     <ClInclude Include="..\..\src\core\channel\channel_stack.h" />