diff --git a/include/common/ticks.h b/include/haproxy/ticks.h
similarity index 80%
rename from include/common/ticks.h
rename to include/haproxy/ticks.h
index 7fd0bbab2..52344ae25 100644
--- a/include/common/ticks.h
+++ b/include/haproxy/ticks.h
@@ -1,23 +1,23 @@
 /*
-  include/common/ticks.h
-  Functions and macros for manipulation of expiration timers
-
-  Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
-  
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1
-  exclusively.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * include/haproxy/ticks.h
+ * Functions and macros for manipulation of expiration timers
+ *
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 /*
  * Using a mix of milliseconds and timeval for internal timers is expensive and
@@ -49,8 +49,8 @@
  * the dedicated tick_add() function.
  */
 
-#ifndef _COMMON_TICKS_H
-#define _COMMON_TICKS_H
+#ifndef _HAPROXY_TICKS_H
+#define _HAPROXY_TICKS_H
 
 #include <haproxy/api.h>
 
@@ -143,7 +143,7 @@ static inline int tick_remain(int now, int exp)
 	return exp - now;
 }
 
-#endif /* _COMMON_TICKS_H */
+#endif /* _HAPROXY_TICKS_H */
 
 /*
  * Local variables:
diff --git a/include/proto/channel.h b/include/proto/channel.h
index d343c0276..8e19562d0 100644
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -31,7 +31,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/dynbuf.h>
 #include <common/htx.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/channel.h>
diff --git a/include/proto/fd.h b/include/proto/fd.h
index 2d45e0666..654423915 100644
--- a/include/proto/fd.h
+++ b/include/proto/fd.h
@@ -28,7 +28,7 @@
 #include <unistd.h>
 
 #include <haproxy/api.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <types/fd.h>
 #include <haproxy/activity.h>
diff --git a/include/proto/peers.h b/include/proto/peers.h
index 02fc67d69..40a9b7e2b 100644
--- a/include/proto/peers.h
+++ b/include/proto/peers.h
@@ -23,7 +23,7 @@
 #define _PROTO_PEERS_H
 
 #include <haproxy/api.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <proto/connection.h>
 #include <types/stream.h>
diff --git a/include/proto/proxy.h b/include/proto/proxy.h
index e1da0f58f..caf1c8654 100644
--- a/include/proto/proxy.h
+++ b/include/proto/proxy.h
@@ -23,7 +23,7 @@
 #define _PROTO_PROXY_H
 
 #include <haproxy/api.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <types/applet.h>
 #include <types/global.h>
diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index eab3800b8..1a5a13d0f 100644
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -25,7 +25,7 @@
 
 #include <haproxy/errors.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <types/stick_table.h>
 #include <types/dict.h>
diff --git a/include/proto/task.h b/include/proto/task.h
index 5a3d0210d..c928a11c0 100644
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -29,7 +29,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/intops.h>
 #include <haproxy/list.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/thread.h>
 
 #include <import/eb32sctree.h>
diff --git a/src/backend.c b/src/backend.c
index 9f87a3c0b..a002bbe0a 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -22,7 +22,7 @@
 #include <haproxy/api.h>
 #include <haproxy/hash.h>
 #include <common/htx.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <haproxy/namespace.h>
 
diff --git a/src/cli.c b/src/cli.c
index b9a23692a..00cf50778 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -30,7 +30,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/list.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <common/uri_auth.h>
 #include <haproxy/version.h>
diff --git a/src/dns.c b/src/dns.c
index 20ccc6dee..039021206 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -23,7 +23,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/time.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/net_helper.h>
 
 #include <types/action.h>
diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index 4ddf8c573..65ff1b50d 100644
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -17,7 +17,7 @@
 #include <haproxy/api.h>
 #include <haproxy/thread-t.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/global.h>
diff --git a/src/ev_evports.c b/src/ev_evports.c
index b65c18e3b..9f3158ae0 100644
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -20,7 +20,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/thread-t.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/global.h>
diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index ee8802051..95a6897fa 100644
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -19,7 +19,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/thread-t.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/global.h>
diff --git a/src/ev_poll.c b/src/ev_poll.c
index 0d0c147d0..0d0fcaa92 100644
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -19,7 +19,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/thread-t.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/global.h>
diff --git a/src/ev_select.c b/src/ev_select.c
index c1e3edf6d..c6c3f438c 100644
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -16,7 +16,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/thread-t.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/global.h>
diff --git a/src/raw_sock.c b/src/raw_sock.c
index faa8e1e97..744544b23 100644
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -25,7 +25,7 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <proto/connection.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index e89fa5ae6..476469f3d 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -49,7 +49,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/openssl-compat.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <haproxy/base64.h>
 
diff --git a/src/stats.c b/src/stats.c
index 0869d5499..b5f5e9c89 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -32,7 +32,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <common/uri_auth.h>
 #include <haproxy/version.h>
diff --git a/src/stream_interface.c b/src/stream_interface.c
index d0f5f1abe..dbd9cdfe3 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -22,7 +22,7 @@
 #include <haproxy/api.h>
 #include <haproxy/dynbuf.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <proto/applet.h>
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index f79d2a3f7..c08d716a7 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -13,7 +13,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/list.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/arg.h>