REORG: include: move cli.h to haproxy/cli{,-t}.h

Almost no change except moving the cli_kw struct definition after the
defines. Almost all users had both types&proto included, which is not
surprizing since this code is old and it used to be the norm a decade
ago. These places were cleaned.
diff --git a/src/cache.c b/src/cache.c
index 707a011..138ae52 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -12,18 +12,17 @@
 
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
+#include <haproxy/cli.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/shctx.h>
 #include <import/eb32tree.h>
 #include <import/sha1.h>
 
-#include <types/cli.h>
 #include <types/filters.h>
 #include <types/proxy.h>
 
 #include <proto/channel.h>
-#include <proto/cli.h>
 #include <proto/proxy.h>
 #include <proto/filters.h>
 #include <proto/http_ana.h>