diff --git a/include/types/protocols.h b/include/types/protocols.h
index 62d9f60..849ca55 100644
--- a/include/types/protocols.h
+++ b/include/types/protocols.h
@@ -28,6 +28,7 @@
 #include <sys/un.h>
 
 #include <common/config.h>
+#include <common/eb32tree.h>
 #include <common/mini-clist.h>
 
 #include <types/counters.h>
@@ -108,6 +109,7 @@
 	struct {
 		const char *file;	/* file where the section appears */
 		int line;		/* line where the section appears */
+		struct eb32_node id;	/* place in the tree of used IDs */
 	} conf;				/* config information */
 };
 
diff --git a/include/types/proxy.h b/include/types/proxy.h
index 88a01cc..aac704d 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -29,6 +29,7 @@
 
 #include <common/appsession.h>
 #include <common/config.h>
+#include <common/eb32tree.h>
 #include <common/mini-clist.h>
 #include <common/regex.h>
 #include <common/sessionhash.h>
@@ -248,7 +249,6 @@
 	int check_len;				/* Length of the HTTP or SSL3 request */
 	struct chunk errmsg[HTTP_ERR_SIZE];	/* default or customized error messages for known errors */
 	int uuid;				/* universally unique proxy ID, used for SNMP */
-	int next_svid, next_lid;		/* next server-id and listener-id, used for SNMP */
 	unsigned int backlog;			/* force the frontend's listen backlog */
 	unsigned int bind_proc;			/* bitmask of processes using this proxy. 0 = all. */
 	struct error_snapshot invalid_req, invalid_rep; /* captures of last errors */
@@ -262,6 +262,9 @@
 	struct {
 		const char *file;		/* file where the section appears */
 		int line;			/* line where the section appears */
+		struct eb32_node id;		/* place in the tree of used IDs */
+		struct eb_root used_listener_id;/* list of listener IDs in use */
+		struct eb_root used_server_id;	/* list of server IDs in use */
 	} conf;					/* config information */
 };
 
@@ -287,7 +290,7 @@
 };
 
 extern struct proxy *proxy;
-extern int next_pxid;
+extern struct eb_root used_proxy_id;	/* list of proxy IDs in use */
 
 #endif /* _TYPES_PROXY_H */
 
diff --git a/include/types/server.h b/include/types/server.h
index 45528fa..fa01810 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -135,6 +135,7 @@
 	struct {
 		const char *file;		/* file where the section appears */
 		int line;			/* line where the section appears */
+		struct eb32_node id;		/* place in the tree of used IDs */
 	} conf;					/* config information */
 };