diff --git a/include/common/buffer.h b/include/common/buffer.h
index e9aae25..a42fc25 100644
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -28,7 +28,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <import/ist.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/pool.h>
diff --git a/include/common/hpack-dec.h b/include/common/hpack-dec.h
index f538332..1926574 100644
--- a/include/common/hpack-dec.h
+++ b/include/common/hpack-dec.h
@@ -29,7 +29,7 @@
 #define _COMMON_HPACK_DEC_H
 
 #include <haproxy/api.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/hpack-tbl.h>
 
 int hpack_decode_frame(struct hpack_dht *dht, const uint8_t *raw, uint32_t len,
diff --git a/include/common/htx.h b/include/common/htx.h
index e73b699..664aaca 100644
--- a/include/common/htx.h
+++ b/include/common/htx.h
@@ -26,7 +26,7 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <import/ist.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/http.h>
 #include <common/http-hdr.h>
 
diff --git a/include/common/standard.h b/include/common/standard.h
index 7a2ba2e..d2231d8 100644
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -39,7 +39,7 @@
 #include <arpa/inet.h>
 #include <haproxy/api.h>
 #include <haproxy/intops.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/namespace.h>
 #include <import/eb32tree.h>
 #include <import/eb32sctree.h>
diff --git a/include/common/chunk.h b/include/haproxy/chunk.h
similarity index 98%
rename from include/common/chunk.h
rename to include/haproxy/chunk.h
index 279b802..8bb9372 100644
--- a/include/common/chunk.h
+++ b/include/haproxy/chunk.h
@@ -1,5 +1,5 @@
 /*
- * include/common/chunk.h
+ * include/haproxy/chunk.h
  * Chunk management definitions, macros and inline functions.
  *
  * Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_CHUNK_H
-#define _TYPES_CHUNK_H
+#ifndef _HAPROXY_CHUNK_H
+#define _HAPROXY_CHUNK_H
 
 #include <stdlib.h>
 #include <string.h>
@@ -298,7 +298,7 @@
 	return dst->area;
 }
 
-#endif /* _TYPES_CHUNK_H */
+#endif /* _HAPROXY_CHUNK_H */
 
 /*
  * Local variables:
diff --git a/include/proto/channel.h b/include/proto/channel.h
index eaaa36b..a36b63a 100644
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/htx.h>
 #include <common/ticks.h>
 #include <haproxy/time.h>
diff --git a/include/types/applet.h b/include/types/applet.h
index 1f16543..ac7f38d 100644
--- a/include/types/applet.h
+++ b/include/types/applet.h
@@ -29,7 +29,7 @@
 #include <types/proxy.h>
 #include <types/stream.h>
 #include <common/buffer.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/xref.h>
 
 struct appctx;
diff --git a/include/types/arg.h b/include/types/arg.h
index 366c09e..6cd739f 100644
--- a/include/types/arg.h
+++ b/include/types/arg.h
@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <haproxy/list-t.h>
 
 #include <types/vars.h>
diff --git a/include/types/proxy.h b/include/types/proxy.h
index aeec0ed..4e095ef 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -28,7 +28,7 @@
 #include <arpa/inet.h>
 
 #include <haproxy/api-t.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/http.h>
 #include <haproxy/list-t.h>
 #include <common/regex.h>