diff --git a/include/winpr/wtypes.h b/include/winpr/wtypes.h
index bcc5e2e58..d7cdba3ac 100644
--- a/include/winpr/wtypes.h
+++ b/include/winpr/wtypes.h
@@ -208,6 +208,9 @@ typedef struct _SECURITY_ATTRIBUTES
 	BOOL bInheritHandle;
 } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
 
+typedef void* HMODULE;
+typedef void* FARPROC;
+
 #endif
 
 typedef BYTE byte;
@@ -223,7 +226,4 @@ typedef LONG NTSTATUS;
 typedef NTSTATUS *PNTSTATUS;
 #endif
 
-typedef void* HMODULE;
-typedef void* FARPROC;
-
 #endif /* WINPR_WTYPES_H */
diff --git a/libfreerdp-crypto/CMakeLists.txt b/libfreerdp-crypto/CMakeLists.txt
index 962ad09ab..6ad0d9af4 100644
--- a/libfreerdp-crypto/CMakeLists.txt
+++ b/libfreerdp-crypto/CMakeLists.txt
@@ -38,10 +38,10 @@ if(WIN32)
 	target_link_libraries(freerdp-crypto ws2_32)
 else()
 	target_link_libraries(freerdp-crypto ${ZLIB_LIBRARIES})	
+	target_link_libraries(freerdp-crypto winpr-library)
 endif()
 
 target_link_libraries(freerdp-crypto winpr-sspi)
-target_link_libraries(freerdp-crypto winpr-library)
 target_link_libraries(freerdp-crypto freerdp-utils)
 target_link_libraries(freerdp-crypto ${OPENSSL_LIBRARIES})
 
diff --git a/winpr/sspi/CMakeLists.txt b/winpr/sspi/CMakeLists.txt
index 1c4c92862..4ef5bf41a 100644
--- a/winpr/sspi/CMakeLists.txt
+++ b/winpr/sspi/CMakeLists.txt
@@ -62,10 +62,10 @@ set_target_properties(winpr-sspi PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVE
 if (NOT WIN32)
 	target_link_libraries(winpr-sspi winpr-crt)
 	target_link_libraries(winpr-sspi winpr-sysinfo)
+	target_link_libraries(winpr-sspi winpr-registry)
 endif()
 
 target_link_libraries(winpr-sspi winpr-utils)
-target_link_libraries(winpr-sspi winpr-registry)
 target_link_libraries(winpr-sspi ${ZLIB_LIBRARIES})
 target_link_libraries(winpr-sspi ${OPENSSL_LIBRARIES})