diff --git a/tools/shell/inc/shellCommand.h b/tools/shell/inc/shellCommand.h
index 726264dd5c..2602d41055 100644
--- a/tools/shell/inc/shellCommand.h
+++ b/tools/shell/inc/shellCommand.h
@@ -51,4 +51,4 @@ void clearScreen(int ecmd_pos, int cursor_pos);
 void printChar(char c, int times);
 void positionCursor(int step, int direction);
 
-#endif
+#endif /*_TD_SHELL_COMMAND_H_*/
diff --git a/tools/shell/inc/shellInt.h b/tools/shell/inc/shellInt.h
index 3bdeed6e2c..7bacd81820 100644
--- a/tools/shell/inc/shellInt.h
+++ b/tools/shell/inc/shellInt.h
@@ -20,6 +20,9 @@
 #include "taos.h"
 #include "taosdef.h"
 
+#include <regex.h>
+#include <wordexp.h>
+
 #define MAX_HISTORY_SIZE     1000
 #define MAX_COMMAND_SIZE     1048586
 #define HISTORY_FILE         ".taos_history"
diff --git a/tools/shell/src/shellCommand.c b/tools/shell/src/shellCommand.c
index 1ec222fcc8..f564b5421b 100644
--- a/tools/shell/src/shellCommand.c
+++ b/tools/shell/src/shellCommand.c
@@ -19,7 +19,6 @@
 #include "os.h"
 #include "shellInt.h"
 
-#include <regex.h>
 
 typedef struct {
   char widthInString;
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 9a4ef8b65a..d8d157c887 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -28,8 +28,6 @@
 #include "ttypes.h"
 #include "tutil.h"
 
-#include <regex.h>
-#include <wordexp.h>
 
 /**************** Global variables ****************/
 #ifdef _TD_POWER_
diff --git a/tools/shell/src/tnettest.c b/tools/shell/src/shellTest.c
similarity index 100%
rename from tools/shell/src/tnettest.c
rename to tools/shell/src/shellTest.c