diff --git a/tools/shell/inc/shellCommand.h b/tools/shell/inc/shellCommand.h
index 49f7dc01331e810864f87bd5b65fb13815fc7719..82a7cfbf8f338a3fc1b50a22d0c5a73c152f0b52 100644
--- a/tools/shell/inc/shellCommand.h
+++ b/tools/shell/inc/shellCommand.h
@@ -16,7 +16,7 @@
 #ifndef _TD_SHELL_COMMAND_H_
 #define _TD_SHELL_COMMAND_H_
 
-#include "shell.h"
+#include "shellInt.h"
 
 #define LEFT  1
 #define RIGHT 2
diff --git a/tools/shell/inc/shell.h b/tools/shell/inc/shellInt.h
similarity index 90%
rename from tools/shell/inc/shell.h
rename to tools/shell/inc/shellInt.h
index 866cd63bdbfdfe3337d7075b798a56dc043b3fa3..fe142a4c7d336985f1dbf88faa5470d6bcaa85ca 100644
--- a/tools/shell/inc/shell.h
+++ b/tools/shell/inc/shellInt.h
@@ -21,14 +21,10 @@
 #include "taos.h"
 #include "taosdef.h"
 
-#define MAX_USERNAME_SIZE      64
-#define MAX_DBNAME_SIZE        64
-#define MAX_IP_SIZE            20
-#define MAX_HISTORY_SIZE       1000
-#define MAX_COMMAND_SIZE       1048586
-#define HISTORY_FILE           ".taos_history"
-
-#define DEFAULT_RES_SHOW_NUM   100
+#define MAX_HISTORY_SIZE     1000
+#define MAX_COMMAND_SIZE     1048586
+#define HISTORY_FILE         ".taos_history"
+#define DEFAULT_RES_SHOW_NUM 100
 
 typedef struct SShellHistory {
   char* hist[MAX_HISTORY_SIZE];
diff --git a/tools/shell/src/backup/shellCheck.c b/tools/shell/src/backup/shellCheck.c
index d1f0683fea51df5c4d3d4ff977cf218988c42ec3..9e23e9d02663c6b4f8e34f78c701033c749b054d 100644
--- a/tools/shell/src/backup/shellCheck.c
+++ b/tools/shell/src/backup/shellCheck.c
@@ -18,7 +18,7 @@
 #define _DEFAULT_SOURCE
 
 #include "os.h"
-#include "shell.h"
+#include "shellInt.h"
 #include "shellCommand.h"
 #include "tglobal.h"
 #include "tutil.h"
diff --git a/tools/shell/src/backup/shellDarwin.c b/tools/shell/src/backup/shellDarwin.c
index 93335776bad446d4ad9575efa838ed1723421901..d9807409f7c8e7cca97a41dfffeefe938da6ae1f 100644
--- a/tools/shell/src/backup/shellDarwin.c
+++ b/tools/shell/src/backup/shellDarwin.c
@@ -17,7 +17,7 @@
 
 #include "os.h"
 
-#include "shell.h"
+#include "shellInt.h"
 #include "shellCommand.h"
 #include "tbase64.h"
 
diff --git a/tools/shell/src/backup/shellImport.c b/tools/shell/src/backup/shellImport.c
index 130c72a20bbdb831fb1fe3fa8d62ca93f5aa45dd..2eeee616b4e39efd16af9dfe5ed6cfa9c54176b9 100644
--- a/tools/shell/src/backup/shellImport.c
+++ b/tools/shell/src/backup/shellImport.c
@@ -18,7 +18,7 @@
 #define _DEFAULT_SOURCE
 
 #include "os.h"
-#include "shell.h"
+#include "shellInt.h"
 #include "shellCommand.h"
 #include "tglobal.h"
 #include "tutil.h"
diff --git a/tools/shell/src/backup/shellWindows.c b/tools/shell/src/backup/shellWindows.c
index 92ac7fd7213b13b34d94714b32216b1fb0435477..53bcb84cc8c75b507dc3b2f97c39f2887745af85 100644
--- a/tools/shell/src/backup/shellWindows.c
+++ b/tools/shell/src/backup/shellWindows.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include "../../../../include/client/taos.h"
 #include "os.h"
-#include "shell.h"
+#include "shellInt.h"
 #include "shellCommand.h"
 
 extern char configDir[];
diff --git a/tools/shell/src/shellCommand.c b/tools/shell/src/shellCommand.c
index 546b19f83cec33df8a0649b283046f70b0803f5e..c9cd57fc17c95722cdcb104e5257068c53ba589b 100644
--- a/tools/shell/src/shellCommand.c
+++ b/tools/shell/src/shellCommand.c
@@ -17,7 +17,7 @@
 
 #include "shellCommand.h"
 #include "os.h"
-#include "shell.h"
+#include "shellInt.h"
 
 #include <regex.h>
 
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 36d2866fb56c3146543886b02a0307eb5874b83e..e1a1924b2dd9f51f8f73746d6d1896410f2f643c 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -19,7 +19,7 @@
 #define _DEFAULT_SOURCE
 
 #include "os.h"
-#include "shell.h"
+#include "shellInt.h"
 #include "shellCommand.h"
 #include "taosdef.h"
 #include "taoserror.h"
diff --git a/tools/shell/src/shellMain.c b/tools/shell/src/shellMain.c
index 1ee42358f66e59580c5ca7c606fc53d548195b38..83b0f48677734f4329c827487e5ec61bdc718e40 100644
--- a/tools/shell/src/shellMain.c
+++ b/tools/shell/src/shellMain.c
@@ -16,7 +16,6 @@
 #define __USE_XOPEN
 #include "shellCommand.h"
 #include "tglobal.h"
-#include "tlog.h"
 
 #include <argp.h>
 #include <termio.h>
@@ -407,7 +406,7 @@ void *shellLoopQuery(void *arg) {
 
   char *command = taosMemoryMalloc(MAX_COMMAND_SIZE);
   if (command == NULL) {
-    uError("failed to malloc command");
+    printf("failed to malloc command\n");
     return NULL;
   }