diff --git a/contrib/modsecurity/modsec_wrapper.c b/contrib/modsecurity/modsec_wrapper.c
index 6306b0b..8b9d998 100644
--- a/contrib/modsecurity/modsec_wrapper.c
+++ b/contrib/modsecurity/modsec_wrapper.c
@@ -22,7 +22,7 @@
 #include <types/global.h>
 #include <types/stream.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/log.h>
 #include <proto/spoe.h>
 
diff --git a/include/types/arg.h b/include/haproxy/arg-t.h
similarity index 96%
rename from include/types/arg.h
rename to include/haproxy/arg-t.h
index 6cd739f..1a4208d 100644
--- a/include/types/arg.h
+++ b/include/haproxy/arg-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/arg.h
+ * include/haproxy/arg-t.h
  * This file contains structure declarations for generaic argument parsing.
  *
  * Copyright 2012 Willy Tarreau <w@1wt.eu>
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _TYPES_ARG_H
-#define _TYPES_ARG_H
+#ifndef _HAPROXY_ARG_T_H
+#define _HAPROXY_ARG_T_H
 
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <haproxy/chunk.h>
+#include <haproxy/buf-t.h>
 #include <haproxy/list-t.h>
 
 #include <types/vars.h>
@@ -133,7 +133,7 @@
 	int line;                 /* line number where the args are referenced */
 };
 
-#endif /* _TYPES_ARG_H */
+#endif /* _HAPROXY_ARG_T_H */
 
 /*
  * Local variables:
diff --git a/include/proto/arg.h b/include/haproxy/arg.h
similarity index 96%
rename from include/proto/arg.h
rename to include/haproxy/arg.h
index 884e5bb..1817dae 100644
--- a/include/proto/arg.h
+++ b/include/haproxy/arg.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/arg.h
+ * include/haproxy/arg.h
  * This file contains functions and macros declarations for generic argument parsing.
  *
  * Copyright 2012 Willy Tarreau <w@1wt.eu>
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _PROTO_ARG_H
-#define _PROTO_ARG_H
+#ifndef _HAPROXY_ARG_H
+#define _HAPROXY_ARG_H
 
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 
 /* Some macros used to build some arg list. We can declare various argument
  * combinations from 0 to 7 args using a single 32-bit integer. The first
@@ -83,7 +83,7 @@
                   char **err_msg, const char **end_ptr, int *err_arg,
                   struct arg_list *al);
 
-#endif /* _PROTO_ARG_H */
+#endif /* _HAPROXY_ARG_H */
 
 /*
  * Local variables:
diff --git a/include/proto/http_fetch.h b/include/proto/http_fetch.h
index 8df991c..e631bc0 100644
--- a/include/proto/http_fetch.h
+++ b/include/proto/http_fetch.h
@@ -24,7 +24,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/htx.h>
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 #include <types/channel.h>
 #include <types/checks.h>
 #include <types/sample.h>
diff --git a/include/proto/protocol_buffers.h b/include/proto/protocol_buffers.h
index 0426d83..3e1571a 100644
--- a/include/proto/protocol_buffers.h
+++ b/include/proto/protocol_buffers.h
@@ -23,7 +23,7 @@
 #define _PROTO_PROTOCOL_BUFFERS_H
 
 #include <inttypes.h>
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 #include <types/protocol_buffers.h>
 #include <proto/sample.h>
 
diff --git a/include/types/acl.h b/include/types/acl.h
index 7afa3d8..89c3c93 100644
--- a/include/types/acl.h
+++ b/include/types/acl.h
@@ -25,7 +25,7 @@
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 #include <types/auth.h>
 #include <types/pattern.h>
 #include <types/proxy.h>
diff --git a/src/51d.c b/src/51d.c
index d6033f3..ceff828 100644
--- a/src/51d.c
+++ b/src/51d.c
@@ -8,7 +8,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/thread.h>
 #include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_fetch.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
diff --git a/src/acl.c b/src/acl.c
index 16e7753..5b5fd1d 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -22,7 +22,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/auth.h>
 #include <proto/channel.h>
 #include <proto/log.h>
diff --git a/src/arg.c b/src/arg.c
index 9c4fa44..467929b 100644
--- a/src/arg.c
+++ b/src/arg.c
@@ -17,7 +17,7 @@
 #include <haproxy/tools.h>
 #include <haproxy/chunk.h>
 #include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 
 const char *arg_type_names[ARGT_NBTYPES] = {
 	[ARGT_STOP] = "end of arguments",
diff --git a/src/backend.c b/src/backend.c
index 22f8603..7169058 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -31,7 +31,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <proto/channel.h>
 #include <proto/checks.h>
diff --git a/src/checks.c b/src/checks.c
index 279e8af..81ca77b 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -49,7 +49,7 @@
 #include <types/dns.h>
 #include <types/stats.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <proto/checks.h>
 #include <proto/stats.h>
diff --git a/src/da.c b/src/da.c
index a9bc696..8ff5bfa 100644
--- a/src/da.c
+++ b/src/da.c
@@ -6,7 +6,7 @@
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_fetch.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 4bb259e..9191523 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -19,12 +19,12 @@
 #include <haproxy/pool.h>
 #include <haproxy/time.h>
 
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 #include <types/global.h>
 #include <types/spoe.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
diff --git a/src/frontend.c b/src/frontend.c
index 8206709..a71dc09 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -30,7 +30,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <haproxy/fd.h>
 #include <proto/frontend.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index 1ec9d83..94a37c3 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -108,7 +108,7 @@
 
 #include <proto/acl.h>
 #include <haproxy/activity.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/auth.h>
 #include <proto/backend.h>
 #include <proto/channel.h>
diff --git a/src/hlua.c b/src/hlua.c
index 284c173..d0d6282 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -38,7 +38,7 @@
 #include <types/proxy.h>
 #include <types/stats.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/applet.h>
 #include <proto/channel.h>
 #include <proto/cli.h>
diff --git a/src/http_acl.c b/src/http_acl.c
index 8ff4ab3..2fe7e85 100644
--- a/src/http_acl.c
+++ b/src/http_acl.c
@@ -26,7 +26,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/auth.h>
 #include <proto/pattern.h>
 
diff --git a/src/http_act.c b/src/http_act.c
index 8bb9877..9355fa0 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -32,7 +32,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_rules.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
diff --git a/src/http_conv.c b/src/http_conv.c
index e321dbb..e3e9517 100644
--- a/src/http_conv.c
+++ b/src/http_conv.c
@@ -26,7 +26,7 @@
 #include <types/capture.h>
 #include <types/global.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/sample.h>
 #include <proto/stream.h>
 
diff --git a/src/http_fetch.c b/src/http_fetch.c
index 42ba8c2..31a69e7 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -30,7 +30,7 @@
 
 #include <types/global.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/auth.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
diff --git a/src/http_htx.c b/src/http_htx.c
index af4dd5c..8524d8a 100644
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -24,7 +24,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_fetch.h>
 #include <proto/sample.h>
 
diff --git a/src/http_rules.c b/src/http_rules.c
index ba19e87..c6bc540 100644
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -29,7 +29,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_rules.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>
diff --git a/src/map.c b/src/map.c
index 8dc1b51..df24ed2 100644
--- a/src/map.c
+++ b/src/map.c
@@ -24,7 +24,7 @@
 #include <types/stats.h>
 
 #include <proto/applet.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/cli.h>
 #include <proto/log.h>
 #include <proto/map.h>
diff --git a/src/payload.c b/src/payload.c
index 7d7cb36..f52f987 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -17,7 +17,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/htx.h>
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <proto/pattern.h>
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index c21d1c9..5a475b8 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -41,7 +41,7 @@
 #include <types/global.h>
 #include <types/stream.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <haproxy/fd.h>
diff --git a/src/sample.c b/src/sample.c
index 2dec9ed..c1a4bb9 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -29,7 +29,7 @@
 #include <common/uri_auth.h>
 #include <haproxy/base64.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/auth.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index 5f8cbd7..8eb958b 100644
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -29,7 +29,7 @@
 #include <types/ssl_sock.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/obj_type.h>
 #include <proto/ssl_sock.h>
 #include <proto/ssl_utils.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 357828d..45981cf 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -64,7 +64,7 @@
 #include <types/stats.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <proto/cli.h>
diff --git a/src/stick_table.c b/src/stick_table.c
index 8ceafa3..c2e1e85 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -29,7 +29,7 @@
 #include <types/global.h>
 #include <types/stats.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/cli.h>
 #include <proto/http_rules.h>
 #include <proto/log.h>
diff --git a/src/stream.c b/src/stream.c
index 530be55..151dbf0 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -34,7 +34,7 @@
 
 #include <proto/acl.h>
 #include <haproxy/activity.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <proto/channel.h>
 #include <proto/checks.h>
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index d6c1eb3..262224d 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -17,7 +17,7 @@
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 #include <types/capture.h>
 #include <types/connection.h>
 #include <types/global.h>
diff --git a/src/vars.c b/src/vars.c
index edcf1af..de55f14 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -7,7 +7,7 @@
 
 #include <types/vars.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_rules.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>
diff --git a/src/wurfl.c b/src/wurfl.c
index 9f374fa..78288be 100644
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -8,7 +8,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/http_htx.h>
 #include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/http_fetch.h>