diff --git a/modules/services_discovery/upnp-wrapper.hpp b/modules/services_discovery/upnp-wrapper.hpp
index 8e5686de7c..b999078297 100644
--- a/modules/services_discovery/upnp-wrapper.hpp
+++ b/modules/services_discovery/upnp-wrapper.hpp
@@ -208,8 +208,6 @@ inline IP_ADAPTER_ADDRESSES* ListAdapters()
     return addresses;
 }
 
-#ifdef UPNP_ENABLE_IPV6
-
 inline char* getPreferedAdapter()
 {
     IP_ADAPTER_ADDRESSES *p_adapter, *addresses;
@@ -239,8 +237,6 @@ inline char* getPreferedAdapter()
     return NULL;
 }
 
-#else
-
 inline char *getIpv4ForMulticast()
 {
     IP_ADAPTER_UNICAST_ADDRESS *p_best_ip = NULL;
@@ -327,11 +323,8 @@ done:
     free(addresses);
     return NULL;
 }
-#endif /* UPNP_ENABLE_IPV6 */
 #else /* _WIN32 */
 
-#ifdef UPNP_ENABLE_IPV6
-
 #ifdef __APPLE__
 #include <TargetConditionals.h>
 
@@ -406,7 +399,6 @@ inline char *getPreferedAdapter()
 }
 
 #endif
-#else
 
 #ifdef __APPLE__
 
@@ -461,7 +453,6 @@ static char *getIpv4ForMulticast()
 
 #endif
 
-#endif
-
 #endif /* _WIN32 */
-#endif /* UPNP_WRAPPER_H */
+
+#endif