diff --git a/include/types/global.h b/include/types/global.h
index f753660..56e7678 100644
--- a/include/types/global.h
+++ b/include/types/global.h
@@ -26,11 +26,11 @@
 
 #include <haproxy/api-t.h>
 #include <haproxy/thread.h>
+#include <haproxy/vars-t.h>
 
 #include <haproxy/freq_ctr-t.h>
 #include <types/proxy.h>
 #include <types/task.h>
-#include <types/vars.h>
 
 #ifndef UNIX_MAX_PATH
 #define UNIX_MAX_PATH 108
diff --git a/include/types/session.h b/include/types/session.h
index 66911f3..70d10a8 100644
--- a/include/types/session.h
+++ b/include/types/session.h
@@ -31,11 +31,11 @@
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
+#include <haproxy/vars-t.h>
 
 #include <types/proxy.h>
 #include <types/stick_table.h>
 #include <types/task.h>
-#include <types/vars.h>
 
 struct sess_srv_list {
 	void *target;
diff --git a/include/types/stream.h b/include/types/stream.h
index e86b6d6..8870842 100644
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -33,6 +33,7 @@
 #include <haproxy/hlua-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
+#include <haproxy/vars-t.h>
 
 #include <types/channel.h>
 #include <types/filters.h>
@@ -44,7 +45,6 @@
 #include <types/stream_interface.h>
 #include <types/task.h>
 #include <types/stick_table.h>
-#include <types/vars.h>
 
 /* Various Stream Flags, bits values 0x01 to 0x100 (shift 0) */
 #define SF_DIRECT	0x00000001	/* connection made on the server matching the client cookie */
diff --git a/include/types/vars.h b/include/types/vars.h
deleted file mode 100644
index d8ec71c..0000000
--- a/include/types/vars.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _TYPES_VARS_H
-#define _TYPES_VARS_H
-
-#include <haproxy/list-t.h>
-#include <haproxy/thread.h>
-
-#include <haproxy/sample-t.h>
-
-enum vars_scope {
-	SCOPE_SESS = 0,
-	SCOPE_TXN,
-	SCOPE_REQ,
-	SCOPE_RES,
-	SCOPE_PROC,
-	SCOPE_CHECK,
-};
-
-struct vars {
-	struct list head;
-	enum vars_scope scope;
-	unsigned int size;
-	__decl_thread(HA_RWLOCK_T rwlock);
-};
-
-/* This struct describes a variable. */
-struct var_desc {
-	const char *name; /* Contains the normalized variable name. */
-	enum vars_scope scope;
-};
-
-struct var {
-	struct list l; /* Used for chaining vars. */
-	const char *name; /* Contains the variable name. */
-	struct sample_data data; /* data storage. */
-};
-
-#endif