diff --git a/winpr/include/winpr/crt.h b/winpr/include/winpr/crt.h
index 628eb02c6..8d73a6b90 100644
--- a/winpr/include/winpr/crt.h
+++ b/winpr/include/winpr/crt.h
@@ -43,8 +43,8 @@ WINPR_API void* _aligned_offset_recalloc(void* memblock, size_t num, size_t size
 
 WINPR_API size_t _aligned_msize(void* memblock, size_t alignment, size_t offset);
 
-#endif
-
 WINPR_API void _aligned_free(void* memblock);
 
+#endif
+
 #endif /* WINPR_CRT_H */
diff --git a/winpr/libwinpr/winsock/CMakeLists.txt b/winpr/libwinpr/winsock/CMakeLists.txt
index 9cdae68dc..602e57a74 100644
--- a/winpr/libwinpr/winsock/CMakeLists.txt
+++ b/winpr/libwinpr/winsock/CMakeLists.txt
@@ -26,8 +26,13 @@ endif()
 
 set_target_properties(winpr-winsock PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
 
-if(WITH_MONOLITHIC_BUILD)
+if(WIN32)
+	set(WINPR_WINSOCK_LIBS ${WINPR_WINSOCK_LIBS} ws2_32)
+endif()
 
+if(WITH_MONOLITHIC_BUILD)
+	set(WINPR_LIBS ${WINPR_LIBS} ${WINPR_WINSOCK_LIBS} PARENT_SCOPE)
 else()
+	target_link_libraries(winpr-winsock ${WINPR_WINSOCK_LIBS})
 	install(TARGETS winpr-winsock DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()