diff --git a/src/debug.c b/src/debug.c
index bf2bc1a..18fed01 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -22,6 +22,7 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/debug.h>
+#include <haproxy/hlua.h>
 #include <haproxy/thread.h>
 #include <import/ist.h>
 #include <haproxy/net_helper.h>
@@ -32,7 +33,6 @@
 
 #include <proto/cli.h>
 #include <haproxy/fd.h>
-#include <proto/hlua.h>
 #include <proto/stream_interface.h>
 #include <proto/task.h>
 
diff --git a/src/haproxy.c b/src/haproxy.c
index 3f2dd13..1ec9d83 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -86,6 +86,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
+#include <haproxy/hlua.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/namespace.h>
@@ -115,7 +116,6 @@
 #include <proto/connection.h>
 #include <haproxy/fd.h>
 #include <proto/filters.h>
-#include <proto/hlua.h>
 #include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/log.h>
diff --git a/src/hlua.c b/src/hlua.c
index daf2a8f..22d2938 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -30,10 +30,10 @@
 #include <haproxy/regex.h>
 #include <haproxy/xref.h>
 #include <haproxy/h1.h>
+#include <haproxy/hlua.h>
 #include <haproxy/tools.h>
 
 #include <types/cli.h>
-#include <types/hlua.h>
 #include <types/proxy.h>
 #include <types/stats.h>
 
@@ -43,7 +43,6 @@
 #include <proto/cli.h>
 #include <proto/connection.h>
 #include <proto/stats.h>
-#include <proto/hlua.h>
 #include <proto/hlua_fcn.h>
 #include <proto/http_fetch.h>
 #include <proto/http_rules.h>
diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
index b759f11..36a54e4 100644
--- a/src/hlua_fcn.c
+++ b/src/hlua_fcn.c
@@ -18,6 +18,7 @@
 #include <lua.h>
 #include <lualib.h>
 
+#include <haproxy/hlua-t.h>
 #include <haproxy/http.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
@@ -25,7 +26,6 @@
 #include <common/uri_auth.h>
 
 #include <types/cli.h>
-#include <types/hlua.h>
 #include <types/proxy.h>
 #include <types/stats.h>
 
diff --git a/src/stream.c b/src/stream.c
index c87316b..e2e7880 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -18,6 +18,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/dict.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/hlua.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/thread.h>
 #include <haproxy/htx.h>
@@ -45,7 +46,6 @@
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/frontend.h>
-#include <proto/hlua.h>
 #include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/log.h>
diff --git a/src/tools.c b/src/tools.c
index 2b94793..ecdbe1f 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -41,12 +41,12 @@
 
 #include <haproxy/api.h>
 #include <haproxy/chunk.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/hlua.h>
 #include <proto/listener.h>
 #include <haproxy/proto_udp.h>
 #include <proto/ssl_sock.h>