diff --git a/ChangeLog.d/unistd.txt b/ChangeLog.d/unistd.txt
new file mode 100644
index 0000000000..d2e4d4301a
--- /dev/null
+++ b/ChangeLog.d/unistd.txt
@@ -0,0 +1,3 @@
+Changes
+   * Tweak the detection of Unix-like platforms, which makes more system
+     interfaces (timing, threading) available on Haiku, QNX and Midipix.
diff --git a/library/net_sockets.c b/library/net_sockets.c
index ca70f3797b..25f06824cb 100644
--- a/library/net_sockets.c
+++ b/library/net_sockets.c
@@ -19,9 +19,7 @@
 
 #if defined(MBEDTLS_NET_C)
 
-#if !defined(unix) && !defined(__unix__) && !defined(__unix) && \
-    !defined(__APPLE__) && !defined(_WIN32) && !defined(__QNXNTO__) && \
-    !defined(__HAIKU__) && !defined(__midipix__)
+#if !defined(MBEDTLS_PLATFORM_IS_UNIXLIKE) && !defined(_WIN32)
 #error "This module only works on Unix and Windows, see MBEDTLS_NET_C in mbedtls_config.h"
 #endif