diff --git a/include/types/dns.h b/include/haproxy/dns-t.h
similarity index 99%
rename from include/types/dns.h
rename to include/haproxy/dns-t.h
index 8b25352e8..62e8b7fa8 100644
--- a/include/types/dns.h
+++ b/include/haproxy/dns-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/dns.h
+ * include/haproxy/dns-t.h
  * This file provides structures and types for DNS.
  *
  * Copyright (C) 2014 Baptiste Assmann <bedis9@gmail.com>
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_DNS_H
-#define _TYPES_DNS_H
+#ifndef _HAPROXY_DNS_T_H
+#define _HAPROXY_DNS_T_H
 
 #include <import/eb32tree.h>
 
@@ -357,4 +357,4 @@ struct dns_srvrq {
 	struct list list;                       /* Next SRV RQ for the same proxy */
 };
 
-#endif /* _TYPES_DNS_H */
+#endif /* _HAPROXY_DNS_T_H */
diff --git a/include/proto/dns.h b/include/haproxy/dns.h
similarity index 94%
rename from include/proto/dns.h
rename to include/haproxy/dns.h
index 35eb2bf31..d20977833 100644
--- a/include/proto/dns.h
+++ b/include/haproxy/dns.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/dns.h
+ * include/haproxy/dns.h
  * This file provides functions related to DNS protocol
  *
  * Copyright (C) 2014 Baptiste Assmann <bedis9@gmail.com>
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_DNS_H
-#define _PROTO_DNS_H
+#ifndef _HAPROXY_DNS_H
+#define _HAPROXY_DNS_H
 
 #include <haproxy/action-t.h>
-#include <types/dns.h>
+#include <haproxy/dns-t.h>
 
 extern struct list dns_resolvers;
 extern unsigned int dns_failed_resolutions;
@@ -49,4 +49,4 @@ enum act_parse_ret dns_parse_do_resolve(const char **args, int *orig_arg, struct
 int check_action_do_resolve(struct act_rule *rule, struct proxy *px, char **err);
 
 
-#endif // _PROTO_DNS_H
+#endif // _HAPROXY_DNS_H
diff --git a/include/proto/server.h b/include/proto/server.h
index 0363f02d5..b84be433f 100644
--- a/include/proto/server.h
+++ b/include/proto/server.h
@@ -25,9 +25,9 @@
 #include <unistd.h>
 
 #include <haproxy/api.h>
+#include <haproxy/dns-t.h>
 #include <haproxy/time.h>
 #include <types/applet.h>
-#include <types/dns.h>
 #include <types/proxy.h>
 #include <types/queue.h>
 #include <types/server.h>
diff --git a/include/types/server.h b/include/types/server.h
index 9faa2ea3c..9cf5ade64 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -25,6 +25,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <haproxy/dns-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/thread.h>
@@ -34,7 +35,6 @@
 
 #include <types/connection.h>
 #include <types/counters.h>
-#include <types/dns.h>
 #include <haproxy/freq_ctr-t.h>
 #include <types/obj_type.h>
 #include <types/proxy.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 23a290e3a..5302a18cc 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -38,6 +38,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
+#include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/pool.h>
 #include <haproxy/tools.h>
@@ -52,14 +53,12 @@
 #include <types/obj_type.h>
 #include <types/peers.h>
 #include <types/mailers.h>
-#include <types/dns.h>
 #include <types/stats.h>
 
 #include <proto/acl.h>
 #include <proto/backend.h>
 #include <proto/channel.h>
 #include <proto/checks.h>
-#include <proto/dns.h>
 #include <proto/stats.h>
 #include <proto/filters.h>
 #include <proto/frontend.h>
diff --git a/src/checks.c b/src/checks.c
index 81ca77b7a..314a1b286 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -34,6 +34,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
+#include <haproxy/dns.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/list.h>
 #include <haproxy/regex.h>
@@ -46,7 +47,6 @@
 #include <haproxy/htx.h>
 
 #include <types/global.h>
-#include <types/dns.h>
 #include <types/stats.h>
 
 #include <haproxy/arg.h>
@@ -67,7 +67,6 @@
 #include <proto/task.h>
 #include <proto/vars.h>
 #include <proto/log.h>
-#include <proto/dns.h>
 #include <haproxy/proto_udp.h>
 #include <proto/ssl_sock.h>
 #include <proto/sample.h>
diff --git a/src/cli.c b/src/cli.c
index 11c8dc565..7f51a9b36 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -28,6 +28,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/dns-t.h>
 #include <haproxy/list.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -38,7 +39,6 @@
 
 #include <types/applet.h>
 #include <types/global.h>
-#include <types/dns.h>
 #include <types/stats.h>
 
 #include <haproxy/activity.h>
diff --git a/src/dns.c b/src/dns.c
index d251674c9..c1fe1e29b 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -22,6 +22,7 @@
 #include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/time.h>
 #include <haproxy/ticks.h>
@@ -30,13 +31,11 @@
 #include <types/applet.h>
 #include <types/cli.h>
 #include <types/global.h>
-#include <types/dns.h>
 #include <types/stats.h>
 
 #include <proto/channel.h>
 #include <proto/cli.h>
 #include <proto/checks.h>
-#include <proto/dns.h>
 #include <haproxy/fd.h>
 #include <proto/http_ana.h>
 #include <proto/http_rules.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index 33b4abf27..95c35de75 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -85,6 +85,7 @@
 #include <haproxy/base64.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
+#include <haproxy/dns.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
 #include <haproxy/hlua.h>
@@ -130,7 +131,6 @@
 #include <proto/stream.h>
 #include <proto/signal.h>
 #include <proto/task.h>
-#include <proto/dns.h>
 #include <proto/vars.h>
 #include <proto/ssl_sock.h>
 
diff --git a/src/server.c b/src/server.c
index 5c26de3b7..468814c40 100644
--- a/src/server.c
+++ b/src/server.c
@@ -19,6 +19,7 @@
 
 #include <common/cfgparse.h>
 #include <haproxy/dict-t.h>
+#include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/namespace.h>
 #include <haproxy/time.h>
@@ -27,7 +28,6 @@
 #include <types/cli.h>
 #include <types/global.h>
 #include <types/cli.h>
-#include <types/dns.h>
 #include <types/stats.h>
 
 #include <proto/applet.h>
@@ -43,7 +43,6 @@
 #include <proto/stream_interface.h>
 #include <proto/stats.h>
 #include <proto/task.h>
-#include <proto/dns.h>
 #include <netinet/tcp.h>
 
 #include <import/ebsttree.h>
diff --git a/src/stats.c b/src/stats.c
index 2700ab50a..8f6787489 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -28,6 +28,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/compression.h>
 #include <haproxy/debug.h>
+#include <haproxy/dns.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
@@ -43,14 +44,12 @@
 #include <types/applet.h>
 #include <types/cli.h>
 #include <types/global.h>
-#include <types/dns.h>
 #include <types/stats.h>
 
 #include <proto/backend.h>
 #include <proto/channel.h>
 #include <proto/checks.h>
 #include <proto/cli.h>
-#include <proto/dns.h>
 #include <proto/stats.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
diff --git a/src/stream.c b/src/stream.c
index 151dbf037..b2c71d6ea 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -18,6 +18,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/dict.h>
+#include <haproxy/dns.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/hlua.h>
 #include <haproxy/istbuf.h>
@@ -40,7 +41,6 @@
 #include <proto/checks.h>
 #include <proto/cli.h>
 #include <proto/connection.h>
-#include <proto/dns.h>
 #include <proto/stats.h>
 #include <haproxy/fd.h>
 #include <proto/filters.h>
diff --git a/src/tools.c b/src/tools.c
index ecdbe1f16..2b02a24df 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -41,12 +41,12 @@
 
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
+#include <haproxy/dns.h>
 #include <haproxy/hlua.h>
 #include <haproxy/namespace.h>
 #include <haproxy/tools.h>
 #include <types/global.h>
 #include <proto/applet.h>
-#include <proto/dns.h>
 #include <proto/listener.h>
 #include <haproxy/proto_udp.h>
 #include <proto/ssl_sock.h>