diff --git a/src/compat/net.h b/src/compat/net.h
index f412661eb..fb38c7d65 100644
--- a/src/compat/net.h
+++ b/src/compat/net.h
@@ -46,6 +46,7 @@
 typedef SOCKET fd_t;
 #else
 #include <arpa/inet.h>      // for htonl, ntohl
+#include <netdb.h>          // for getaddrinfo
 #include <netinet/in.h>     // for sockaddr_in[6]
 #include <sys/socket.h>     // for sockaddr, sockaddr_storage
 typedef int fd_t;
diff --git a/src/control_socket.cpp b/src/control_socket.cpp
index e3b7cf7f8..a0082608e 100644
--- a/src/control_socket.cpp
+++ b/src/control_socket.cpp
@@ -35,13 +35,23 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config_unix.h"
-#include "config_win32.h"
-
 #include "control_socket.h"
-#include "compat/platform_pipe.h"
 
+#include <cassert>                 // for assert
+#include <cctype>                  // for isspace, isdigit
+#include <cerrno>                  // for errno, EAFNOSUPPORT
 #include <condition_variable>
+#include <cstdio>                  // for snprintf, perror
+#include <cstdlib>                 // for atoi, free, malloc, abort, strtoll
+#include <cstring>                 // for strlen, NULL, strncpy, strchr, strcmp
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <fcntl.h>                 // for fcntl, F_SETFL, O_NONBLOCK
+#include <sys/types.h>             // for ssize_t
+#include <unistd.h>                // for write
+#endif
+
 #include <cstdint>             // for uint32_t
 #include <mutex>
 #include <queue>
@@ -49,11 +59,16 @@
 #include <thread>
 
 #include "debug.h"
+#include "compat/net.h"            // for net related
+#include "compat/platform_pipe.h"
+#include "compat/strings.h"        // for strncasecmp, strcasecmp
+#include "compat/time.h"           // for timeval, gettimeofday
 #include "host.h"
 #include "messaging.h"
 #include "module.h"
 #include "rtp/net_udp.h" // socket_error
-#include "tv.h"
+#include "types.h"                 // for tx_media_type
+#include "utils/color_out.h"       // for TBOLD, color_printf
 #include "utils/net.h"
 #include "utils/macros.h"    // for MODULE_MAGIC
 #include "utils/thread.h"