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/stats.c b/src/stats.c
index bc59066..e62f0e4 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -28,6 +28,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/check.h>
+#include <haproxy/cli.h>
 #include <haproxy/compression.h>
 #include <haproxy/debug.h>
 #include <haproxy/dns.h>
@@ -51,11 +52,8 @@
 #include <haproxy/version.h>
 #include <haproxy/base64.h>
 
-#include <types/cli.h>
-
 #include <proto/backend.h>
 #include <proto/channel.h>
-#include <proto/cli.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>