diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ae1759ec..cdc2d6386 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -757,6 +757,14 @@ endif()
 include_directories("${CMAKE_SOURCE_DIR}/winpr/include")
 include_directories("${CMAKE_BINARY_DIR}/winpr/include")
 
+if (${CMAKE_VERSION} VERSION_LESS 2.8.12)
+	set(PUBLIC_KEYWORD "")
+	set(PRIVATE_KEYWORD "")
+else()
+	set(PUBLIC_KEYWORD "PUBLIC")
+	set(PRIVATE_KEYWORD "PRIVATE")
+endif()
+
 add_subdirectory(winpr)
 
 # Sub-directories
@@ -807,14 +815,6 @@ if(WITH_CHANNELS)
 	add_subdirectory(channels)
 endif()
 
-if (${CMAKE_VERSION} VERSION_LESS 2.8.12)
-	set(PUBLIC_KEYWORD "")
-	set(PRIVATE_KEYWORD "")
-else()
-	set(PUBLIC_KEYWORD "PUBLIC")
-	set(PRIVATE_KEYWORD "PRIVATE")
-endif()
-
 if(WITH_CLIENT_COMMON OR WITH_CLIENT)
 add_subdirectory(client)
 endif()
diff --git a/channels/disp/client/CMakeLists.txt b/channels/disp/client/CMakeLists.txt
index 6bed7bfff..d0bbaeb56 100644
--- a/channels/disp/client/CMakeLists.txt
+++ b/channels/disp/client/CMakeLists.txt
@@ -27,7 +27,7 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE
 
 
 
-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
diff --git a/channels/echo/client/CMakeLists.txt b/channels/echo/client/CMakeLists.txt
index 7c15794dc..e94992be4 100644
--- a/channels/echo/client/CMakeLists.txt
+++ b/channels/echo/client/CMakeLists.txt
@@ -25,11 +25,6 @@ include_directories(..)
 
 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
 
-
-
-target_link_libraries(${MODULE_NAME} freerdp)
-
-
 if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
 	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()
diff --git a/channels/tsmf/client/alsa/CMakeLists.txt b/channels/tsmf/client/alsa/CMakeLists.txt
index f1d5292dc..1b1a610ab 100644
--- a/channels/tsmf/client/alsa/CMakeLists.txt
+++ b/channels/tsmf/client/alsa/CMakeLists.txt
@@ -26,5 +26,4 @@ include_directories(${ALSA_INCLUDE_DIRS})
 add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "")
 
 
-
-target_link_libraries(${MODULE_NAME} freerdp ${ALSA_LIBRARIES})
+target_link_libraries(${MODULE_NAME} ${ALSA_LIBRARIES})
diff --git a/channels/tsmf/client/gstreamer/CMakeLists.txt b/channels/tsmf/client/gstreamer/CMakeLists.txt
index 8557f6e09..e3ec913d3 100644
--- a/channels/tsmf/client/gstreamer/CMakeLists.txt
+++ b/channels/tsmf/client/gstreamer/CMakeLists.txt
@@ -59,7 +59,4 @@ set(${MODULE_PREFIX}_SRCS "${SRC}")
 include_directories(..)
 
 add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "")
-
-
-
-target_link_libraries(${MODULE_NAME} ${LIBS} freerdp)
+target_link_libraries(${MODULE_NAME} ${LIBS})
diff --git a/channels/tsmf/client/oss/CMakeLists.txt b/channels/tsmf/client/oss/CMakeLists.txt
index 4137f437b..065d589a1 100644
--- a/channels/tsmf/client/oss/CMakeLists.txt
+++ b/channels/tsmf/client/oss/CMakeLists.txt
@@ -25,6 +25,3 @@ include_directories(${OSS_INCLUDE_DIRS})
 
 add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "")
 
-
-
-target_link_libraries(${MODULE_NAME} freerdp ${OSS_LIBRARIES})
diff --git a/channels/tsmf/client/pulse/CMakeLists.txt b/channels/tsmf/client/pulse/CMakeLists.txt
index ab8a5ac4b..005260e68 100644
--- a/channels/tsmf/client/pulse/CMakeLists.txt
+++ b/channels/tsmf/client/pulse/CMakeLists.txt
@@ -24,7 +24,3 @@ include_directories(..)
 include_directories(${PULSE_INCLUDE_DIR})
 
 add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "")
-
-
-
-target_link_libraries(${MODULE_NAME} freerdp)
diff --git a/channels/tsmf/client/pulse/tsmf_pulse.c b/channels/tsmf/client/pulse/tsmf_pulse.c
index 5a8c90d8c..e9ea79b7d 100644
--- a/channels/tsmf/client/pulse/tsmf_pulse.c
+++ b/channels/tsmf/client/pulse/tsmf_pulse.c
@@ -359,12 +359,10 @@ static void tsmf_pulse_free(ITSMFAudioDevice *audio)
 }
 
 #ifdef STATIC_CHANNELS
-#define freerdp_tsmf_client_audio_subsystem_entry	pulse_freerdp_tsmf_client_audio_subsystem_entry
+ITSMFAudioDevice *pulse_freerdp_tsmf_client_audio_subsystem_entry(void)
 #else
-#define freerdp_tsmf_client_audio_subsystem_entry	FREERDP_API freerdp_tsmf_client_audio_subsystem_entry
+FREERDP_API ITSMFAudioDevice *freerdp_tsmf_client_audio_subsystem_entry(void)
 #endif
-
-ITSMFAudioDevice *freerdp_tsmf_client_audio_subsystem_entry(void)
 {
 	TSMFPulseAudioDevice *pulse;
 
diff --git a/client/Wayland/CMakeLists.txt b/client/Wayland/CMakeLists.txt
index 25c69a281..e95055f37 100644
--- a/client/Wayland/CMakeLists.txt
+++ b/client/Wayland/CMakeLists.txt
@@ -31,7 +31,6 @@ set(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${CMAKE_DL_LIBS})
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client freerdp uwac)
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt
index f65817f89..b648db348 100644
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@@ -70,8 +70,7 @@ else()
 endif()
 
 set(${MODULE_PREFIX}_LIBS
-	${X11_LIBRARIES}
-	${CMAKE_DL_LIBS})
+	${X11_LIBRARIES})
 
 if(WITH_MANPAGES)
 	find_program(XSLTPROC_EXECUTABLE NAMES xsltproc)
@@ -203,11 +202,11 @@ endif()
 
 include_directories(${CMAKE_SOURCE_DIR}/resources)
 
-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp freerdp-client)
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)
+target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
 
 if(WITH_IPP)
-    target_link_libraries(${MODULE_NAME} ${IPP_LIBRARY_LIST})
+    target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${IPP_LIBRARY_LIST})
 endif()
 
 if(WITH_CLIENT_INTERFACE)
diff --git a/client/X11/cli/CMakeLists.txt b/client/X11/cli/CMakeLists.txt
index 5b2bc5887..d90ff716e 100644
--- a/client/X11/cli/CMakeLists.txt
+++ b/client/X11/cli/CMakeLists.txt
@@ -26,7 +26,7 @@ set(${MODULE_PREFIX}_SRCS
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp" RUNTIME_OUTPUT_DIRECTORY "..")
 
-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} xfreerdp-client)
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} xfreerdp-client freerdp-client)
 
 if(OPENBSD)
 	target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ossaudio)
diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
index 95c8e98e0..c9dacbc71 100644
--- a/client/common/CMakeLists.txt
+++ b/client/common/CMakeLists.txt
@@ -61,16 +61,11 @@ endif()
 add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
 include_directories(${OPENSSL_INCLUDE_DIR})
-include_directories(${ZLIB_INCLUDE_DIRS})
-
 if (WITH_LIBRARY_VERSIONING)
   set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
 endif()
 
-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
-	${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
-
-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
 
 target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${FREERDP_CHANNELS_CLIENT_LIBS})
 if(OPENBSD)
diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
index 95fa781d9..48400d3f1 100644
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -300,7 +300,7 @@ if (WITH_LIBRARY_VERSIONING)
 endif()
 
 
-target_link_libraries(${MODULE_NAME} ${LIBFREERDP_LIBS} winpr)
+target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${LIBFREERDP_LIBS} winpr)
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
 if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
     install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
diff --git a/libfreerdp/codec/test/CMakeLists.txt b/libfreerdp/codec/test/CMakeLists.txt
index 83574d8c2..70eecb7a9 100644
--- a/libfreerdp/codec/test/CMakeLists.txt
+++ b/libfreerdp/codec/test/CMakeLists.txt
@@ -21,7 +21,7 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} freerdp)
+target_link_libraries(${MODULE_NAME} freerdp winpr)
 
 set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
 
diff --git a/libfreerdp/common/CMakeLists.txt b/libfreerdp/common/CMakeLists.txt
index 1683f449d..14ad05c0a 100644
--- a/libfreerdp/common/CMakeLists.txt
+++ b/libfreerdp/common/CMakeLists.txt
@@ -25,10 +25,6 @@ set(${MODULE_PREFIX}_SRCS
 
 freerdp_module_add(${${MODULE_PREFIX}_SRCS})
 
-freerdp_include_directory_add(${ZLIB_INCLUDE_DIRS})
-
-freerdp_library_add(${ZLIB_LIBRARIES})
-
 if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
diff --git a/libfreerdp/core/CMakeLists.txt b/libfreerdp/core/CMakeLists.txt
index 03ef09634..83982f5b9 100644
--- a/libfreerdp/core/CMakeLists.txt
+++ b/libfreerdp/core/CMakeLists.txt
@@ -21,7 +21,6 @@ set(MODULE_PREFIX "FREERDP_CORE")
 freerdp_definition_add(-DEXT_PATH="${FREERDP_EXTENSION_PATH}")
 
 freerdp_include_directory_add(${OPENSSL_INCLUDE_DIR})
-freerdp_include_directory_add(${ZLIB_INCLUDE_DIRS})
 
 set(${MODULE_PREFIX}_GATEWAY_DIR "gateway")
 
@@ -135,8 +134,6 @@ freerdp_module_add(${${MODULE_PREFIX}_SRCS})
 if(WIN32)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ws2_32)
 	freerdp_library_add(ws2_32)
-else()
-	freerdp_library_add(${ZLIB_LIBRARIES})
 endif()
 
 freerdp_library_add(${OPENSSL_LIBRARIES})
diff --git a/libfreerdp/core/test/CMakeLists.txt b/libfreerdp/core/test/CMakeLists.txt
index 989346c59..01ea85d11 100644
--- a/libfreerdp/core/test/CMakeLists.txt
+++ b/libfreerdp/core/test/CMakeLists.txt
@@ -25,7 +25,7 @@ add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 add_definitions(-DTESTING_OUTPUT_DIRECTORY="${CMAKE_BINARY_DIR}")
 add_definitions(-DTESTING_SRC_DIRECTORY="${CMAKE_SOURCE_DIR}")
 
-target_link_libraries(${MODULE_NAME} freerdp-client freerdp winpr)
+target_link_libraries(${MODULE_NAME} freerdp winpr freerdp-client)
 
 set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
 
diff --git a/libfreerdp/crypto/CMakeLists.txt b/libfreerdp/crypto/CMakeLists.txt
index 37d422fc0..c56126ff9 100644
--- a/libfreerdp/crypto/CMakeLists.txt
+++ b/libfreerdp/crypto/CMakeLists.txt
@@ -29,7 +29,6 @@ freerdp_module_add(
 	tls.c)
 
 freerdp_include_directory_add(${OPENSSL_INCLUDE_DIR})
-freerdp_include_directory_add(${ZLIB_INCLUDE_DIRS})
 
 freerdp_library_add(${OPENSSL_LIBRARIES})
 
@@ -40,8 +39,6 @@ endif()
 
 if(WIN32)
 	freerdp_library_add(ws2_32)
-else()
-	freerdp_library_add(${ZLIB_LIBRARIES})
 endif()
 
 if(BUILD_TESTING)
diff --git a/libfreerdp/crypto/test/CMakeLists.txt b/libfreerdp/crypto/test/CMakeLists.txt
index acaf43ed7..80b91195e 100644
--- a/libfreerdp/crypto/test/CMakeLists.txt
+++ b/libfreerdp/crypto/test/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(${OPENSSL_INCLUDE_DIR})
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} freerdp)
+target_link_libraries(${MODULE_NAME} freerdp winpr)
 
 set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
 
diff --git a/libfreerdp/utils/CMakeLists.txt b/libfreerdp/utils/CMakeLists.txt
index 3c4aff09c..2efd0e834 100644
--- a/libfreerdp/utils/CMakeLists.txt
+++ b/libfreerdp/utils/CMakeLists.txt
@@ -32,7 +32,7 @@ endif()
 
 freerdp_module_add(${${MODULE_PREFIX}_SRCS})
 
-freerdp_library_add(${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+freerdp_library_add(${CMAKE_THREAD_LIBS_INIT})
 
 if(WIN32)
 	freerdp_library_add(ws2_32)
diff --git a/libfreerdp/utils/test/CMakeLists.txt b/libfreerdp/utils/test/CMakeLists.txt
index a08ee112d..5fbcf4dbf 100644
--- a/libfreerdp/utils/test/CMakeLists.txt
+++ b/libfreerdp/utils/test/CMakeLists.txt
@@ -13,7 +13,7 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} winpr freerdp)
+target_link_libraries(${MODULE_NAME} freerdp)
 
 set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
 
diff --git a/rdtk/librdtk/CMakeLists.txt b/rdtk/librdtk/CMakeLists.txt
index b6caf80c4..94c8776f9 100644
--- a/rdtk/librdtk/CMakeLists.txt
+++ b/rdtk/librdtk/CMakeLists.txt
@@ -62,7 +62,7 @@ if (WITH_LIBRARY_VERSIONING)
 	set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${RDTK_VERSION} SOVERSION ${RDTK_API_VERSION})
 endif()
 
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT RdTkTargets)
 if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
diff --git a/rdtk/sample/CMakeLists.txt b/rdtk/sample/CMakeLists.txt
index 3e7a1c5a2..3a7f4ffcc 100644
--- a/rdtk/sample/CMakeLists.txt
+++ b/rdtk/sample/CMakeLists.txt
@@ -29,7 +29,7 @@ set(${MODULE_PREFIX}_LIBS rdtk)
 
 list(APPEND ${MODULE_PREFIX}_LIBS ${X11_LIBRARIES})
 
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr)
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "RdTk")
 
diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt
index 3eb741d6a..6e118b32d 100644
--- a/server/shadow/CMakeLists.txt
+++ b/server/shadow/CMakeLists.txt
@@ -77,7 +77,7 @@ list(APPEND ${MODULE_PREFIX}_LIBS winpr)
 list(APPEND ${MODULE_PREFIX}_LIBS winpr-makecert-tool)
 list(APPEND ${MODULE_PREFIX}_LIBS rdtk)
 
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
 
 if (WITH_LIBRARY_VERSIONING)
 	  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
@@ -174,10 +174,10 @@ if(WITH_SHADOW_X11)
 	find_feature(XShm ${XSHM_FEATURE_TYPE} ${XSHM_FEATURE_PURPOSE} ${XSHM_FEATURE_DESCRIPTION})
 	find_feature(XTest ${XTEST_FEATURE_TYPE} ${XTEST_FEATURE_PURPOSE} ${XTEST_FEATURE_DESCRIPTION})
 	find_feature(Xfixes ${XFIXES_FEATURE_TYPE} ${XFIXES_FEATURE_PURPOSE} ${XFIXES_FEATURE_DESCRIPTION})
-	find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION})
 	find_feature(Xdamage ${XDAMAGE_FEATURE_TYPE} ${XDAMAGE_FEATURE_PURPOSE} ${XDAMAGE_FEATURE_DESCRIPTION})
-	find_feature(Xcursor ${XCURSOR_FEATURE_TYPE} ${XCURSOR_FEATURE_PURPOSE} ${XCURSOR_FEATURE_DESCRIPTION})
 	find_feature(Xinerama ${XINERAMA_FEATURE_TYPE} ${XINERAMA_FEATURE_PURPOSE} ${XINERAMA_FEATURE_DESCRIPTION})
+	find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION})
+	find_feature(Xcursor ${XCURSOR_FEATURE_TYPE} ${XCURSOR_FEATURE_PURPOSE} ${XCURSOR_FEATURE_DESCRIPTION})
 
 	if(WITH_X11)
 		add_definitions(-DWITH_X11)
@@ -203,12 +203,6 @@ if(WITH_SHADOW_X11)
 		list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XINERAMA_LIBRARIES})
 	endif()
 
-	if(WITH_XCURSOR)
-		add_definitions(-DWITH_XCURSOR)
-		include_directories(${XCURSOR_INCLUDE_DIRS})
-		list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XCURSOR_LIBRARIES})
-	endif()
-
 	if(WITH_XDAMAGE)
 		add_definitions(-DWITH_XDAMAGE)
 		include_directories(${XDAMAGE_INCLUDE_DIRS})
@@ -227,18 +221,25 @@ if(WITH_SHADOW_X11)
 		list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XTEST_LIBRARIES})
 	endif()
 
-	if(WITH_XRANDR)
-		add_definitions(-DWITH_XRANDR)
-		include_directories(${XRANDR_INCLUDE_DIRS})
-		list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XRANDR_LIBRARIES})
-	endif()
+	# XCursor and XRandr are currently not used so don't link them
+	#if(WITH_XCURSOR)
+	#	add_definitions(-DWITH_XCURSOR)
+	#	include_directories(${XCURSOR_INCLUDE_DIRS})
+	#	list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XCURSOR_LIBRARIES})
+	#endif()
+
+	#if(WITH_XRANDR)
+	#	add_definitions(-DWITH_XRANDR)
+	#	include_directories(${XRANDR_INCLUDE_DIRS})
+	#	list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XRANDR_LIBRARIES})
+	#endif()
 elseif(WITH_SHADOW_MAC)
 	find_library(IOKIT IOKit)
 	find_library(IOSURFACE IOSurface)
 	find_library(CARBON Carbon)
 	list(APPEND ${MODULE_PREFIX}_MAC_LIBS ${IOKIT} ${IOSURFACE} ${CARBON})
 elseif(WITH_SHADOW_WIN)
-	list(APPEND ${MODULE_PREFIX}_WIN_LIBS freerdp-client)
+	list(APPEND ${MODULE_PREFIX}_WIN_LIBS freerdp-client freerdp)
 endif()
 
 set(${MODULE_PREFIX}_WIN_SRCS
@@ -279,7 +280,7 @@ add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-shadow)
 
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
 
 if (WITH_LIBRARY_VERSIONING)
 	set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
@@ -320,9 +321,9 @@ endif()
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-shadow-subsystem)
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-shadow-subsystem freerdp-shadow winpr)
 
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT server)
 if (WITH_DEBUG_SYMBOLS AND MSVC)
diff --git a/uwac/libuwac/CMakeLists.txt b/uwac/libuwac/CMakeLists.txt
index 4de932519..d40970735 100644
--- a/uwac/libuwac/CMakeLists.txt
+++ b/uwac/libuwac/CMakeLists.txt
@@ -68,7 +68,7 @@ if (WITH_LIBRARY_VERSIONING)
 	set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${UWAC_VERSION} SOVERSION ${UWAC_API_VERSION})
 endif()
 
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} freerdp)
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${PRIVATE_KEYWORD} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} freerdp)
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT uwac)
 
diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
index 7c65ad3bd..91db017ca 100644
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@@ -123,7 +123,11 @@ if (WITH_LIBRARY_VERSIONING)
 endif()
 
 add_definitions(${WINPR_DEFINITIONS})
-target_link_libraries(${MODULE_NAME} ${WINPR_LIBS})
+if (WIN32)
+target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} ${WINPR_LIBS})
+else()
+target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_LIBS})
+endif(WIN32)
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets)
 if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
     install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
diff --git a/winpr/libwinpr/asn1/test/CMakeLists.txt b/winpr/libwinpr/asn1/test/CMakeLists.txt
index 22b8eb50f..a392cbe49 100644
--- a/winpr/libwinpr/asn1/test/CMakeLists.txt
+++ b/winpr/libwinpr/asn1/test/CMakeLists.txt
@@ -24,8 +24,6 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} winpr)
-
 set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
diff --git a/winpr/libwinpr/bcrypt/CMakeLists.txt b/winpr/libwinpr/bcrypt/CMakeLists.txt
index 24c2206c4..265a69de9 100644
--- a/winpr/libwinpr/bcrypt/CMakeLists.txt
+++ b/winpr/libwinpr/bcrypt/CMakeLists.txt
@@ -17,8 +17,4 @@
 
 winpr_module_add(bcrypt.c)
 
-winpr_include_directory_add(
-	${OPENSSL_INCLUDE_DIR}
-	${ZLIB_INCLUDE_DIRS})
-
-winpr_library_add(${ZLIB_LIBRARIES})
+winpr_include_directory_add(${OPENSSL_INCLUDE_DIR})
diff --git a/winpr/libwinpr/com/test/CMakeLists.txt b/winpr/libwinpr/com/test/CMakeLists.txt
index ac6c1c008..73c30a231 100644
--- a/winpr/libwinpr/com/test/CMakeLists.txt
+++ b/winpr/libwinpr/com/test/CMakeLists.txt
@@ -12,7 +12,6 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} winpr)
 set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
diff --git a/winpr/libwinpr/locale/test/CMakeLists.txt b/winpr/libwinpr/locale/test/CMakeLists.txt
index 47b94f5e2..15cc112a7 100644
--- a/winpr/libwinpr/locale/test/CMakeLists.txt
+++ b/winpr/libwinpr/locale/test/CMakeLists.txt
@@ -13,8 +13,6 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} winpr)
-
 set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
diff --git a/winpr/libwinpr/memory/test/CMakeLists.txt b/winpr/libwinpr/memory/test/CMakeLists.txt
index 861ef6c03..d4fad513e 100644
--- a/winpr/libwinpr/memory/test/CMakeLists.txt
+++ b/winpr/libwinpr/memory/test/CMakeLists.txt
@@ -13,8 +13,6 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} winpr)
-
 set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
diff --git a/winpr/libwinpr/rpc/CMakeLists.txt b/winpr/libwinpr/rpc/CMakeLists.txt
index a9c7c9acd..6e1b2aca0 100644
--- a/winpr/libwinpr/rpc/CMakeLists.txt
+++ b/winpr/libwinpr/rpc/CMakeLists.txt
@@ -38,13 +38,10 @@ winpr_module_add(
 	ndr_union.h
 	midl.c)
 
-winpr_include_directory_add(${OPENSSL_INCLUDE_DIR}
-	${ZLIB_INCLUDE_DIRS})
+winpr_include_directory_add(${OPENSSL_INCLUDE_DIR})
 
 winpr_library_add(${OPENSSL_LIBRARIES})
 
 if(WIN32)
 	winpr_library_add(ws2_32 rpcrt4)
-else()
-	winpr_library_add(${ZLIB_LIBRARIES})
 endif()
diff --git a/winpr/libwinpr/security/test/CMakeLists.txt b/winpr/libwinpr/security/test/CMakeLists.txt
index d9aacb160..80be39476 100644
--- a/winpr/libwinpr/security/test/CMakeLists.txt
+++ b/winpr/libwinpr/security/test/CMakeLists.txt
@@ -13,8 +13,6 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} winpr)
-
 set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
diff --git a/winpr/libwinpr/sspi/test/CMakeLists.txt b/winpr/libwinpr/sspi/test/CMakeLists.txt
index fcb4274ee..5e0f15d27 100644
--- a/winpr/libwinpr/sspi/test/CMakeLists.txt
+++ b/winpr/libwinpr/sspi/test/CMakeLists.txt
@@ -21,8 +21,6 @@ include_directories(${OPENSSL_INCLUDE_DIR})
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-set(${MODULE_PREFIX}_LIBS ${OPENSSL_LIBRARIES})
-
 if(WIN32)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} secur32 crypt32)
 endif()
diff --git a/winpr/tools/makecert/CMakeLists.txt b/winpr/tools/makecert/CMakeLists.txt
index ce72f7d2b..3e021e033 100644
--- a/winpr/tools/makecert/CMakeLists.txt
+++ b/winpr/tools/makecert/CMakeLists.txt
@@ -33,7 +33,13 @@ add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})
 set(${MODULE_PREFIX}_LIBS winpr)
 
 if(OPENSSL_FOUND)
-	list(APPEND ${MODULE_PREFIX}_LIBS ${OPENSSL_LIBRARIES})
+	if(WIN32)
+		list(APPEND ${MODULE_PREFIX}_LIBS ${OPENSSL_LIBRARIES})
+	else()
+		# if ${OPENSSL_LIBRARIES} libssl and libcrypto is linked
+		# therefor explicitly link against libcrypto
+		list(APPEND ${MODULE_PREFIX}_LIBS crypto)
+	endif()
 endif()
 
 if(MBEDTLS_FOUND)
diff --git a/winpr/winpr.pc.in b/winpr/winpr.pc.in
index 4c3063798..ac509c01c 100644
--- a/winpr/winpr.pc.in
+++ b/winpr/winpr.pc.in
@@ -9,7 +9,7 @@ Description: WinPR: Windows Portable Runtime
 URL: http://www.freerdp.com/
 Version: @WINPR_VERSION@
 Requires:
-Requires.private: zlib libssl
+Requires.private: libssl
 Libs: -L${libdir} ${libs}
 Libs.private: -ldl -lrt -lm -lpthread
 Cflags: -I${includedir}