diff --git a/src/network/core/host.cpp b/src/network/core/host.cpp
index 6644e95297..4d57dcb501 100644
--- a/src/network/core/host.cpp
+++ b/src/network/core/host.cpp
@@ -21,25 +21,7 @@
  */
 static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast);
 
-#if defined(HAVE_GETIFADDRS)
-static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // GETIFADDRS implementation
-{
-	struct ifaddrs *ifap, *ifa;
-
-	if (getifaddrs(&ifap) != 0) return;
-
-	for (ifa = ifap; ifa != nullptr; ifa = ifa->ifa_next) {
-		if (!(ifa->ifa_flags & IFF_BROADCAST)) continue;
-		if (ifa->ifa_broadaddr == nullptr) continue;
-		if (ifa->ifa_broadaddr->sa_family != AF_INET) continue;
-
-		NetworkAddress addr(ifa->ifa_broadaddr, sizeof(sockaddr));
-		if (std::none_of(broadcast->begin(), broadcast->end(), [&addr](NetworkAddress const& elem) -> bool { return elem == addr; })) broadcast->push_back(addr);
-	}
-	freeifaddrs(ifap);
-}
-
-#elif defined(_WIN32)
+#ifdef _WIN32
 static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Win32 implementation
 {
 	SOCKET sock = socket(AF_INET, SOCK_DGRAM, 0);
@@ -77,48 +59,22 @@ static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Wi
 	closesocket(sock);
 }
 
-#else /* not HAVE_GETIFADDRS */
-
-#include "../../string_func.h"
-
-static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // !GETIFADDRS implementation
+#else /* not WIN32 */
+static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast)
 {
-	SOCKET sock = socket(AF_INET, SOCK_DGRAM, 0);
-	if (sock == INVALID_SOCKET) return;
+	struct ifaddrs *ifap, *ifa;
 
-	char buf[4 * 1024]; // Arbitrary buffer size
-	struct ifconf ifconf;
+	if (getifaddrs(&ifap) != 0) return;
 
-	ifconf.ifc_len = sizeof(buf);
-	ifconf.ifc_buf = buf;
-	if (ioctl(sock, SIOCGIFCONF, &ifconf) == -1) {
-		closesocket(sock);
-		return;
+	for (ifa = ifap; ifa != nullptr; ifa = ifa->ifa_next) {
+		if (!(ifa->ifa_flags & IFF_BROADCAST)) continue;
+		if (ifa->ifa_broadaddr == nullptr) continue;
+		if (ifa->ifa_broadaddr->sa_family != AF_INET) continue;
+
+		NetworkAddress addr(ifa->ifa_broadaddr, sizeof(sockaddr));
+		if (std::none_of(broadcast->begin(), broadcast->end(), [&addr](NetworkAddress const& elem) -> bool { return elem == addr; })) broadcast->push_back(addr);
 	}
-
-	const char *buf_end = buf + ifconf.ifc_len;
-	for (const char *p = buf; p < buf_end;) {
-		const struct ifreq *req = (const struct ifreq*)p;
-
-		if (req->ifr_addr.sa_family == AF_INET) {
-			struct ifreq r;
-
-			strecpy(r.ifr_name, req->ifr_name, lastof(r.ifr_name));
-			if (ioctl(sock, SIOCGIFFLAGS, &r) != -1 &&
-					(r.ifr_flags & IFF_BROADCAST) &&
-					ioctl(sock, SIOCGIFBRDADDR, &r) != -1) {
-				NetworkAddress addr(&r.ifr_broadaddr, sizeof(sockaddr));
-				if (std::none_of(broadcast->begin(), broadcast->end(), [&addr](NetworkAddress const& elem) -> bool { return elem == addr; })) broadcast->push_back(addr);
-			}
-		}
-
-		p += sizeof(struct ifreq);
-#if defined(AF_LINK) && !defined(SUNOS)
-		p += req->ifr_addr.sa_len - sizeof(struct sockaddr);
-#endif
-	}
-
-	closesocket(sock);
+	freeifaddrs(ifap);
 }
 #endif /* all NetworkFindBroadcastIPsInternals */
 
diff --git a/src/network/core/os_abstraction.h b/src/network/core/os_abstraction.h
index 461ada2b12..c8cf67a499 100644
--- a/src/network/core/os_abstraction.h
+++ b/src/network/core/os_abstraction.h
@@ -78,15 +78,7 @@ typedef unsigned long in_addr_t;
 #	include <netinet/tcp.h>
 #	include <arpa/inet.h>
 #	include <net/if.h>
-/* According to glibc/NEWS, <ifaddrs.h> appeared in glibc-2.3. */
-#	if !defined(__sgi__) && !defined(SUNOS) \
-	   && !(defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 2)) && !defined(__dietlibc__) && !defined(HPUX)
-/* If for any reason ifaddrs.h does not exist on your system, comment out
- *   the following two lines and an alternative way will be used to fetch
- *   the list of IPs from the system. */
-#		include <ifaddrs.h>
-#		define HAVE_GETIFADDRS
-#	endif
+#	include <ifaddrs.h>
 #	if !defined(INADDR_NONE)
 #		define INADDR_NONE 0xffffffff
 #	endif