diff --git a/include/common/xref.h b/include/common/xref.h
index 610a023c0..bdf292d88 100644
--- a/include/common/xref.h
+++ b/include/common/xref.h
@@ -1,7 +1,7 @@
 #ifndef __XREF_H__
 #define __XREF_H__
 
-#include <common/hathreads.h>
+#include <haproxy/atomic.h>
 
 /* xref is used to create relation between two elements.
  * Once an element is released, it breaks the relation. If the
diff --git a/include/proto/activity.h b/include/proto/activity.h
index 26365ca8b..9d5044a08 100644
--- a/include/proto/activity.h
+++ b/include/proto/activity.h
@@ -22,8 +22,8 @@
 #ifndef _PROTO_ACTIVITY_H
 #define _PROTO_ACTIVITY_H
 
+#include <haproxy/atomic.h>
 #include <haproxy/api.h>
-#include <common/hathreads.h>
 #include <common/time.h>
 #include <types/activity.h>
 #include <proto/freq_ctr.h>
diff --git a/include/proto/freq_ctr.h b/include/proto/freq_ctr.h
index 7413803ef..80529bf23 100644
--- a/include/proto/freq_ctr.h
+++ b/include/proto/freq_ctr.h
@@ -22,10 +22,10 @@
 #ifndef _PROTO_FREQ_CTR_H
 #define _PROTO_FREQ_CTR_H
 
+#include <haproxy/atomic.h>
 #include <haproxy/api.h>
 #include <common/standard.h>
 #include <common/time.h>
-#include <common/hathreads.h>
 #include <types/freq_ctr.h>
 
 
diff --git a/include/types/fd.h b/include/types/fd.h
index 7ec97bc74..505291f9a 100644
--- a/include/types/fd.h
+++ b/include/types/fd.h
@@ -23,7 +23,6 @@
 #define _TYPES_FD_H
 
 #include <haproxy/api-t.h>
-#include <common/hathreads.h>
 #include <import/ist.h>
 #include <types/port_range.h>
 
diff --git a/include/types/queue.h b/include/types/queue.h
index 933346894..d2cb0fffb 100644
--- a/include/types/queue.h
+++ b/include/types/queue.h
@@ -24,7 +24,6 @@
 
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
-#include <common/hathreads.h>
 
 #include <types/server.h>
 
diff --git a/src/filters.c b/src/filters.c
index f8cb52669..e9f846b66 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -17,7 +17,6 @@
 #include <common/htx.h>
 #include <common/namespace.h>
 #include <common/standard.h>
-#include <common/hathreads.h>
 
 #include <types/filters.h>
 #include <types/http_ana.h>
diff --git a/src/flt_trace.c b/src/flt_trace.c
index a33629636..fdc74a7eb 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -13,7 +13,6 @@
 #include <ctype.h>
 
 #include <haproxy/api.h>
-#include <common/hathreads.h>
 #include <common/htx.h>
 #include <common/standard.h>
 #include <common/time.h>
diff --git a/src/signal.c b/src/signal.c
index 288ef007d..d989ef66b 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -13,8 +13,6 @@
 #include <signal.h>
 #include <string.h>
 
-#include <common/hathreads.h>
-
 #include <proto/signal.h>
 #include <proto/log.h>
 #include <proto/task.h>