diff --git a/src/apps/http/http_client.c b/src/apps/http/http_client.c
index c3ea3698..3815dbda 100644
--- a/src/apps/http/http_client.c
+++ b/src/apps/http/http_client.c
@@ -427,7 +427,7 @@ httpc_get_internal_addr(httpc_state_t* req, const ip_addr_t *ipaddr)
   return err;
 }
 
-#if LWIP_IPV4 && LWIP_DNS
+#if LWIP_DNS
 /** DNS callback
  * If ipaddr is non-NULL, resolving succeeded and the request can be sent, otherwise it failed.
  */
@@ -454,7 +454,7 @@ httpc_dns_found(const char* hostname, const ip_addr_t *ipaddr, void *arg)
   }
   httpc_close(req, result, 0, err);
 }
-#endif /* LWIP_IPV4 && LWIP_DNS */
+#endif /* LWIP_DNS */
 
 /** Start the http request after converting 'server_name' to ip address (DNS or address string) */
 static err_t
diff --git a/src/include/lwip/netif.h b/src/include/lwip/netif.h
index fba4fd7d..32d48f79 100644
--- a/src/include/lwip/netif.h
+++ b/src/include/lwip/netif.h
@@ -223,7 +223,7 @@ typedef err_t (*netif_mld_mac_filter_fn)(struct netif *netif,
        const ip6_addr_t *group, enum netif_mac_filter_action action);
 #endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
 
-#if LWIP_DHCP || LWIP_AUTOIP || LWIP_IGMP || LWIP_IPV6_MLD || (LWIP_NUM_NETIF_CLIENT_DATA > 0)
+#if LWIP_DHCP || LWIP_AUTOIP || LWIP_IGMP || LWIP_IPV6_MLD || LWIP_IPV6_DHCP6 || (LWIP_NUM_NETIF_CLIENT_DATA > 0)
 #if LWIP_NUM_NETIF_CLIENT_DATA > 0
 u8_t netif_alloc_client_data_id(void);
 #endif
diff --git a/test/sockets/sockets_stresstest.c b/test/sockets/sockets_stresstest.c
index e9253aab..db900420 100644
--- a/test/sockets/sockets_stresstest.c
+++ b/test/sockets/sockets_stresstest.c
@@ -60,7 +60,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#if LWIP_SOCKET
+#if LWIP_SOCKET && LWIP_IPV4 /* this uses IPv4 loopback sockets, currently */
 
 #ifndef TEST_SOCKETS_STRESS
 #define TEST_SOCKETS_STRESS   LWIP_DBG_OFF
@@ -610,4 +610,4 @@ sockets_stresstest_init_client(const char *remote_ip, u16_t remote_port)
   sockets_stresstest_start_clients(addr);
 }
 
-#endif /* LWIP_SOCKET */
+#endif /* LWIP_SOCKET && LWIP_IPV4 */