diff --git a/src/include/ipv4/lwip/ip.h b/src/include/ipv4/lwip/ip.h
index c15d6622..21b9ba3e 100644
--- a/src/include/ipv4/lwip/ip.h
+++ b/src/include/ipv4/lwip/ip.h
@@ -37,10 +37,11 @@
 #include "lwip/def.h"
 #include "lwip/pbuf.h"
 #include "lwip/ip_addr.h"
-#include "lwip/netif.h"
 
 #include "lwip/err.h"
 
+struct netif;
+
 void ip_init(void);
 u8_t ip_lookup(void *header, struct netif *inp);
 struct netif *ip_route(struct ip_addr *dest);
diff --git a/src/include/lwip/dhcp.h b/src/include/lwip/dhcp.h
index 5cf8ea86..b68306f2 100644
--- a/src/include/lwip/dhcp.h
+++ b/src/include/lwip/dhcp.h
@@ -4,8 +4,8 @@
 #ifndef __LWIP_DHCP_H__
 #define __LWIP_DHCP_H__
 
-#include "udp.h"
 #include "lwip/opt.h"
+#include "lwip/udp.h"
 
 /** period (in seconds) of the application calling dhcp_coarse_tmr() */
 #define DHCP_COARSE_TIMER_SECS 60 
@@ -86,6 +86,9 @@ PACK_STRUCT_END
 #  include "arch/epstruct.h"
 #endif
 
+/* Declare here to avoid including netif.h creating a circular dependency */
+struct netif;
+
 /** initialize DHCP client */
 void dhcp_init(void);
 /** start DHCP configuration */
@@ -166,7 +169,7 @@ void dhcp_fine_tmr(void);
 
 /** BootP options */
 #define DHCP_OPTION_PAD 0
-#define DHCP_OPTION_SUBNET_MASK 1 // RFC 2132 3.3
+#define DHCP_OPTION_SUBNET_MASK 1 /* RFC 2132 3.3 */
 #define DHCP_OPTION_ROUTER 3 
 #define DHCP_OPTION_HOSTNAME 12
 #define DHCP_OPTION_IP_TTL 23