diff --git a/include/common/fcgi.h b/include/common/fcgi.h
index b822a2c84..43174f095 100644
--- a/include/common/fcgi.h
+++ b/include/common/fcgi.h
@@ -24,7 +24,6 @@
 
 #include <stdio.h>
 #include <haproxy/api.h>
-#include <common/standard.h>
 #include <haproxy/buf-t.h>
 #include <import/ist.h>
 
diff --git a/include/common/h1.h b/include/common/h1.h
index f75ee11fb..1295b1420 100644
--- a/include/common/h1.h
+++ b/include/common/h1.h
@@ -23,11 +23,11 @@
 #define _COMMON_H1_H
 
 #include <haproxy/api.h>
+#include <haproxy/intops.h>
 #include <common/buffer.h>
 #include <common/http.h>
 #include <common/http-hdr.h>
 #include <import/ist.h>
-#include <common/standard.h>
 
 
 /* Possible states while parsing HTTP/1 messages (request|response) */
diff --git a/include/common/htx.h b/include/common/htx.h
index 197ffb6e6..e73b69939 100644
--- a/include/common/htx.h
+++ b/include/common/htx.h
@@ -26,9 +26,9 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <import/ist.h>
+#include <common/chunk.h>
 #include <common/http.h>
 #include <common/http-hdr.h>
-#include <common/standard.h>
 
 /*
  * The internal representation of an HTTP message, called HTX, is a structure
diff --git a/include/common/net_helper.h b/include/common/net_helper.h
index 8fdf12088..5911ca4da 100644
--- a/include/common/net_helper.h
+++ b/include/common/net_helper.h
@@ -28,7 +28,7 @@
 #define _COMMON_NET_HELPER_H
 
 #include <haproxy/api.h>
-#include <common/standard.h>
+#include <haproxy/intops.h>
 #include <arpa/inet.h>
 
 /* Functions to read/write various integers that may be unaligned */
diff --git a/include/common/ticks.h b/include/common/ticks.h
index 807b323df..7fd0bbab2 100644
--- a/include/common/ticks.h
+++ b/include/common/ticks.h
@@ -53,7 +53,6 @@
 #define _COMMON_TICKS_H
 
 #include <haproxy/api.h>
-#include <common/standard.h>
 
 #define TICK_ETERNITY   0
 
diff --git a/include/proto/freq_ctr.h b/include/proto/freq_ctr.h
index 896a4694e..332d720b3 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 2d51d95ad..73c48cc3b 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 b2fd2c891..aaa23f633 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 b3f7b4f8b..584b38af8 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 5342e12a0..01c08ba13 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 dcc29546b..eab3800b8 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 05b048b5a..d5cded3cf 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 144794057..7a2b5e7e1 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>
diff --git a/include/types/checks.h b/include/types/checks.h
index 3ea4a0638..243a1ef03 100644
--- a/include/types/checks.h
+++ b/include/types/checks.h
@@ -16,7 +16,6 @@
 #include <haproxy/api-t.h>
 #include <import/ebpttree.h>
 
-#include <common/standard.h>
 #include <import/ist.h>
 #include <haproxy/list-t.h>
 #include <common/regex.h>
diff --git a/include/types/signal.h b/include/types/signal.h
index 838aefd65..70cce77e2 100644
--- a/include/types/signal.h
+++ b/include/types/signal.h
@@ -18,7 +18,6 @@
 #include <signal.h>
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
-#include <common/standard.h>
 
 /* flags for -> flags */
 #define SIG_F_ONE_SHOOT         0x0001  /* unregister handler before calling it */
diff --git a/src/hlua.c b/src/hlua.c
index 84fcf8b03..06c45b6c1 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -28,6 +28,7 @@
 #include <haproxy/thread.h>
 #include <common/xref.h>
 #include <common/h1.h>
+#include <common/standard.h>
 
 #include <types/cli.h>
 #include <types/hlua.h>