diff --git a/include/types/lb_map.h b/include/haproxy/lb_map-t.h
similarity index 90%
rename from include/types/lb_map.h
rename to include/haproxy/lb_map-t.h
index 5409a8152..b2c556cab 100644
--- a/include/types/lb_map.h
+++ b/include/haproxy/lb_map-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/lb_map.h
+ * include/haproxy/lb_map-t.h
  * Types for map-based load-balancing (RR and HASH)
  *
  * Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_LB_MAP_H
-#define _TYPES_LB_MAP_H
+#ifndef _HAPROXY_LB_MAP_T_H
+#define _HAPROXY_LB_MAP_T_H
 
 #include <haproxy/api-t.h>
 #include <types/server.h>
@@ -30,7 +30,7 @@ struct lb_map {
 	int rr_idx;		/* next server to be elected in round robin mode */
 };
 
-#endif /* _TYPES_LB_MAP_H */
+#endif /* _HAPROXY_LB_MAP_T_H */
 
 /*
  * Local variables:
diff --git a/include/proto/lb_map.h b/include/haproxy/lb_map.h
similarity index 91%
rename from include/proto/lb_map.h
rename to include/haproxy/lb_map.h
index 0dc089bc7..2ab7158c2 100644
--- a/include/proto/lb_map.h
+++ b/include/haproxy/lb_map.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/lb_map.h
+ * include/haproxy/lb_map.h
  * Map-based load-balancing (RR and HASH)
  *
  * Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_LB_MAP_H
-#define _PROTO_LB_MAP_H
+#ifndef _HAPROXY_LB_MAP_H
+#define _HAPROXY_LB_MAP_H
 
 #include <haproxy/api.h>
 #include <types/proxy.h>
@@ -31,7 +31,7 @@ void init_server_map(struct proxy *p);
 struct server *map_get_server_rr(struct proxy *px, struct server *srvtoavoid);
 struct server *map_get_server_hash(struct proxy *px, unsigned int hash);
 
-#endif /* _PROTO_LB_MAP_H */
+#endif /* _HAPROXY_LB_MAP_H */
 
 /*
  * Local variables:
diff --git a/include/types/backend.h b/include/types/backend.h
index 8a1f3bd11..120081f7b 100644
--- a/include/types/backend.h
+++ b/include/types/backend.h
@@ -26,10 +26,10 @@
 #include <haproxy/lb_fas-t.h>
 #include <haproxy/lb_fwlc-t.h>
 #include <haproxy/lb_fwrr-t.h>
+#include <haproxy/lb_map-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/thread.h>
 
-#include <types/lb_map.h>
 #include <types/server.h>
 
 /* Parameters for lbprm.algo */
diff --git a/src/backend.c b/src/backend.c
index f78742771..838769425 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -31,6 +31,7 @@
 #include <haproxy/lb_fas.h>
 #include <haproxy/lb_fwlc.h>
 #include <haproxy/lb_fwrr.h>
+#include <haproxy/lb_map.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/payload.h>
 #include <haproxy/session.h>
@@ -44,7 +45,6 @@
 #include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <proto/channel.h>
-#include <proto/lb_map.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/http_ana.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index e3d33edb1..429954ca1 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -50,6 +50,7 @@
 #include <haproxy/lb_fas.h>
 #include <haproxy/lb_fwlc.h>
 #include <haproxy/lb_fwrr.h>
+#include <haproxy/lb_map.h>
 #include <haproxy/listener.h>
 #include <haproxy/mailers-t.h>
 #include <haproxy/obj_type-t.h>
@@ -70,7 +71,6 @@
 #include <proto/backend.h>
 #include <proto/channel.h>
 #include <proto/filters.h>
-#include <proto/lb_map.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/http_ana.h>
diff --git a/src/lb_map.c b/src/lb_map.c
index c5e0f89d6..2b00fdb59 100644
--- a/src/lb_map.c
+++ b/src/lb_map.c
@@ -11,12 +11,12 @@
  */
 
 #include <haproxy/api.h>
+#include <haproxy/lb_map.h>
 #include <import/eb32tree.h>
 
 #include <types/server.h>
 
 #include <proto/backend.h>
-#include <proto/lb_map.h>
 #include <proto/queue.h>
 
 /* this function updates the map according to server <srv>'s new state.