diff --git a/src/flash/flash.c b/src/flash/flash.c
index 1e5ac9a35..e910e42f9 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -30,7 +30,7 @@
 #include "flash.h"
 #include "common.h"
 #include "image.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 
 static int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock);
 
diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 43d8ddd32..63e71db1c 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -23,7 +23,7 @@
 
 #include "mflash.h"
 #include "target.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 #include <helper/fileio.h>
 #include <helper/log.h>
 
diff --git a/src/flash/nand.c b/src/flash/nand.c
index 087a9ae45..5bcbea47b 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -26,7 +26,7 @@
 
 #include "nand.h"
 #include "common.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 #include <helper/fileio.h>
 
 static int nand_read_page(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c
index 109b48665..f7aa7468b 100644
--- a/src/flash/nor/aduc702x.c
+++ b/src/flash/nor/aduc702x.c
@@ -26,7 +26,7 @@
 #include "flash.h"
 #include "armv4_5.h"
 #include <helper/binarybuffer.h>
-#include "time_support.h"
+#include <helper/time_support.h>
 #include "algorithm.h"
 
 
diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index 6be43f80f..b27ea941c 100644
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -64,7 +64,7 @@
 #include "flash.h"
 #include <helper/membuf.h>
 #include "at91sam3.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 
 #define REG_NAME_WIDTH  (12)
 
diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index 29b6389ce..30695a9ab 100644
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -43,7 +43,7 @@
 /* project specific includes */
 #include "interface.h"
 #include "commands.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 
 #if IS_CYGWIN == 1
 #include <windows.h>
diff --git a/src/jtag/drivers/presto.c b/src/jtag/drivers/presto.c
index f4e689c2a..e00bac710 100644
--- a/src/jtag/drivers/presto.c
+++ b/src/jtag/drivers/presto.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "interface.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 #include "bitq.h"
 
 
diff --git a/src/pld/pld.c b/src/pld/pld.c
index 985e36485..6a0bd93dc 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -23,7 +23,7 @@
 
 #include "pld.h"
 #include <helper/log.h>
-#include "time_support.h"
+#include <helper/time_support.h>
 
 
 /* pld drivers
diff --git a/src/svf/svf.c b/src/svf/svf.c
index e01b9332c..654957291 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -33,7 +33,7 @@
 
 #include "jtag.h"
 #include "svf.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 
 
 // SVF command
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 44c9ad300..124868e5d 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -30,7 +30,7 @@
 #include "breakpoints.h"
 #include "arm11_dbgtap.h"
 #include "arm_simulator.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 #include "target_type.h"
 #include "algorithm.h"
 #include "register.h"
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 7e1e9cba7..3df1c6589 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -27,7 +27,7 @@
 #include "arm_jtag.h"
 #include "arm11_dbgtap.h"
 
-#include "time_support.h"
+#include <helper/time_support.h>
 
 #if 0
 #define JTAG_DEBUG(expr ...)	do { if (1) LOG_DEBUG(expr); } while (0)
diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index d900d8ae2..a4d274ea3 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "arm720t.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 #include "target_type.h"
 #include "register.h"
 
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index b5553cd80..255a85f57 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -34,7 +34,7 @@
 #include "embeddedice.h"
 #include "target_request.h"
 #include "etm.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 #include "arm_simulator.h"
 #include "algorithm.h"
 #include "register.h"
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 17e7a55ae..e8c1950fa 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "arm920t.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 #include "target_type.h"
 #include "register.h"
 
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index ca420aa69..4dec23da7 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "arm926ejs.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 #include "target_type.h"
 #include "register.h"
 
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 72408e1e6..6ca50ab7c 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -39,7 +39,7 @@
 #endif
 
 #include "arm_adi_v5.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 
 /*
  * Transaction Mode:
diff --git a/src/target/target.c b/src/target/target.c
index 9a605f3dc..e42601956 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -37,7 +37,7 @@
 #include "target_type.h"
 #include "target_request.h"
 #include "breakpoints.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 #include "register.h"
 #include "trace.h"
 #include "image.h"
diff --git a/src/target/xscale.c b/src/target/xscale.c
index ccb1de563..1acaba076 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -33,7 +33,7 @@
 #include "arm_jtag.h"
 #include "arm_simulator.h"
 #include "arm_disassembler.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 #include "register.h"
 #include "image.h"