diff --git a/libfreerdp-chanman/CMakeLists.txt b/libfreerdp-chanman/CMakeLists.txt
index e777f8c2b..e6840712f 100644
--- a/libfreerdp-chanman/CMakeLists.txt
+++ b/libfreerdp-chanman/CMakeLists.txt
@@ -24,6 +24,7 @@ set(FREERDP_CHANMAN_SRCS
 add_library(freerdp-chanman SHARED ${FREERDP_CHANMAN_SRCS})
 
 set_target_properties(freerdp-chanman PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION})
+target_link_libraries(freerdp-chanman freerdp-utils)
 
 install(TARGETS freerdp-chanman DESTINATION lib)
 
diff --git a/libfreerdp-core/tcp.h b/libfreerdp-core/tcp.h
index 58ca2b324..3a45d9f67 100644
--- a/libfreerdp-core/tcp.h
+++ b/libfreerdp-core/tcp.h
@@ -25,6 +25,11 @@
 #include <freerdp/settings.h>
 #include <freerdp/utils/stream.h>
 
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
+
 typedef struct rdp_tcp rdpTcp;
 typedef boolean (*TcpConnect) (rdpTcp* tcp, const uint8* hostname, uint16 port);
 typedef boolean (*TcpDisconnect) (rdpTcp* tcp);
diff --git a/libfreerdp-core/transport.c b/libfreerdp-core/transport.c
index 0eed05f0f..564533db4 100644
--- a/libfreerdp-core/transport.c
+++ b/libfreerdp-core/transport.c
@@ -33,10 +33,6 @@
 #include "credssp.h"
 #include "transport.h"
 
-#ifndef MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
 #define BUFFER_SIZE 16384
 
 STREAM* transport_recv_stream_init(rdpTransport* transport, int size)