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/proxy.c b/src/proxy.c
index 8e0f03a..94bce71 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -20,6 +20,7 @@
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/cli.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/listener.h>
@@ -34,9 +35,7 @@
 #include <import/ebistree.h>
 
 #include <haproxy/capture-t.h>
-#include <types/cli.h>
 
-#include <proto/cli.h>
 #include <proto/backend.h>
 #include <haproxy/fd.h>
 #include <proto/filters.h>