diff --git a/src/backend.c b/src/backend.c
index c9abbc7..9f87a3c 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -24,7 +24,7 @@
 #include <common/htx.h>
 #include <common/ticks.h>
 #include <haproxy/time.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
 
 #include <types/global.h>
 
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 205f4fb..8cdfb15 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -41,7 +41,7 @@
 #include <common/standard.h>
 #include <haproxy/time.h>
 #include <common/uri_auth.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
 #include <haproxy/thread.h>
 
 #include <types/capture.h>
diff --git a/src/connection.c b/src/connection.c
index a74585a..688be9a 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -14,7 +14,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
 #include <haproxy/hash.h>
 #include <haproxy/net_helper.h>
 
diff --git a/src/filters.c b/src/filters.c
index 1b71573..50d1c8a 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -15,7 +15,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <common/htx.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
 #include <common/standard.h>
 
 #include <types/filters.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index 8e53420..36f6694 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -88,7 +88,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/openssl-compat.h>
 #include <common/regex.h>
diff --git a/src/namespace.c b/src/namespace.c
index 6165994..4f82c62 100644
--- a/src/namespace.c
+++ b/src/namespace.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
 #include <haproxy/hash.h>
 #include <haproxy/errors.h>
 #include <proto/log.h>
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 9d87515..973a4d3 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -34,7 +34,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
 #include <common/standard.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
 
 #include <types/action.h>
 #include <types/connection.h>
diff --git a/src/server.c b/src/server.c
index d06c465..29919ee 100644
--- a/src/server.c
+++ b/src/server.c
@@ -19,7 +19,7 @@
 
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
 #include <haproxy/time.h>
 
 #include <types/applet.h>
diff --git a/src/standard.c b/src/standard.c
index 2b32429..8e9722e 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -38,6 +38,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
+#include <haproxy/namespace.h>
 #include <common/standard.h>
 #include <types/global.h>
 #include <proto/applet.h>