diff --git a/channels/audin/server/CMakeLists.txt b/channels/audin/server/CMakeLists.txt
index 3280cfd05..d728b7009 100644
--- a/channels/audin/server/CMakeLists.txt
+++ b/channels/audin/server/CMakeLists.txt
@@ -24,6 +24,5 @@ set(${MODULE_PREFIX}_SRCS
 if(WITH_MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS freerdp PARENT_SCOPE)
 else()
-	set(${MODULE_PREFIX}_LIBS freerdp-utils PARENT_SCOPE)
+	set(${MODULE_PREFIX}_LIBS freerdp-utils freerdp-channels PARENT_SCOPE)
 endif()
-
diff --git a/server/Windows/wf_update.c b/server/Windows/wf_update.c
index 98bde03a4..70d5a81ca 100644
--- a/server/Windows/wf_update.c
+++ b/server/Windows/wf_update.c
@@ -21,6 +21,8 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
+
 #include <winpr/windows.h>
 
 #include <freerdp/freerdp.h>
diff --git a/winpr/include/winpr/library.h b/winpr/include/winpr/library.h
index 203bcd755..b38cf2a6e 100644
--- a/winpr/include/winpr/library.h
+++ b/winpr/include/winpr/library.h
@@ -23,6 +23,8 @@
 #include <winpr/winpr.h>
 #include <winpr/wtypes.h>
 
+#ifndef _WIN32
+
 typedef HANDLE DLL_DIRECTORY_COOKIE;
 
 #define LOAD_LIBRARY_SEARCH_APPLICATION_DIR			0x00000200
@@ -34,8 +36,6 @@ WINPR_API DLL_DIRECTORY_COOKIE AddDllDirectory(PCWSTR NewDirectory);
 WINPR_API BOOL RemoveDllDirectory(DLL_DIRECTORY_COOKIE Cookie);
 WINPR_API BOOL SetDefaultDllDirectories(DWORD DirectoryFlags);
 
-#ifndef _WIN32
-
 WINPR_API HMODULE LoadLibraryA(LPCSTR lpLibFileName);
 WINPR_API HMODULE LoadLibraryW(LPCWSTR lpLibFileName);
 
diff --git a/winpr/libwinpr/library/library.c b/winpr/libwinpr/library/library.c
index b5e38601f..8707dc80b 100644
--- a/winpr/libwinpr/library/library.c
+++ b/winpr/libwinpr/library/library.c
@@ -58,6 +58,12 @@
  * SizeofResource
  */
 
+#ifndef _WIN32
+
+#include <dlfcn.h>
+#include <stdio.h>
+#include <unistd.h>
+
 DLL_DIRECTORY_COOKIE AddDllDirectory(PCWSTR NewDirectory)
 {
 	return NULL;
@@ -73,12 +79,6 @@ BOOL SetDefaultDllDirectories(DWORD DirectoryFlags)
 	return TRUE;
 }
 
-#ifndef _WIN32
-
-#include <dlfcn.h>
-#include <stdio.h>
-#include <unistd.h>
-
 HMODULE LoadLibraryA(LPCSTR lpLibFileName)
 {
 	HMODULE library;