diff --git a/src/Filelists.mk b/src/Filelists.mk
index f0b9392a..70feab2f 100644
--- a/src/Filelists.mk
+++ b/src/Filelists.mk
@@ -45,7 +45,7 @@ COREFILES=$(LWIPDIR)/core/def.c \
 	$(LWIPDIR)/core/tcp.c \
 	$(LWIPDIR)/core/tcp_in.c \
 	$(LWIPDIR)/core/tcp_out.c \
-	$(LWIPDIR)/core/timers.c \
+	$(LWIPDIR)/core/timeouts.c \
 	$(LWIPDIR)/core/udp.c
 
 CORE4FILES=$(LWIPDIR)/core/ipv4/autoip.c \
diff --git a/src/apps/sntp/sntp.c b/src/apps/sntp/sntp.c
index a2f40a31..365ac7ad 100644
--- a/src/apps/sntp/sntp.c
+++ b/src/apps/sntp/sntp.c
@@ -48,7 +48,7 @@
 #include "lwip/apps/sntp.h"
 
 #include "lwip/opt.h"
-#include "lwip/timers.h"
+#include "lwip/timeouts.h"
 #include "lwip/udp.h"
 #include "lwip/dns.h"
 #include "lwip/ip_addr.h"
diff --git a/src/core/init.c b/src/core/init.c
index a2e5a173..5290e8d6 100644
--- a/src/core/init.c
+++ b/src/core/init.c
@@ -53,7 +53,7 @@
 #include "lwip/autoip.h"
 #include "lwip/igmp.h"
 #include "lwip/dns.h"
-#include "lwip/timers.h"
+#include "lwip/timeouts.h"
 #include "lwip/etharp.h"
 #include "lwip/ip6.h"
 #include "lwip/nd6.h"
diff --git a/src/core/memp.c b/src/core/memp.c
index 81db2492..73de1699 100644
--- a/src/core/memp.c
+++ b/src/core/memp.c
@@ -49,7 +49,7 @@
 #include "lwip/priv/api_msg.h"
 #include "lwip/sockets.h"
 #include "lwip/sys.h"
-#include "lwip/timers.h"
+#include "lwip/timeouts.h"
 #include "lwip/stats.h"
 #include "lwip/etharp.h"
 #include "lwip/ip4_frag.h"
diff --git a/src/core/timers.c b/src/core/timeouts.c
similarity index 99%
rename from src/core/timers.c
rename to src/core/timeouts.c
index b8a7fd45..40f74ba7 100644
--- a/src/core/timers.c
+++ b/src/core/timeouts.c
@@ -41,7 +41,7 @@
 
 #include "lwip/opt.h"
 
-#include "lwip/timers.h"
+#include "lwip/timeouts.h"
 #include "lwip/priv/tcp_priv.h"
 
 #include "lwip/def.h"
diff --git a/src/include/lwip/priv/tcpip_priv.h b/src/include/lwip/priv/tcpip_priv.h
index 3d8f38e4..d9fe37ae 100644
--- a/src/include/lwip/priv/tcpip_priv.h
+++ b/src/include/lwip/priv/tcpip_priv.h
@@ -43,7 +43,7 @@
 
 #include "lwip/tcpip.h"
 #include "lwip/sys.h"
-#include "lwip/timers.h"
+#include "lwip/timeouts.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/include/lwip/tcpip.h b/src/include/lwip/tcpip.h
index 15662e9a..49a732c5 100644
--- a/src/include/lwip/tcpip.h
+++ b/src/include/lwip/tcpip.h
@@ -42,7 +42,7 @@
 #if !NO_SYS /* don't build if not configured for use in lwipopts.h */
 
 #include "lwip/err.h"
-#include "lwip/timers.h"
+#include "lwip/timeouts.h"
 #include "lwip/netif.h"
 
 #ifdef __cplusplus
diff --git a/src/include/lwip/timers.h b/src/include/lwip/timeouts.h
similarity index 97%
rename from src/include/lwip/timers.h
rename to src/include/lwip/timeouts.h
index 13259b19..42d22eda 100644
--- a/src/include/lwip/timers.h
+++ b/src/include/lwip/timeouts.h
@@ -35,8 +35,8 @@
  *         Simon Goldschmidt
  *
  */
-#ifndef LWIP_HDR_TIMERS_H
-#define LWIP_HDR_TIMERS_H
+#ifndef LWIP_HDR_TIMEOUTS_H
+#define LWIP_HDR_TIMEOUTS_H
 
 #include "lwip/opt.h"
 
@@ -127,4 +127,4 @@ void sys_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg);
 }
 #endif
 
-#endif /* LWIP_HDR_TIMERS_H */
+#endif /* LWIP_HDR_TIMEOUTS_H */
diff --git a/src/include/netif/ppp/ppp.h b/src/include/netif/ppp/ppp.h
index 883a23b5..016d6ba2 100644
--- a/src/include/netif/ppp/ppp.h
+++ b/src/include/netif/ppp/ppp.h
@@ -42,7 +42,7 @@
 #include "lwip/mem.h"
 #include "lwip/netif.h"
 #include "lwip/sys.h"
-#include "lwip/timers.h"
+#include "lwip/timeouts.h"
 #if PPP_IPV6_SUPPORT
 #include "lwip/ip6_addr.h"
 #endif /* PPP_IPV6_SUPPORT */
diff --git a/src/include/netif/ppp/ppp_impl.h b/src/include/netif/ppp/ppp_impl.h
index b98d6286..1b27415f 100644
--- a/src/include/netif/ppp/ppp_impl.h
+++ b/src/include/netif/ppp/ppp_impl.h
@@ -48,7 +48,7 @@
 
 #include "lwip/netif.h"
 #include "lwip/def.h"
-#include "lwip/timers.h"
+#include "lwip/timeouts.h"
 
 #include "ppp.h"
 #include "pppdebug.h"
diff --git a/src/netif/ppp/pppoe.c b/src/netif/ppp/pppoe.c
index be75f007..348129ac 100644
--- a/src/netif/ppp/pppoe.c
+++ b/src/netif/ppp/pppoe.c
@@ -76,7 +76,7 @@
 #include <stdio.h>
 #endif /* UNUSED */
 
-#include "lwip/timers.h"
+#include "lwip/timeouts.h"
 #include "lwip/memp.h"
 #include "lwip/stats.h"
 #include "lwip/snmp.h"