diff --git a/src/include/lwip/prot/autoip.h b/src/include/lwip/prot/autoip.h
index 37c5f715..2b5034ee 100644
--- a/src/include/lwip/prot/autoip.h
+++ b/src/include/lwip/prot/autoip.h
@@ -40,10 +40,6 @@
 #ifndef LWIP_HDR_PROT_AUTOIP_H
 #define LWIP_HDR_PROT_AUTOIP_H
 
-#include "lwip/opt.h"
-
-#if LWIP_IPV4 && LWIP_AUTOIP /* don't build if not configured for use in lwipopts.h */
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -77,6 +73,4 @@ extern "C" {
 }
 #endif
 
-#endif /* LWIP_IPV4 && LWIP_AUTOIP */
-
 #endif /* LWIP_HDR_PROT_AUTOIP_H */
diff --git a/src/include/lwip/prot/dhcp.h b/src/include/lwip/prot/dhcp.h
index 21b1b609..2269163c 100644
--- a/src/include/lwip/prot/dhcp.h
+++ b/src/include/lwip/prot/dhcp.h
@@ -40,11 +40,6 @@
 
 #include "lwip/opt.h"
 
-#if LWIP_DHCP /* don't build if not configured for use in lwipopts.h */
-
-#include "lwip/netif.h"
-#include "lwip/udp.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -187,6 +182,4 @@ PACK_STRUCT_END
 }
 #endif
 
-#endif /* LWIP_DHCP */
-
 #endif /*LWIP_HDR_PROT_DHCP_H*/
diff --git a/src/include/lwip/prot/ip.h b/src/include/lwip/prot/ip.h
index a544790a..7011785d 100644
--- a/src/include/lwip/prot/ip.h
+++ b/src/include/lwip/prot/ip.h
@@ -37,7 +37,6 @@
 #ifndef LWIP_HDR_PROT_IP_H
 #define LWIP_HDR_PROT_IP_H
 
-#include "lwip/opt.h"
 #include "lwip/arch.h"
 
 #define IP_PROTO_ICMP    1
diff --git a/src/include/lwip/prot/ip4.h b/src/include/lwip/prot/ip4.h
index f2470164..3e7cbd1f 100644
--- a/src/include/lwip/prot/ip4.h
+++ b/src/include/lwip/prot/ip4.h
@@ -37,10 +37,6 @@
 #ifndef LWIP_HDR_PROT_IP4_H
 #define LWIP_HDR_PROT_IP4_H
 
-#include "lwip/opt.h"
-
-#if LWIP_IPV4
-
 #include "lwip/arch.h"
 #include "lwip/ip4_addr.h"
 
@@ -112,8 +108,6 @@ PACK_STRUCT_END
 }
 #endif
 
-#endif /* LWIP_IPV4 */
-
 #endif /* LWIP_HDR_PROT_IP4_H */