From 8d2b777fe35e77cc3abf2337fc183e6d3d611914 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Wed, 27 May 2020 10:58:19 +0200
Subject: [PATCH] REORG: ebtree: move the include files from ebtree to
 include/import/

This is where other imported components are located. All files which
used to directly include ebtree were touched to update their include
path so that "import/" is now prefixed before the ebtree-related files.

The ebtree.h file was slightly adjusted to read compiler.h from the
common/ subdirectory (this is the only change).

A build issue was encountered when eb32sctree.h is loaded before
eb32tree.h because only the former checks for the latter before
defining type u32. This was addressed by adding the reverse ifdef
in eb32tree.h.

No further cleanup was done yet in order to keep changes minimal.
---
 contrib/halog/halog.c                   | 8 ++++----
 include/common/namespace.h              | 2 +-
 include/common/standard.h               | 4 ++--
 {ebtree => include/import}/eb32sctree.h | 0
 {ebtree => include/import}/eb32tree.h   | 2 ++
 {ebtree => include/import}/eb64tree.h   | 0
 {ebtree => include/import}/ebimtree.h   | 0
 {ebtree => include/import}/ebistree.h   | 0
 {ebtree => include/import}/ebmbtree.h   | 0
 {ebtree => include/import}/ebpttree.h   | 0
 {ebtree => include/import}/ebsttree.h   | 0
 {ebtree => include/import}/ebtree.h     | 2 +-
 include/import/lru.h                    | 2 +-
 include/proto/task.h                    | 4 ++--
 include/types/acl.h                     | 2 +-
 include/types/checks.h                  | 2 +-
 include/types/dict.h                    | 2 +-
 include/types/dns.h                     | 2 +-
 include/types/fcgi-app.h                | 2 +-
 include/types/http_htx.h                | 2 +-
 include/types/lb_chash.h                | 4 ++--
 include/types/lb_fas.h                  | 2 +-
 include/types/lb_fwlc.h                 | 2 +-
 include/types/lb_fwrr.h                 | 2 +-
 include/types/listener.h                | 2 +-
 include/types/pattern.h                 | 2 +-
 include/types/peers.h                   | 2 +-
 include/types/protocol.h                | 2 +-
 include/types/proxy.h                   | 4 ++--
 include/types/server.h                  | 2 +-
 include/types/ssl_crtlist.h             | 2 +-
 include/types/ssl_sock.h                | 6 +++---
 include/types/stick_table.h             | 6 +++---
 include/types/task.h                    | 4 ++--
 src/acl.c                               | 2 +-
 src/cache.c                             | 2 +-
 src/dict.c                              | 4 ++--
 src/eb32sctree.c                        | 2 +-
 src/eb32tree.c                          | 2 +-
 src/eb64tree.c                          | 2 +-
 src/ebimtree.c                          | 4 ++--
 src/ebistree.c                          | 2 +-
 src/ebmbtree.c                          | 2 +-
 src/ebpttree.c                          | 2 +-
 src/ebsttree.c                          | 2 +-
 src/ebtree.c                            | 2 +-
 src/hlua.c                              | 2 +-
 src/lb_chash.c                          | 2 +-
 src/lb_fas.c                            | 2 +-
 src/lb_fwlc.c                           | 2 +-
 src/lb_fwrr.c                           | 2 +-
 src/lb_map.c                            | 2 +-
 src/mux_h1.c                            | 2 +-
 src/mux_h2.c                            | 2 +-
 src/pattern.c                           | 2 +-
 src/proxy.c                             | 4 ++--
 src/queue.c                             | 2 +-
 src/server.c                            | 2 +-
 src/shctx.c                             | 2 +-
 src/ssl_ckch.c                          | 2 +-
 src/ssl_crtlist.c                       | 4 ++--
 src/ssl_sock.c                          | 4 ++--
 src/standard.c                          | 4 ++--
 src/stick_table.c                       | 4 ++--
 src/task.c                              | 4 ++--
 src/wurfl.c                             | 4 ++--
 tests/filltab25.c                       | 2 +-
 67 files changed, 82 insertions(+), 80 deletions(-)
 rename {ebtree => include/import}/eb32sctree.h (100%)
 rename {ebtree => include/import}/eb32tree.h (99%)
 rename {ebtree => include/import}/eb64tree.h (100%)
 rename {ebtree => include/import}/ebimtree.h (100%)
 rename {ebtree => include/import}/ebistree.h (100%)
 rename {ebtree => include/import}/ebmbtree.h (100%)
 rename {ebtree => include/import}/ebpttree.h (100%)
 rename {ebtree => include/import}/ebsttree.h (100%)
 rename {ebtree => include/import}/ebtree.h (99%)

diff --git a/contrib/halog/halog.c b/contrib/halog/halog.c
index 3c785fc09..59b728274 100644
--- a/contrib/halog/halog.c
+++ b/contrib/halog/halog.c
@@ -20,10 +20,10 @@
 #include <ctype.h>
 #include <time.h>
 
-#include <eb32tree.h>
-#include <eb64tree.h>
-#include <ebistree.h>
-#include <ebsttree.h>
+#include <import/eb32tree.h>
+#include <import/eb64tree.h>
+#include <import/ebistree.h>
+#include <import/ebsttree.h>
 
 #define SOURCE_FIELD 5
 #define ACCEPT_FIELD 6
diff --git a/include/common/namespace.h b/include/common/namespace.h
index 41931ff6d..596aac344 100644
--- a/include/common/namespace.h
+++ b/include/common/namespace.h
@@ -2,7 +2,7 @@
 #define _NAMESPACE_H
 
 #include <stdlib.h>
-#include <ebistree.h>
+#include <import/ebistree.h>
 
 #ifdef USE_NS
 
diff --git a/include/common/standard.h b/include/common/standard.h
index 40991fa45..3f6f95438 100644
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -41,8 +41,8 @@
 #include <common/chunk.h>
 #include <common/config.h>
 #include <common/namespace.h>
-#include <eb32tree.h>
-#include <eb32sctree.h>
+#include <import/eb32tree.h>
+#include <import/eb32sctree.h>
 #include <types/protocol.h>
 
 /* size used for max length of decimal representation of long long int. */
diff --git a/ebtree/eb32sctree.h b/include/import/eb32sctree.h
similarity index 100%
rename from ebtree/eb32sctree.h
rename to include/import/eb32sctree.h
diff --git a/ebtree/eb32tree.h b/include/import/eb32tree.h
similarity index 99%
rename from ebtree/eb32tree.h
rename to include/import/eb32tree.h
index 3896fb81b..76f9eaacb 100644
--- a/ebtree/eb32tree.h
+++ b/include/import/eb32tree.h
@@ -31,8 +31,10 @@
 #define EB32_TREE_HEAD	EB_TREE_HEAD
 
 /* These types may sometimes already be defined */
+#ifndef _EB32SCTREE_H
 typedef unsigned int u32;
 typedef   signed int s32;
+#endif
 
 /* This structure carries a node, a leaf, and a key. It must start with the
  * eb_node so that it can be cast into an eb_node. We could also have put some
diff --git a/ebtree/eb64tree.h b/include/import/eb64tree.h
similarity index 100%
rename from ebtree/eb64tree.h
rename to include/import/eb64tree.h
diff --git a/ebtree/ebimtree.h b/include/import/ebimtree.h
similarity index 100%
rename from ebtree/ebimtree.h
rename to include/import/ebimtree.h
diff --git a/ebtree/ebistree.h b/include/import/ebistree.h
similarity index 100%
rename from ebtree/ebistree.h
rename to include/import/ebistree.h
diff --git a/ebtree/ebmbtree.h b/include/import/ebmbtree.h
similarity index 100%
rename from ebtree/ebmbtree.h
rename to include/import/ebmbtree.h
diff --git a/ebtree/ebpttree.h b/include/import/ebpttree.h
similarity index 100%
rename from ebtree/ebpttree.h
rename to include/import/ebpttree.h
diff --git a/ebtree/ebsttree.h b/include/import/ebsttree.h
similarity index 100%
rename from ebtree/ebsttree.h
rename to include/import/ebsttree.h
diff --git a/ebtree/ebtree.h b/include/import/ebtree.h
similarity index 99%
rename from ebtree/ebtree.h
rename to include/import/ebtree.h
index dff044b39..9e5daca48 100644
--- a/ebtree/ebtree.h
+++ b/include/import/ebtree.h
@@ -247,7 +247,7 @@
 #define _EBTREE_H
 
 #include <stdlib.h>
-#include "compiler.h"
+#include <common/compiler.h>
 
 static inline int flsnz8_generic(unsigned int x)
 {
diff --git a/include/import/lru.h b/include/import/lru.h
index 7427fd627..d674e5348 100644
--- a/include/import/lru.h
+++ b/include/import/lru.h
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <eb64tree.h>
+#include <import/eb64tree.h>
 
 /* The LRU supports a global cache shared between multiple domains and multiple
  * versions of their datasets. The purpose is not to have to flush the whole
diff --git a/include/proto/task.h b/include/proto/task.h
index 07da99d6c..52b284d0f 100644
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -32,8 +32,8 @@
 #include <common/ticks.h>
 #include <common/hathreads.h>
 
-#include <eb32sctree.h>
-#include <eb32tree.h>
+#include <import/eb32sctree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/task.h>
diff --git a/include/types/acl.h b/include/types/acl.h
index 04318ea04..f5d385896 100644
--- a/include/types/acl.h
+++ b/include/types/acl.h
@@ -32,7 +32,7 @@
 #include <types/proxy.h>
 #include <types/server.h>
 
-#include <ebmbtree.h>
+#include <import/ebmbtree.h>
 
 /* ACL test result.
  *
diff --git a/include/types/checks.h b/include/types/checks.h
index 27ce72dda..a23091cc2 100644
--- a/include/types/checks.h
+++ b/include/types/checks.h
@@ -13,7 +13,7 @@
 #ifndef _TYPES_CHECKS_H
 #define _TYPES_CHECKS_H
 
-#include <ebpttree.h>
+#include <import/ebpttree.h>
 
 #include <common/standard.h>
 #include <common/config.h>
diff --git a/include/types/dict.h b/include/types/dict.h
index 006e91524..30953f6ce 100644
--- a/include/types/dict.h
+++ b/include/types/dict.h
@@ -2,7 +2,7 @@
 #define _TYPES_DICT_H
 
 #include <common/hathreads.h>
-#include <ebpttree.h>
+#include <import/ebpttree.h>
 
 struct dict_entry {
 	struct ebpt_node value;
diff --git a/include/types/dns.h b/include/types/dns.h
index 9926de0c7..06afda8b8 100644
--- a/include/types/dns.h
+++ b/include/types/dns.h
@@ -22,7 +22,7 @@
 #ifndef _TYPES_DNS_H
 #define _TYPES_DNS_H
 
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <common/mini-clist.h>
 #include <common/hathreads.h>
diff --git a/include/types/fcgi-app.h b/include/types/fcgi-app.h
index f9e399f51..d7beb2602 100644
--- a/include/types/fcgi-app.h
+++ b/include/types/fcgi-app.h
@@ -28,7 +28,7 @@
 #include <common/mini-clist.h>
 #include <common/regex.h>
 
-#include <ebistree.h>
+#include <import/ebistree.h>
 
 #include <types/acl.h>
 #include <types/filters.h>
diff --git a/include/types/http_htx.h b/include/types/http_htx.h
index 42b3c39ed..301034c8f 100644
--- a/include/types/http_htx.h
+++ b/include/types/http_htx.h
@@ -23,7 +23,7 @@
 #ifndef _TYPES_HTTP_HTX_H
 #define _TYPES_HTTP_HTX_H
 
-#include <ebistree.h>
+#include <import/ebistree.h>
 
 #include <common/buf.h>
 #include <common/http.h>
diff --git a/include/types/lb_chash.h b/include/types/lb_chash.h
index 5991ce961..9486064dd 100644
--- a/include/types/lb_chash.h
+++ b/include/types/lb_chash.h
@@ -23,8 +23,8 @@
 #define _TYPES_LB_CHASH_H
 
 #include <common/config.h>
-#include <ebtree.h>
-#include <eb32tree.h>
+#include <import/ebtree.h>
+#include <import/eb32tree.h>
 
 struct lb_chash {
 	struct eb_root act;	/* weighted chash entries of active servers */
diff --git a/include/types/lb_fas.h b/include/types/lb_fas.h
index 4590a9636..e20d70a27 100644
--- a/include/types/lb_fas.h
+++ b/include/types/lb_fas.h
@@ -23,7 +23,7 @@
 #define _TYPES_LB_FAS_H
 
 #include <common/config.h>
-#include <ebtree.h>
+#include <import/ebtree.h>
 
 struct lb_fas {
 	struct eb_root act;	/* weighted least conns on the active servers */
diff --git a/include/types/lb_fwlc.h b/include/types/lb_fwlc.h
index 170eb241c..f20659a71 100644
--- a/include/types/lb_fwlc.h
+++ b/include/types/lb_fwlc.h
@@ -23,7 +23,7 @@
 #define _TYPES_LB_FWLC_H
 
 #include <common/config.h>
-#include <ebtree.h>
+#include <import/ebtree.h>
 
 struct lb_fwlc {
 	struct eb_root act;	/* weighted least conns on the active servers */
diff --git a/include/types/lb_fwrr.h b/include/types/lb_fwrr.h
index 731f055f9..754d0c64b 100644
--- a/include/types/lb_fwrr.h
+++ b/include/types/lb_fwrr.h
@@ -23,7 +23,7 @@
 #define _TYPES_LB_FWRR_H
 
 #include <common/config.h>
-#include <ebtree.h>
+#include <import/ebtree.h>
 
 /* This structure is used to apply fast weighted round robin on a server group */
 struct fwrr_group {
diff --git a/include/types/listener.h b/include/types/listener.h
index b815cc337..d035a90fc 100644
--- a/include/types/listener.h
+++ b/include/types/listener.h
@@ -34,7 +34,7 @@
 #include <common/hathreads.h>
 
 #include <types/obj_type.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 /* Some pointer types reference below */
 struct task;
diff --git a/include/types/pattern.h b/include/types/pattern.h
index 9ed6b4b73..f4c0a1323 100644
--- a/include/types/pattern.h
+++ b/include/types/pattern.h
@@ -29,7 +29,7 @@
 
 #include <types/sample.h>
 
-#include <ebmbtree.h>
+#include <import/ebmbtree.h>
 
 /* Pattern matching function result.
  *
diff --git a/include/types/peers.h b/include/types/peers.h
index 89962a37b..78270bf24 100644
--- a/include/types/peers.h
+++ b/include/types/peers.h
@@ -31,7 +31,7 @@
 #include <common/mini-clist.h>
 #include <common/regex.h>
 #include <common/tools.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/dict.h>
 
diff --git a/include/types/protocol.h b/include/types/protocol.h
index 39f99cae3..10437a7b1 100644
--- a/include/types/protocol.h
+++ b/include/types/protocol.h
@@ -27,7 +27,7 @@
 
 #include <common/config.h>
 #include <common/mini-clist.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 /* some pointer types referenced below */
 struct listener;
diff --git a/include/types/proxy.h b/include/types/proxy.h
index c136ecb4c..a9adce0b5 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -35,8 +35,8 @@
 #include <common/tools.h>
 #include <common/hathreads.h>
 
-#include <eb32tree.h>
-#include <ebistree.h>
+#include <import/eb32tree.h>
+#include <import/ebistree.h>
 
 #include <types/acl.h>
 #include <types/backend.h>
diff --git a/include/types/server.h b/include/types/server.h
index 7b1ae5f9c..376fc0321 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -30,7 +30,7 @@
 #include <common/hathreads.h>
 #include <common/openssl-compat.h>
 
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/connection.h>
 #include <types/counters.h>
diff --git a/include/types/ssl_crtlist.h b/include/types/ssl_crtlist.h
index 095a1279d..2879d745c 100644
--- a/include/types/ssl_crtlist.h
+++ b/include/types/ssl_crtlist.h
@@ -23,7 +23,7 @@
 #define _TYPES_SSL_CRTLIST_H
 #ifdef USE_OPENSSL
 
-#include <ebmbtree.h>
+#include <import/ebmbtree.h>
 
 #include <common/mini-clist.h>
 
diff --git a/include/types/ssl_sock.h b/include/types/ssl_sock.h
index 78639ac10..aed6e6ce8 100644
--- a/include/types/ssl_sock.h
+++ b/include/types/ssl_sock.h
@@ -23,9 +23,9 @@
 #define _TYPES_SSL_SOCK_H
 #ifdef USE_OPENSSL
 
-#include <ebpttree.h>
-#include <ebmbtree.h>
-#include <eb64tree.h>
+#include <import/ebpttree.h>
+#include <import/ebmbtree.h>
+#include <import/eb64tree.h>
 
 #include <types/connection.h> /* struct wait_event */
 #include <types/ssl_ckch.h>
diff --git a/include/types/stick_table.h b/include/types/stick_table.h
index 5e15aaaa4..832ecd25a 100644
--- a/include/types/stick_table.h
+++ b/include/types/stick_table.h
@@ -26,9 +26,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <ebtree.h>
-#include <ebmbtree.h>
-#include <eb32tree.h>
+#include <import/ebtree.h>
+#include <import/ebmbtree.h>
+#include <import/eb32tree.h>
 #include <common/memory.h>
 #include <types/dict.h>
 #include <types/freq_ctr.h>
diff --git a/include/types/task.h b/include/types/task.h
index 6ca97671f..0fba89898 100644
--- a/include/types/task.h
+++ b/include/types/task.h
@@ -26,8 +26,8 @@
 
 #include <common/config.h>
 #include <common/mini-clist.h>
-#include <eb32sctree.h>
-#include <eb32tree.h>
+#include <import/eb32sctree.h>
+#include <import/eb32tree.h>
 
 /* values for task->state */
 #define TASK_SLEEPING     0x0000  /* task sleeping */
diff --git a/src/acl.c b/src/acl.c
index fa8ae9238..7df433d4a 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -32,7 +32,7 @@
 #include <proto/sample.h>
 #include <proto/stick_table.h>
 
-#include <ebsttree.h>
+#include <import/ebsttree.h>
 
 /* List head of all known ACL keywords */
 static struct acl_kw_list acl_keywords = {
diff --git a/src/cache.c b/src/cache.c
index ed50b29b6..f68cb1416 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -10,7 +10,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 #include <import/sha1.h>
 
 #include <types/action.h>
diff --git a/src/dict.c b/src/dict.c
index 2da564b15..7a9e25fa7 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -2,8 +2,8 @@
 
 #include <proto/dict.h>
 
-#include <eb32tree.h>
-#include <ebistree.h>
+#include <import/eb32tree.h>
+#include <import/ebistree.h>
 
 struct dict *new_dict(const char *name)
 {
diff --git a/src/eb32sctree.c b/src/eb32sctree.c
index 14e598018..af6a53948 100644
--- a/src/eb32sctree.c
+++ b/src/eb32sctree.c
@@ -20,7 +20,7 @@
 
 /* Consult eb32sctree.h for more details about those functions */
 
-#include "eb32sctree.h"
+#include <import/eb32sctree.h>
 
 
 /* This function is used to build a tree of duplicates by adding a new node to
diff --git a/src/eb32tree.c b/src/eb32tree.c
index 77e4793f1..38ddab00d 100644
--- a/src/eb32tree.c
+++ b/src/eb32tree.c
@@ -20,7 +20,7 @@
 
 /* Consult eb32tree.h for more details about those functions */
 
-#include "eb32tree.h"
+#include <import/eb32tree.h>
 
 struct eb32_node *eb32_insert(struct eb_root *root, struct eb32_node *new)
 {
diff --git a/src/eb64tree.c b/src/eb64tree.c
index 442e973a8..b908d4db2 100644
--- a/src/eb64tree.c
+++ b/src/eb64tree.c
@@ -20,7 +20,7 @@
 
 /* Consult eb64tree.h for more details about those functions */
 
-#include "eb64tree.h"
+#include <import/eb64tree.h>
 
 struct eb64_node *eb64_insert(struct eb_root *root, struct eb64_node *new)
 {
diff --git a/src/ebimtree.c b/src/ebimtree.c
index 3e6a7ce26..e6b82cc36 100644
--- a/src/ebimtree.c
+++ b/src/ebimtree.c
@@ -20,8 +20,8 @@
 
 /* Consult ebimtree.h for more details about those functions */
 
-#include "ebpttree.h"
-#include "ebimtree.h"
+#include <import/ebpttree.h>
+#include <import/ebimtree.h>
 
 /* Find the first occurrence of a key of <len> bytes in the tree <root>.
  * If none can be found, return NULL.
diff --git a/src/ebistree.c b/src/ebistree.c
index 6ad5e95f4..193950d1f 100644
--- a/src/ebistree.c
+++ b/src/ebistree.c
@@ -20,7 +20,7 @@
 
 /* Consult ebistree.h for more details about those functions */
 
-#include "ebistree.h"
+#include <import/ebistree.h>
 
 /* Find the first occurrence of a zero-terminated string <x> in the tree <root>.
  * It's the caller's responsibility to use this function only on trees which
diff --git a/src/ebmbtree.c b/src/ebmbtree.c
index ceedefce3..4a1bfc568 100644
--- a/src/ebmbtree.c
+++ b/src/ebmbtree.c
@@ -20,7 +20,7 @@
 
 /* Consult ebmbtree.h for more details about those functions */
 
-#include "ebmbtree.h"
+#include <import/ebmbtree.h>
 
 /* Find the first occurrence of a key of <len> bytes in the tree <root>.
  * If none can be found, return NULL.
diff --git a/src/ebpttree.c b/src/ebpttree.c
index a7e6b06f5..558d334a4 100644
--- a/src/ebpttree.c
+++ b/src/ebpttree.c
@@ -20,7 +20,7 @@
 
 /* Consult ebpttree.h for more details about those functions */
 
-#include "ebpttree.h"
+#include <import/ebpttree.h>
 
 struct ebpt_node *ebpt_insert(struct eb_root *root, struct ebpt_node *new)
 {
diff --git a/src/ebsttree.c b/src/ebsttree.c
index 12469cc1f..a4fbe3373 100644
--- a/src/ebsttree.c
+++ b/src/ebsttree.c
@@ -20,7 +20,7 @@
 
 /* Consult ebsttree.h for more details about those functions */
 
-#include "ebsttree.h"
+#include <import/ebsttree.h>
 
 /* Find the first occurrence of a zero-terminated string <x> in the tree <root>.
  * It's the caller's responsibility to use this function only on trees which
diff --git a/src/ebtree.c b/src/ebtree.c
index d60c79957..3b904209d 100644
--- a/src/ebtree.c
+++ b/src/ebtree.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ebtree.h"
+#include <import/ebtree.h>
 
 void eb_delete(struct eb_node *node)
 {
diff --git a/src/hlua.c b/src/hlua.c
index d7afb5817..83cc3cd2e 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -22,7 +22,7 @@
 #error "Requires Lua 5.3 or later."
 #endif
 
-#include <ebpttree.h>
+#include <import/ebpttree.h>
 
 #include <common/cfgparse.h>
 #include <common/compiler.h>
diff --git a/src/lb_chash.c b/src/lb_chash.c
index 23448df80..91724fdaf 100644
--- a/src/lb_chash.c
+++ b/src/lb_chash.c
@@ -20,7 +20,7 @@
 #include <common/config.h>
 #include <common/debug.h>
 #include <common/standard.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/server.h>
diff --git a/src/lb_fas.c b/src/lb_fas.c
index 6b72099f3..1042e4b83 100644
--- a/src/lb_fas.c
+++ b/src/lb_fas.c
@@ -19,7 +19,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/server.h>
diff --git a/src/lb_fwlc.c b/src/lb_fwlc.c
index bd7793a91..409e5f821 100644
--- a/src/lb_fwlc.c
+++ b/src/lb_fwlc.c
@@ -13,7 +13,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/server.h>
diff --git a/src/lb_fwrr.c b/src/lb_fwrr.c
index d419b8ee5..fe3d86be1 100644
--- a/src/lb_fwrr.c
+++ b/src/lb_fwrr.c
@@ -13,7 +13,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/server.h>
diff --git a/src/lb_map.c b/src/lb_map.c
index b6dcee907..a5d1ec39c 100644
--- a/src/lb_map.c
+++ b/src/lb_map.c
@@ -13,7 +13,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/server.h>
diff --git a/src/mux_h1.c b/src/mux_h1.c
index b1eebf151..ac383f5bc 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -16,7 +16,7 @@
 #include <common/htx.h>
 #include <common/initcall.h>
 
-#include <ebistree.h>
+#include <import/ebistree.h>
 
 #include <types/pipe.h>
 #include <types/proxy.h>
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 297292503..a77cf840d 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -27,7 +27,7 @@
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
 #include <types/session.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 
 /* dummy streams returned for closed, error, refused, idle and states */
diff --git a/src/pattern.c b/src/pattern.c
index a9425b047..a90820f21 100644
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -25,7 +25,7 @@
 #include <proto/pattern.h>
 #include <proto/sample.h>
 
-#include <ebsttree.h>
+#include <import/ebsttree.h>
 #include <import/lru.h>
 #include <import/xxhash.h>
 
diff --git a/src/proxy.c b/src/proxy.c
index d5dee5d34..0845bced1 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -26,8 +26,8 @@
 #include <common/memory.h>
 #include <common/time.h>
 
-#include <eb32tree.h>
-#include <ebistree.h>
+#include <import/eb32tree.h>
+#include <import/ebistree.h>
 
 #include <types/capture.h>
 #include <types/cli.h>
diff --git a/src/queue.c b/src/queue.c
index 9fd3e9d15..890574d7c 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -74,7 +74,7 @@
 #include <common/memory.h>
 #include <common/time.h>
 #include <common/hathreads.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <proto/http_rules.h>
 #include <proto/http_ana.h>
diff --git a/src/server.c b/src/server.c
index e710b4810..15e2f8fec 100644
--- a/src/server.c
+++ b/src/server.c
@@ -47,7 +47,7 @@
 #include <proto/dns.h>
 #include <netinet/tcp.h>
 
-#include <ebsttree.h>
+#include <import/ebsttree.h>
 
 static void srv_update_status(struct server *s);
 static void srv_update_state(struct server *srv, int version, char **params);
diff --git a/src/shctx.c b/src/shctx.c
index ae9cc1f1b..bfca085bb 100644
--- a/src/shctx.c
+++ b/src/shctx.c
@@ -13,7 +13,7 @@
 
 #include <sys/mman.h>
 #include <arpa/inet.h>
-#include <ebmbtree.h>
+#include <import/ebmbtree.h>
 #include <types/global.h>
 #include <common/mini-clist.h>
 #include "proto/shctx.h"
diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index 0f3f743ea..4a5f1c115 100644
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -25,7 +25,7 @@
 #include <common/errors.h>
 #include <common/standard.h>
 
-#include <ebsttree.h>
+#include <import/ebsttree.h>
 
 #include <types/cli.h>
 #include <types/ssl_ckch.h>
diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index 01c107431..38cffc805 100644
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -19,8 +19,8 @@
 #include <common/standard.h>
 
 #include <dirent.h>
-#include <ebpttree.h>
-#include <ebsttree.h>
+#include <import/ebpttree.h>
+#include <import/ebsttree.h>
 
 #include <types/cli.h>
 #include <types/ssl_crtlist.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 83cb2cb7a..58ff5833a 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -56,8 +56,8 @@
 #include <common/time.h>
 #include <common/base64.h>
 
-#include <ebpttree.h>
-#include <ebsttree.h>
+#include <import/ebpttree.h>
+#include <import/ebsttree.h>
 
 #include <types/applet.h>
 #include <types/cli.h>
diff --git a/src/standard.c b/src/standard.c
index 701bcc251..33067bb73 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -50,8 +50,8 @@
 #include <proto/stream_interface.h>
 #include <proto/task.h>
 
-#include <eb32tree.h>
-#include <eb32sctree.h>
+#include <import/eb32tree.h>
+#include <import/eb32sctree.h>
 
 /* This macro returns false if the test __x is false. Many
  * of the following parsing function must be abort the processing
diff --git a/src/stick_table.c b/src/stick_table.c
index 72b0f8b6b..862aafc7e 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -23,8 +23,8 @@
 #include <common/standard.h>
 #include <common/time.h>
 
-#include <ebmbtree.h>
-#include <ebsttree.h>
+#include <import/ebmbtree.h>
+#include <import/ebsttree.h>
 
 #include <types/cli.h>
 #include <types/global.h>
diff --git a/src/task.c b/src/task.c
index f58e5f933..2d965f291 100644
--- a/src/task.c
+++ b/src/task.c
@@ -17,8 +17,8 @@
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/time.h>
-#include <eb32sctree.h>
-#include <eb32tree.h>
+#include <import/eb32sctree.h>
+#include <import/eb32tree.h>
 
 #include <proto/fd.h>
 #include <proto/freq_ctr.h>
diff --git a/src/wurfl.c b/src/wurfl.c
index b7eb1fef8..d53e378dc 100644
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -13,8 +13,8 @@
 #include <proto/http_fetch.h>
 #include <proto/http_htx.h>
 #include <proto/sample.h>
-#include <ebsttree.h>
-#include <ebmbtree.h>
+#include <import/ebsttree.h>
+#include <import/ebmbtree.h>
 
 #include <wurfl/wurfl.h>
 
diff --git a/tests/filltab25.c b/tests/filltab25.c
index 3bedf25cf..956e3b549 100644
--- a/tests/filltab25.c
+++ b/tests/filltab25.c
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "eb32tree.h"
+#include <import/eb32tree.h>
 
 struct srv {
 	struct eb32_node node;