@@ -122,11 +122,11 @@
 struct X86Regs {
 	uint32_t eax, ebx, ecx, edx;
 };
 #endif
 
-#if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_GETIFADDRS)
+#ifdef OF_SYSTEM_INFO_HAS_NETWORK_INTERFACES
 OFConstantString *const OFNetworkInterfaceAddresses =
     @"OFNetworkInterfaceAddresses";
 OFConstantString *const OFNetworkInterfaceEthernetAddress =
     @"OFNetworkInterfaceEthernetAddress";
 #endif
@@ -836,11 +836,11 @@
 {
 	return !(GetVersion() & 0x80000000);
 }
 #endif
 
-#if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_GETIFADDRS)
+#ifdef OF_SYSTEM_INFO_HAS_NETWORK_INTERFACES
 static OFSocketAddress
 wrapSockaddr(struct sockaddr *sa)
 {
 	OFSocketAddress address;