diff --git a/esp-link/cgiflash.c b/esp-link/cgiflash.c
index f909e28..f190b23 100644
--- a/esp-link/cgiflash.c
+++ b/esp-link/cgiflash.c
@@ -13,10 +13,7 @@ Some flash handling cgi routines. Used for reading the existing flash and updati
  * ----------------------------------------------------------------------------
  */
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
-#include <osapi.h>
 #include "cgi.h"
 #include "cgiflash.h"
 
diff --git a/esp-link/cgioptiboot.c b/esp-link/cgioptiboot.c
index ecaa242..7f19cac 100644
--- a/esp-link/cgioptiboot.c
+++ b/esp-link/cgioptiboot.c
@@ -1,9 +1,6 @@
 // Copyright (c) 2015 by Thorsten von Eicken, see LICENSE.txt in the esp-link repo
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
-#include <osapi.h>
 #include "cgi.h"
 #include "cgioptiboot.h"
 #include "config.h"
diff --git a/esp-link/cgiservices.c b/esp-link/cgiservices.c
index e284b9e..cac9313 100644
--- a/esp-link/cgiservices.c
+++ b/esp-link/cgiservices.c
@@ -1,4 +1,3 @@
-#define USE_US_TIMER
 
 #include <esp8266.h>
 #include "cgiwifi.h"
diff --git a/esp-link/cgiwifi.c b/esp-link/cgiwifi.c
index 2be8b02..6ccbaef 100644
--- a/esp-link/cgiwifi.c
+++ b/esp-link/cgiwifi.c
@@ -13,8 +13,6 @@ Cgi/template routines for the /wifi url.
  * ----------------------------------------------------------------------------
  */
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include "cgiwifi.h"
 #include "cgi.h"
diff --git a/esp-link/config.c b/esp-link/config.c
index 026d139..2ae3d45 100644
--- a/esp-link/config.c
+++ b/esp-link/config.c
@@ -2,7 +2,6 @@
 /* Configuration stored in flash */
 
 #include <esp8266.h>
-#include <osapi.h>
 #include "config.h"
 #include "espfs.h"
 #include "crc16.h"
diff --git a/esp-link/main.c b/esp-link/main.c
index fcbfabb..5c9197d 100644
--- a/esp-link/main.c
+++ b/esp-link/main.c
@@ -9,8 +9,6 @@
 * ----------------------------------------------------------------------------
 */
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include "httpd.h"
 #include "httpdespfs.h"
diff --git a/esp-link/status.c b/esp-link/status.c
index ef8813d..70a96d0 100644
--- a/esp-link/status.c
+++ b/esp-link/status.c
@@ -1,7 +1,5 @@
 // Copyright 2015 by Thorsten von Eicken, see LICENSE.txt
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include "config.h"
 #include "serled.h"
diff --git a/include/esp8266.h b/include/esp8266.h
index 3e7eeb9..5d26905 100644
--- a/include/esp8266.h
+++ b/include/esp8266.h
@@ -14,6 +14,8 @@
 #include <ets_sys.h>
 #include <gpio.h>
 #include <mem.h>
+
+#define USE_US_TIMER
 #include <osapi.h>
 #include <upgrade.h>
 
@@ -24,4 +26,4 @@
 #include <_mingw.h>
 #endif
 
-#endif // _ESP8266_H_
\ No newline at end of file
+#endif // _ESP8266_H_
diff --git a/mqtt/mqtt.c b/mqtt/mqtt.c
index cce321b..9b68e95 100644
--- a/mqtt/mqtt.c
+++ b/mqtt/mqtt.c
@@ -37,8 +37,6 @@
 // Allow messages that don't require ACK to be sent even when pending_buffer is != NULL
 // Set dup flag in retransmissions
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include "pktbuf.h"
 #include "mqtt.h"
diff --git a/serial/serled.c b/serial/serled.c
index 653074d..c1a293f 100644
--- a/serial/serled.c
+++ b/serial/serled.c
@@ -1,7 +1,5 @@
 // Copyright 2015 by Thorsten von Eicken, see LICENSE.txt
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include <config.h>
 #include <serled.h>
diff --git a/serial/uart.c b/serial/uart.c
index 206006c..982b456 100644
--- a/serial/uart.c
+++ b/serial/uart.c
@@ -17,11 +17,9 @@
  * ----------------------------------------------------------------------------
  * Heavily modified and enhanced by Thorsten von Eicken in 2015
  */
-#define USE_US_TIMER
 #include "esp8266.h"
 #include "task.h"
 #include "uart.h"
-#include <osapi.h>
 
 #ifdef UART_DBG
 #define DBG_UART(format, ...) os_printf(format, ## __VA_ARGS__)
diff --git a/syslog/syslog.c b/syslog/syslog.c
index 7fc2cab..6d0d4ac 100644
--- a/syslog/syslog.c
+++ b/syslog/syslog.c
@@ -8,8 +8,6 @@
  *
  */
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include "config.h"
 #include "syslog.h"