diff --git a/CHANGELOG b/CHANGELOG
index 7288bcc7..d3779bb5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -373,6 +373,12 @@ HISTORY
 
   ++ Bug fixes:
 
+  2007-09-06 Frédéric Bernon
+  * several-files: replace some #include "arch/cc.h" by "lwip/arch.h", or simply remove
+    it as long as "lwip/opt.h" is included before (this one include "lwip/debug.h" which
+    already include "lwip/arch.h"). Like that, default defines are provided by "lwip/arch.h"
+    if they are not defined in cc.h, in the same spirit than "lwip/opt.h" for lwipopts.h.
+
   2007-08-30 Frédéric Bernon
   * igmp.h, igmp.c: Some changes to remove some redundant code, add some traces, 
     and fix some coding style.
diff --git a/src/core/snmp/mib2.c b/src/core/snmp/mib2.c
index 6f704c5b..6f37f938 100644
--- a/src/core/snmp/mib2.c
+++ b/src/core/snmp/mib2.c
@@ -35,10 +35,10 @@
  * Author: Christiaan Simons <christiaan.simons@axon.tv>
  */
 
-#include "arch/cc.h"
 #include "lwip/opt.h"
 
 #if LWIP_SNMP
+
 #include "lwip/snmp.h"
 #include "lwip/netif.h"
 #include "netif/etharp.h"
diff --git a/src/core/snmp/msg_in.c b/src/core/snmp/msg_in.c
index 828eba4a..8a558da4 100644
--- a/src/core/snmp/msg_in.c
+++ b/src/core/snmp/msg_in.c
@@ -35,8 +35,8 @@
 #include "lwip/opt.h"
 
 #if LWIP_SNMP
+
 #include <string.h>
-#include "arch/cc.h"
 #include "lwip/ip_addr.h"
 #include "lwip/mem.h"
 #include "lwip/udp.h"
diff --git a/src/core/snmp/msg_out.c b/src/core/snmp/msg_out.c
index 4defddc0..81d051c2 100644
--- a/src/core/snmp/msg_out.c
+++ b/src/core/snmp/msg_out.c
@@ -45,7 +45,7 @@
 #include "lwip/opt.h"
 
 #if LWIP_SNMP
-#include "arch/cc.h"
+
 #include "lwip/udp.h"
 #include "lwip/netif.h"
 
diff --git a/src/include/lwip/debug.h b/src/include/lwip/debug.h
index af0a48bd..306c4d10 100644
--- a/src/include/lwip/debug.h
+++ b/src/include/lwip/debug.h
@@ -32,7 +32,7 @@
 #ifndef __LWIP_DEBUG_H__
 #define __LWIP_DEBUG_H__
 
-#include "arch/cc.h"
+#include "lwip/arch.h"
 
 /** lower two bits indicate debug level
  * - 0 off
diff --git a/src/include/lwip/def.h b/src/include/lwip/def.h
index 1f5d47f5..d2ed251d 100644
--- a/src/include/lwip/def.h
+++ b/src/include/lwip/def.h
@@ -33,7 +33,7 @@
 #define __LWIP_DEF_H__
 
 /* this might define NULL already */
-#include "arch/cc.h"
+#include "lwip/arch.h"
 
 #define LWIP_MAX(x , y)  (((x) > (y)) ? (x) : (y))
 #define LWIP_MIN(x , y)  (((x) < (y)) ? (x) : (y))
diff --git a/src/include/lwip/err.h b/src/include/lwip/err.h
index b9cd6fb5..d0b63bd3 100644
--- a/src/include/lwip/err.h
+++ b/src/include/lwip/err.h
@@ -34,8 +34,6 @@
 
 #include "lwip/opt.h"
 
-#include "arch/cc.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h
index 331fc11a..f08c0af6 100644
--- a/src/include/lwip/pbuf.h
+++ b/src/include/lwip/pbuf.h
@@ -33,7 +33,7 @@
 #ifndef __LWIP_PBUF_H__
 #define __LWIP_PBUF_H__
 
-#include "arch/cc.h"
+#include "lwip/arch.h"
 #include "lwip/err.h"
 
 #ifdef __cplusplus
diff --git a/src/include/lwip/sio.h b/src/include/lwip/sio.h
index 1453127a..7437522c 100644
--- a/src/include/lwip/sio.h
+++ b/src/include/lwip/sio.h
@@ -32,7 +32,7 @@
  * It needs to be implemented by those platforms which need SLIP or PPP
  */
 
-#include "arch/cc.h"
+#include "lwip/arch.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/include/lwip/snmp_asn1.h b/src/include/lwip/snmp_asn1.h
index d753675e..a2a5bffc 100644
--- a/src/include/lwip/snmp_asn1.h
+++ b/src/include/lwip/snmp_asn1.h
@@ -36,7 +36,6 @@
 #define __LWIP_SNMP_ASN1_H__
 
 #include "lwip/opt.h"
-#include "arch/cc.h"
 #include "lwip/err.h"
 #include "lwip/pbuf.h"
 #include "lwip/snmp.h"
diff --git a/src/include/lwip/snmp_msg.h b/src/include/lwip/snmp_msg.h
index d419b26e..5eeead0b 100644
--- a/src/include/lwip/snmp_msg.h
+++ b/src/include/lwip/snmp_msg.h
@@ -36,7 +36,6 @@
 #define __LWIP_SNMP_MSG_H__
 
 #include "lwip/opt.h"
-#include "arch/cc.h"
 #include "lwip/snmp.h"
 #include "lwip/snmp_structs.h"
 
diff --git a/src/include/lwip/snmp_structs.h b/src/include/lwip/snmp_structs.h
index c9eba807..22c96dc7 100644
--- a/src/include/lwip/snmp_structs.h
+++ b/src/include/lwip/snmp_structs.h
@@ -40,7 +40,6 @@
 #include "lwip/opt.h"
 #if LWIP_SNMP
 
-#include "arch/cc.h"
 #include "lwip/snmp.h"
 
 #if SNMP_PRIVATE_MIB
diff --git a/src/include/lwip/stats.h b/src/include/lwip/stats.h
index 51563f76..1dbc0df9 100644
--- a/src/include/lwip/stats.h
+++ b/src/include/lwip/stats.h
@@ -33,7 +33,6 @@
 #define __LWIP_STATS_H__
 
 #include "lwip/opt.h"
-#include "arch/cc.h"
 
 #include "lwip/mem.h"
 #include "lwip/memp.h"
diff --git a/src/include/lwip/sys.h b/src/include/lwip/sys.h
index 3cde32f0..38d93ad1 100644
--- a/src/include/lwip/sys.h
+++ b/src/include/lwip/sys.h
@@ -32,8 +32,6 @@
 #ifndef __LWIP_SYS_H__
 #define __LWIP_SYS_H__
 
-#include "arch/cc.h"
-
 #include "lwip/opt.h"
 
 #ifdef __cplusplus