CLI API cleanup.

src/cli/cli_console.hpp

@@ -35,8 +35,9 @@
 #define CLI_CONSOLE_HPP_
 
 #include <openthread-types.h>
+#include "openthread/cli.h"
+
 #include <cli/cli_server.hpp>
-#include <cli/cli-console.h>
 
 namespace Thread {
 namespace Cli {

src/cli/cli_uart.cpp

@@ -36,8 +36,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "openthread/cli.h"
+
 #include <cli/cli.hpp>
-#include <cli/cli-uart.h>
 #include <cli/cli_uart.hpp>
 #include <common/code_utils.hpp>
 #include <common/encoding.hpp>