diff --git a/cunit/CMakeLists.txt b/cunit/CMakeLists.txt
index f2eaf2172..be92e8fb4 100644
--- a/cunit/CMakeLists.txt
+++ b/cunit/CMakeLists.txt
@@ -83,6 +83,7 @@ target_link_libraries(test_freerdp freerdp-utils)
 target_link_libraries(test_freerdp freerdp-channels)
 target_link_libraries(test_freerdp freerdp-codec)
 target_link_libraries(test_freerdp freerdp-crypto)
-target_link_libraries(test_freerdp freerdp-sspi)
+
+target_link_libraries(test_freerdp winpr-sspi)
 
 add_test(CUnitTests ${EXECUTABLE_OUTPUT_PATH}/test_freerdp)
diff --git a/cunit/test_mppc_enc.c b/cunit/test_mppc_enc.c
index 9b5b8a8f2..de79e064e 100644
--- a/cunit/test_mppc_enc.c
+++ b/cunit/test_mppc_enc.c
@@ -24,13 +24,14 @@
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/types.h>
+
 #include <freerdp/freerdp.h>
+#include <freerdp/utils/time.h>
 
 #include <freerdp/codec/mppc_dec.h>
 #include <freerdp/codec/mppc_enc.h>
 #include "test_mppc_enc.h"
 
-
 #define BUF_SIZE (1024 * 1)
 
 #define DEBUG_MPPC_ENC_TEST 0
diff --git a/cunit/test_ntlm.c b/cunit/test_ntlm.c
index 9ff7b9685..3563b4acc 100644
--- a/cunit/test_ntlm.c
+++ b/cunit/test_ntlm.c
@@ -19,12 +19,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <freerdp/freerdp.h>
-#include <freerdp/sspi/sspi.h>
 
-#include "libfreerdp-sspi/NTLM/ntlm.h"
-#include "libfreerdp-sspi/NTLM/ntlm_compute.h"
-#include "libfreerdp-sspi/NTLM/ntlm_message.h"
+#include <winpr/sspi.h>
+#include <freerdp/freerdp.h>
+
+#include "libwinpr-sspi/NTLM/ntlm.h"
+#include "libwinpr-sspi/NTLM/ntlm_compute.h"
+#include "libwinpr-sspi/NTLM/ntlm_message.h"
 
 #include "test_ntlm.h"
 
diff --git a/cunit/test_sspi.c b/cunit/test_sspi.c
index db561f691..a8015ef15 100644
--- a/cunit/test_sspi.c
+++ b/cunit/test_sspi.c
@@ -17,13 +17,14 @@
  * limitations under the License.
  */
 
+#include <winpr/sspi.h>
 #include <freerdp/freerdp.h>
+
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/hexdump.h>
 
 #include "test_sspi.h"
-#include <freerdp/sspi/sspi.h>
 
 #define NTLM_PACKAGE_NAME		"NTLM"
 
diff --git a/freerdp.pc.in b/freerdp.pc.in
index 796a8c698..e0a3c3f47 100644
--- a/freerdp.pc.in
+++ b/freerdp.pc.in
@@ -8,6 +8,6 @@ Description: A free remote desktop protocol client
 URL: http://www.freerdp.com/
 Version: @FREERDP_VERSION_FULL@
 Requires: 
-Libs: -L${libdir} -lfreerdp-cache -lfreerdp-channels -lfreerdp-codec -lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-rail -lfreerdp-sspi -lfreerdp-utils
+Libs: -L${libdir} -lfreerdp-cache -lfreerdp-channels -lfreerdp-codec -lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-rail -lfreerdp-utils -lwinpr-sspi -lwinpr-rpc
 Cflags: -I${includedir}
 
diff --git a/freerdp.spec b/freerdp.spec
index 96c655e61..369a283a7 100644
--- a/freerdp.spec
+++ b/freerdp.spec
@@ -70,7 +70,7 @@ Requires:       %{name}-libs = %{version}-%{release}
 Requires:       pkgconfig
 %description    devel
 Header files and unversioned libraries for libfreerdp-core, libfreerdp-channels,
-libfreerdp-kbd, libfreerdp-cache, libfreerdp-codec, libfreerdp-rail,
+libfreerdp-locale, libfreerdp-cache, libfreerdp-codec, libfreerdp-rail,
 libfreerdp-gdi and libfreerdp-utils.
 
 %prep
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index ba0ba4d3a..d02ac589c 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -30,3 +30,6 @@ install(DIRECTORY freerdp/plugins DESTINATION include/freerdp FILES_MATCHING PAT
 install(DIRECTORY freerdp/locale DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY freerdp/crypto DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY freerdp/auth DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
+
+file(GLOB HEADERS "winpr/*.h")
+install_files(/include/winpr FILES ${HEADERS})
diff --git a/server/X11/CMakeLists.txt b/server/X11/CMakeLists.txt
index 441869a39..11a4202f3 100644
--- a/server/X11/CMakeLists.txt
+++ b/server/X11/CMakeLists.txt
@@ -65,6 +65,6 @@ target_link_libraries(xfreerdp-server freerdp-codec)
 target_link_libraries(xfreerdp-server freerdp-utils)
 target_link_libraries(xfreerdp-server freerdp-gdi)
 target_link_libraries(xfreerdp-server freerdp-crypto)
-target_link_libraries(xfreerdp-server freerdp-sspi)
 target_link_libraries(xfreerdp-server freerdp-locale)
 target_link_libraries(xfreerdp-server ${X11_LIBRARIES})
+target_link_libraries(xfreerdp-server winpr-sspi)