diff --git a/include/types/map.h b/include/haproxy/map-t.h
similarity index 91%
rename from include/types/map.h
rename to include/haproxy/map-t.h
index 5b59ec0ba..902b064a2 100644
--- a/include/types/map.h
+++ b/include/haproxy/map-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/map.h
+ * include/haproxy/map-t.h
  * This file provides structures and types for MAPs.
  *
  * 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_MAP_H
-#define _TYPES_MAP_H
+#ifndef _HAPROXY_MAP_T_H
+#define _HAPROXY_MAP_T_H
 
 #include <haproxy/pattern-t.h>
 #include <types/sample.h>
@@ -31,4 +31,4 @@ struct map_descriptor {
 	int do_free;                   /* set if <pat> is the original pat and must be freed */
 };
 
-#endif /* _TYPES_MAP_H */
+#endif /* _HAPROXY_MAP_T_H */
diff --git a/include/proto/map.h b/include/haproxy/map.h
similarity index 89%
rename from include/proto/map.h
rename to include/haproxy/map.h
index a63bc8559..140148c33 100644
--- a/include/proto/map.h
+++ b/include/haproxy/map.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/map.h
+ * include/haproxy/map.h
  * This file provides structures and types for pattern matching.
  *
  * Copyright (C) 2000-2013 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_MAP_H
-#define _PROTO_MAP_H
+#ifndef _HAPROXY_MAP_H
+#define _HAPROXY_MAP_H
 
-#include <types/map.h>
+#include <haproxy/map-t.h>
+#include <types/sample.h>
 
 /* maps output sample parser */
 int map_parse_ip(const char *text, struct sample_data *data);
@@ -35,4 +36,4 @@ struct map_reference *map_get_reference(const char *reference);
 int sample_load_map(struct arg *arg, struct sample_conv *conv,
                     const char *file, int line, char **err);
 
-#endif /* _PROTO_PATTERN_H */
+#endif /* _HAPROXY_MAP_H */
diff --git a/src/cli.c b/src/cli.c
index f7cf57ce1..69f1ec41f 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -57,7 +57,6 @@
 #include <proto/log.h>
 #include <haproxy/pipe.h>
 #include <haproxy/protocol.h>
-#include <proto/map.h>
 #include <proto/proxy.h>
 #include <proto/sample.h>
 #include <proto/session.h>
diff --git a/src/hlua.c b/src/hlua.c
index 594def0b0..a2743f9c8 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -33,6 +33,7 @@
 #include <haproxy/hlua.h>
 #include <haproxy/hlua_fcn.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/map.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pattern.h>
 #include <haproxy/tools.h>
@@ -48,7 +49,6 @@
 #include <proto/connection.h>
 #include <proto/stats.h>
 #include <proto/http_fetch.h>
-#include <proto/map.h>
 #include <proto/queue.h>
 #include <proto/payload.h>
 #include <proto/http_ana.h>
diff --git a/src/map.c b/src/map.c
index b398f03bb..0066257d6 100644
--- a/src/map.c
+++ b/src/map.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 
 #include <haproxy/api.h>
+#include <haproxy/map.h>
 #include <haproxy/pattern.h>
 #include <haproxy/regex.h>
 #include <haproxy/tools.h>
@@ -20,14 +21,12 @@
 #include <types/applet.h>
 #include <types/cli.h>
 #include <types/global.h>
-#include <types/map.h>
 #include <types/stats.h>
 
 #include <proto/applet.h>
 #include <haproxy/arg.h>
 #include <proto/cli.h>
 #include <proto/log.h>
-#include <proto/map.h>
 #include <proto/stream_interface.h>
 #include <proto/sample.h>
 
diff --git a/src/stats.c b/src/stats.c
index dcde9c154..b0ee43428 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -36,6 +36,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
+#include <haproxy/map-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -58,7 +59,6 @@
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
 #include <haproxy/pipe.h>
-#include <proto/map.h>
 #include <proto/proxy.h>
 #include <proto/sample.h>
 #include <proto/session.h>