diff --git a/include/proto/freq_ctr.h b/include/proto/freq_ctr.h
index 896a469..332d720 100644
--- a/include/proto/freq_ctr.h
+++ b/include/proto/freq_ctr.h
@@ -24,7 +24,7 @@
 
 #include <haproxy/atomic.h>
 #include <haproxy/api.h>
-#include <common/standard.h>
+#include <haproxy/intops.h>
 #include <haproxy/time.h>
 #include <types/freq_ctr.h>
 
diff --git a/include/proto/pattern.h b/include/proto/pattern.h
index 2d51d95..73c48cc 100644
--- a/include/proto/pattern.h
+++ b/include/proto/pattern.h
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/standard.h>
 #include <types/pattern.h>
 
 /* pattern management function arrays */
diff --git a/include/proto/signal.h b/include/proto/signal.h
index b2fd2c8..aaa23f6 100644
--- a/include/proto/signal.h
+++ b/include/proto/signal.h
@@ -12,7 +12,6 @@
  */
 
 #include <signal.h>
-#include <common/standard.h>
 #include <haproxy/thread.h>
 
 #include <types/signal.h>
diff --git a/include/proto/spoe.h b/include/proto/spoe.h
index b3f7b4f..584b38a 100644
--- a/include/proto/spoe.h
+++ b/include/proto/spoe.h
@@ -22,7 +22,7 @@
 #ifndef _PROTO_SPOE_H
 #define _PROTO_SPOE_H
 
-#include <common/standard.h>
+#include <haproxy/intops.h>
 
 #include <types/spoe.h>
 
diff --git a/include/proto/stats.h b/include/proto/stats.h
index 5342e12..01c08ba 100644
--- a/include/proto/stats.h
+++ b/include/proto/stats.h
@@ -23,6 +23,7 @@
 #ifndef _PROTO_STATS_H
 #define _PROTO_STATS_H
 
+#include <common/standard.h>
 #include <haproxy/api.h>
 #include <types/applet.h>
 #include <types/stream_interface.h>
diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index dcc2954..eab3800 100644
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -24,6 +24,7 @@
 #define _PROTO_STICK_TABLE_H
 
 #include <haproxy/errors.h>
+#include <common/standard.h>
 #include <common/ticks.h>
 #include <haproxy/time.h>
 #include <types/stick_table.h>
diff --git a/include/proto/task.h b/include/proto/task.h
index 05b048b..d5cded3 100644
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -27,8 +27,8 @@
 
 #include <haproxy/api.h>
 #include <common/memory.h>
+#include <haproxy/intops.h>
 #include <haproxy/list.h>
-#include <common/standard.h>
 #include <common/ticks.h>
 #include <haproxy/thread.h>
 
diff --git a/include/proto/trace.h b/include/proto/trace.h
index 1447940..7a2b5e7 100644
--- a/include/proto/trace.h
+++ b/include/proto/trace.h
@@ -24,6 +24,7 @@
 
 #include <haproxy/api.h>
 #include <common/buffer.h>
+#include <common/standard.h>
 #include <import/ist.h>
 #include <haproxy/list.h>
 #include <types/log.h>