diff --git a/include/freerdp/types.h b/include/freerdp/types.h
index 5fa72377f..3b12a68c6 100644
--- a/include/freerdp/types.h
+++ b/include/freerdp/types.h
@@ -21,6 +21,8 @@
 #ifndef FREERDP_TYPES_H
 #define FREERDP_TYPES_H
 
+#include <winpr/wtypes.h>
+
 #include <freerdp/config.h>
 
 #ifdef _WIN32
diff --git a/server/X11/xf_peer.c b/server/X11/xf_peer.c
index e20c11938..33dd51ca6 100644
--- a/server/X11/xf_peer.c
+++ b/server/X11/xf_peer.c
@@ -32,6 +32,7 @@
 #include <X11/Xutil.h>
 #include <sys/select.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/locale/keyboard.h>
 #include <freerdp/codec/color.h>
 #include <freerdp/utils/file.h>
diff --git a/winpr/include/winpr/sspi.h b/winpr/include/winpr/sspi.h
index 80f9611cb..6320472e8 100644
--- a/winpr/include/winpr/sspi.h
+++ b/winpr/include/winpr/sspi.h
@@ -669,7 +669,7 @@ struct _SecBufferDesc
 typedef struct _SecBufferDesc SecBufferDesc;
 typedef SecBufferDesc* PSecBufferDesc;
 
-typedef void (SEC_ENTRY * SEC_GET_KEY_FN)(void* Arg, void* Principal, UINT32 KeyVer, void** Key, SECURITY_STATUS* Status);
+typedef void (SEC_ENTRY * SEC_GET_KEY_FN)(void* Arg, void* Principal, UINT32 KeyVer, void** Key, SECURITY_STATUS* pStatus);
 
 typedef SECURITY_STATUS (SEC_ENTRY * ENUMERATE_SECURITY_PACKAGES_FN_A)(ULONG* pcPackages, PSecPkgInfoA* ppPackageInfo);
 typedef SECURITY_STATUS (SEC_ENTRY * ENUMERATE_SECURITY_PACKAGES_FN_W)(ULONG* pcPackages, PSecPkgInfoW* ppPackageInfo);