diff --git a/src/core/dhcp.c b/src/core/dhcp.c
index e51e06f4..3e1a2e35 100644
--- a/src/core/dhcp.c
+++ b/src/core/dhcp.c
@@ -68,7 +68,7 @@
 #include "netif/etharp.h"
 
 #include "lwip/sys.h"
-#include "lwipopts.h"
+#include "lwip/opt.h"
 #include "lwip/dhcp.h"
 
 /** transaction identifier, unique over all DHCP requests */
diff --git a/src/core/memp.c b/src/core/memp.c
index a2948b00..4b917cba 100644
--- a/src/core/memp.c
+++ b/src/core/memp.c
@@ -30,7 +30,7 @@
  *
  */
 
-#include "lwipopts.h"
+#include "lwip/opt.h"
 
 #include "lwip/memp.h"
 
diff --git a/src/core/tcp.c b/src/core/tcp.c
index eec09310..7254d474 100644
--- a/src/core/tcp.c
+++ b/src/core/tcp.c
@@ -48,7 +48,7 @@
 
 #include "lwip/tcp.h"
 
-#include "lwipopts.h"
+#include "lwip/opt.h"
 
 /* Incremented every coarse grained timer shot
    (typically every 500 ms, determined by TCP_COARSE_TIMEOUT). */
diff --git a/src/include/lwip/dhcp.h b/src/include/lwip/dhcp.h
index 60cd0d5a..5cf8ea86 100644
--- a/src/include/lwip/dhcp.h
+++ b/src/include/lwip/dhcp.h
@@ -5,7 +5,7 @@
 #define __LWIP_DHCP_H__
 
 #include "udp.h"
-#include "lwipopts.h"
+#include "lwip/opt.h"
 
 /** period (in seconds) of the application calling dhcp_coarse_tmr() */
 #define DHCP_COARSE_TIMER_SECS 60 
diff --git a/src/include/lwip/memp.h b/src/include/lwip/memp.h
index 5abddbf0..1563014f 100644
--- a/src/include/lwip/memp.h
+++ b/src/include/lwip/memp.h
@@ -34,8 +34,7 @@
 #define __LWIP_MEMP_H__
 
 #include "lwip/debug.h"
-#include "arch/cc.h"
-#include "lwipopts.h"
+#include "lwip/opt.h"
 
 typedef enum {
   MEMP_PBUF,
diff --git a/src/include/lwip/netif.h b/src/include/lwip/netif.h
index 9e59bbfa..4bb55f77 100644
--- a/src/include/lwip/netif.h
+++ b/src/include/lwip/netif.h
@@ -32,7 +32,6 @@
 #ifndef __LWIP_NETIF_H__
 #define __LWIP_NETIF_H__
 
-#include "lwipopts.h"
 #include "lwip/opt.h"
 
 #include "lwip/err.h"
diff --git a/src/netif/etharp.c b/src/netif/etharp.c
index 2c4a36cf..19e108b2 100644
--- a/src/netif/etharp.c
+++ b/src/netif/etharp.c
@@ -3,6 +3,9 @@
  * Address Resolution Protocol module for IP over Ethernet
  *
  * $Log: etharp.c,v $
+ * Revision 1.27  2003/02/20 16:32:24  jani
+ * do not directly include lwipopts.h but lwip/opt.h instead
+ *
  * Revision 1.26  2003/02/20 13:13:56  likewise
  * Fixed some issues open after merging 'leon-dhcp'. Added new debugging.
  *
@@ -158,7 +161,6 @@ RFC 3220 4.6          IP Mobility Support for IPv4          January 2002
 #include "netif/etharp.h"
 #include "lwip/ip.h"
 #include "lwip/stats.h"
-#include "lwipopts.h"
 
 /* ARP needs to inform DHCP of any ARP replies? */
 #if (LWIP_DHCP && DHCP_DOES_ARP_CHECK)