diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c
index 41d911e4c7d068ca12997b3eb5d6f861b2bf2e08..0180cc5ede1526748b05986da7001a84b70138ea 100644
--- a/source/common/src/tdataformat.c
+++ b/source/common/src/tdataformat.c
@@ -13,11 +13,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 #include "tdataformat.h"
-#include "ulog.h"
 #include "talgo.h"
 #include "tcoding.h"
 #include "wchar.h"
 #include "tarray.h"
+#include "tlog.h"
 
 static void dataColSetNEleNull(SDataCol *pCol, int nEle);
 #if 0
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index e1a23a8ac807e3f87197c00e542fa947f0bc7ae2..26d33199c1570121ce166459dcb2b0a6d81153eb 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -24,7 +24,6 @@
 #include "tglobal.h"
 #include "tlog.h"
 #include "tutil.h"
-#include "ulog.h"
 
 SConfig *tsCfg = NULL;
 
diff --git a/source/dnode/mgmt/daemon/inc/dmnInt.h b/source/dnode/mgmt/daemon/inc/dmnInt.h
index 82e95782cb89b966e8800cef7ca2de49cf78aad5..8a571352f021ab53f3405e11114257b7ecbd4fd8 100644
--- a/source/dnode/mgmt/daemon/inc/dmnInt.h
+++ b/source/dnode/mgmt/daemon/inc/dmnInt.h
@@ -21,7 +21,7 @@
 #include "dnode.h"
 #include "taoserror.h"
 #include "tglobal.h"
-#include "ulog.h"
+#include "tlog.h"
 #include "version.h"
 
 #ifdef __cplusplus
diff --git a/source/dnode/mgmt/impl/test/sut/inc/sut.h b/source/dnode/mgmt/impl/test/sut/inc/sut.h
index c5c7ff2920d32f090d880afe41103e0178e0d341..304a370bcd4af4b5dda70b5131f9aadc95994ffb 100644
--- a/source/dnode/mgmt/impl/test/sut/inc/sut.h
+++ b/source/dnode/mgmt/impl/test/sut/inc/sut.h
@@ -26,10 +26,10 @@
 #include "tmsg.h"
 #include "trpc.h"
 #include "tthread.h"
-#include "ulog.h"
 
 #include "client.h"
 #include "server.h"
+#include "tlog.h"
 
 class Testbase {
  public:
diff --git a/source/libs/index/test/fstUT.cc b/source/libs/index/test/fstUT.cc
index d59a3428da2ca377444234d77850ea4d7afadb26..9665198b3b651698775c61753dc8473105649cd1 100644
--- a/source/libs/index/test/fstUT.cc
+++ b/source/libs/index/test/fstUT.cc
@@ -15,7 +15,7 @@
 #include "tglobal.h"
 #include "tskiplist.h"
 #include "tutil.h"
-#include "ulog.h"
+#include "tlog.h"
 
 static std::string dir = "/tmp/index";
 
diff --git a/source/libs/transport/test/transUT.cc b/source/libs/transport/test/transUT.cc
index f5b3ed4c3203808718090c27af8fb073bd6c81f5..6db709da513b6f169d12ea9e8aa3f9292544d2a1 100644
--- a/source/libs/transport/test/transUT.cc
+++ b/source/libs/transport/test/transUT.cc
@@ -18,7 +18,7 @@
 #include "tep.h"
 #include "tglobal.h"
 #include "trpc.h"
-#include "ulog.h"
+#include "tlog.h"
 using namespace std;
 
 const char *label = "APP";
diff --git a/source/util/src/compare.c b/source/util/src/compare.c
index 1b1fa417546c611eb3b97e536b5cd8cfb569e8d1..b597eb32bf9f3a8a186d827c93ee748c0b20f7c1 100644
--- a/source/util/src/compare.c
+++ b/source/util/src/compare.c
@@ -22,7 +22,7 @@
 #include "regex.h"
 #include "thash.h"
 #include "types.h"
-#include "ulog.h"
+#include "tlog.h"
 #include "tdef.h"
 #include "taos.h"
 
diff --git a/source/util/src/tcache.c b/source/util/src/tcache.c
index 621f103207e0161a1189a63d0fc9f108f322afca..6914e7e2d03603a2f511d6f10c94239eef80d40f 100644
--- a/source/util/src/tcache.c
+++ b/source/util/src/tcache.c
@@ -15,7 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "ulog.h"
+#include "tlog.h"
 #include "ttimer.h"
 #include "tutil.h"
 #include "tcache.h"
diff --git a/source/util/src/tcompression.c b/source/util/src/tcompression.c
index b0dcff88e7e0b946b9118094aa08d4a4ec04ae8d..03a4846c3de75f6b928320203759ff492beb3dae 100644
--- a/source/util/src/tcompression.c
+++ b/source/util/src/tcompression.c
@@ -53,7 +53,7 @@
   #include "td_sz.h"
 #endif
 #include "tcompression.h"
-#include "ulog.h"
+#include "tlog.h"
 
 static const int TEST_NUMBER = 1;
 #define is_bigendian() ((*(char *)&TEST_NUMBER) == 0)
diff --git a/source/util/src/tconfig.c b/source/util/src/tconfig.c
index dd446a40483d080916cba9b2661adb84cba7f387..0ee1b9e1d6968e3cf38cc5c1f722dfe1502639a3 100644
--- a/source/util/src/tconfig.c
+++ b/source/util/src/tconfig.c
@@ -19,7 +19,7 @@
 #include "tcfg.h"
 #include "thash.h"
 #include "tutil.h"
-#include "ulog.h"
+#include "tlog.h"
 
 #define CFG_NAME_PRINT_LEN 24
 #define CFG_SRC_PRINT_LEN  12
diff --git a/source/util/src/tfile.c b/source/util/src/tfile.c
index d10ea6a9342f24620b83fdaeec5d89be25f55ba5..ef9708df0ccf61852e1e5f465a9670a72916efac 100644
--- a/source/util/src/tfile.c
+++ b/source/util/src/tfile.c
@@ -18,7 +18,7 @@
 #include "taoserror.h"
 #include "tref.h"
 #include "tutil.h"
-#include "ulog.h"
+#include "tlog.h"
 
 static int32_t tsFileRsetId = -1;
 
diff --git a/source/util/src/thash.c b/source/util/src/thash.c
index 0b0d8c4c589ee9f5effa33e17f19573ab0a51199..9f39b79968c2684681ee508915b8e640598cc2f8 100644
--- a/source/util/src/thash.c
+++ b/source/util/src/thash.c
@@ -15,7 +15,7 @@
 
 #include "os.h"
 #include "thash.h"
-#include "ulog.h"
+#include "tlog.h"
 #include "taos.h"
 #include "tdef.h"
 
diff --git a/source/util/src/tidpool.c b/source/util/src/tidpool.c
index 00c43bb25fdf6cea9d618b0ad5c48a0951a93b35..b4d76e6fb5bbd0c588e68a213d82e89b9d2424d5 100644
--- a/source/util/src/tidpool.c
+++ b/source/util/src/tidpool.c
@@ -13,8 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "os.h"
-#include "ulog.h"
+#include "tlog.h"
 
 typedef struct {
   int             maxId;
diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c
index 547470340cf681d7ce41dcf97e4b1fef806cfd39..9fdbeba6d80390f3e4255158687fb35612971b38 100644
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
@@ -15,7 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "tutil.h"
-#include "ulog.h"
+#include "tlog.h"
 
 #define LOG_MAX_LINE_SIZE              (1000)
 #define LOG_MAX_LINE_BUFFER_SIZE       (LOG_MAX_LINE_SIZE + 10)
diff --git a/source/util/src/tlosertree.c b/source/util/src/tlosertree.c
index 80bbac2c789e5742854cd9f0fb8b38664fd5e56d..8b7f55809baa1eabbd10be49d22b4f44d2db8c90 100644
--- a/source/util/src/tlosertree.c
+++ b/source/util/src/tlosertree.c
@@ -14,7 +14,7 @@
  */
 
 #include "os.h"
-#include "ulog.h"
+#include "tlog.h"
 #include "tlosertree.h"
 #include "taoserror.h"
 
diff --git a/source/util/src/tmempool.c b/source/util/src/tmempool.c
index a61c4abb146ec7497fca7499ac06773812cdea90..f980a05629f5504d14bdf168b0d753d42f8b4c57 100644
--- a/source/util/src/tmempool.c
+++ b/source/util/src/tmempool.c
@@ -13,8 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "os.h"
-#include "ulog.h"
+#include "tlog.h"
 #include "tmempool.h"
 #include "tutil.h"
 
diff --git a/source/util/src/tpagedbuf.c b/source/util/src/tpagedbuf.c
index ca260f0df508b3d4d38b2614b819c849f59114ac..a7e43cebf9c813c028722a4849e841ae18c0baf4 100644
--- a/source/util/src/tpagedbuf.c
+++ b/source/util/src/tpagedbuf.c
@@ -1,5 +1,4 @@
-#include "os.h"
-#include "ulog.h"
+#include "tlog.h"
 #include "tpagedbuf.h"
 #include "taoserror.h"
 #include "tcompression.h"
diff --git a/source/util/src/tqueue.c b/source/util/src/tqueue.c
index 8125f550d05df47d6f1b9880ee82c82e83a307c0..0f6e2610c5df6ce7a3b674c0187889f095970ca6 100644
--- a/source/util/src/tqueue.c
+++ b/source/util/src/tqueue.c
@@ -16,7 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "tqueue.h"
 #include "taoserror.h"
-#include "ulog.h"
+#include "tlog.h"
 
 typedef struct STaosQnode STaosQnode;
 
diff --git a/source/util/src/tref.c b/source/util/src/tref.c
index 68f161bd3dc6c12f121855c6edf04f62a2f285cb..ca4388ec26f7da618e2878d4ecc79d3bb9545376 100644
--- a/source/util/src/tref.c
+++ b/source/util/src/tref.c
@@ -14,8 +14,9 @@
  */
 
 #include "os.h"
+
 #include "taoserror.h"
-#include "ulog.h"
+#include "tlog.h"
 #include "tutil.h"
 
 #define TSDB_REF_OBJECTS       50
diff --git a/source/util/src/tsched.c b/source/util/src/tsched.c
index 915edc45ceb99d75a36bf31eb93f550ccc98d561..7db5abdd24370fdf37236c2c8a616e84149b4a53 100644
--- a/source/util/src/tsched.c
+++ b/source/util/src/tsched.c
@@ -13,10 +13,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "os.h"
 #include "tdef.h"
 #include "tutil.h"
-#include "ulog.h"
+#include "tlog.h"
 #include "tsched.h"
 #include "ttimer.h"
 
diff --git a/source/util/src/tskiplist.c b/source/util/src/tskiplist.c
index 328d3da5a4a4e40c508da3881fb2eba48c939d02..1c325ca0a8519621eda72f40f520c8306aa6796e 100644
--- a/source/util/src/tskiplist.c
+++ b/source/util/src/tskiplist.c
@@ -14,12 +14,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "os.h"
-
 #include "compare.h"
 #include "tskiplist.h"
 #include "tutil.h"
-#include "ulog.h"
+#include "tlog.h"
 
 static int                initForwardBackwardPtr(SSkipList *pSkipList);
 static SSkipListNode *    getPriorNode(SSkipList *pSkipList, const char *val, int32_t order, SSkipListNode **pCur);
diff --git a/source/util/src/tstep.c b/source/util/src/tstep.c
index d840b119fb8358ef581b2bb1a8154dbed992dfc9..30c8ec2b3aabdfeeb60c8716d63ae71dc0d00fb7 100644
--- a/source/util/src/tstep.c
+++ b/source/util/src/tstep.c
@@ -14,8 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "os.h"
-#include "ulog.h"
+#include "tlog.h"
 #include "taoserror.h"
 #include "tstep.h"
 
diff --git a/source/util/src/tthread.c b/source/util/src/tthread.c
index 44fce1c882c4f0d7d66f36d378db1594e59f19ea..8c7a3ada05fab2ae2ab200b513957d93b9680e79 100644
--- a/source/util/src/tthread.c
+++ b/source/util/src/tthread.c
@@ -14,11 +14,10 @@
  */
 
 #include "tthread.h"
-#include "os.h"
 #include "taoserror.h"
 #include "tdef.h"
 #include "tutil.h"
-#include "ulog.h"
+#include "tlog.h"
 
 // create new thread
 pthread_t* taosCreateThread(void* (*__start_routine)(void*), void* param) {
diff --git a/source/util/src/tversion.c b/source/util/src/tversion.c
index 3944bd51327a8516dcf87e65e8fa1b0ae74fe90a..8409637e80227b7a5c4e28a209cc71c659ce2e41 100644
--- a/source/util/src/tversion.c
+++ b/source/util/src/tversion.c
@@ -17,7 +17,6 @@
 #include "os.h"
 #include "taoserror.h"
 #include "tdef.h"
-#include "ulog.h"
 
 int32_t taosVersionStrToInt(const char *vstr, int32_t *vint) {
   if (vstr == NULL) {
diff --git a/source/util/src/tworker.c b/source/util/src/tworker.c
index ca4e5a6f30672b79162056e73f338983ba41596d..2843f4e801acdde8a1b8818897efbb096ce32891 100644
--- a/source/util/src/tworker.c
+++ b/source/util/src/tworker.c
@@ -16,7 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "tworker.h"
 #include "taoserror.h"
-#include "ulog.h"
+#include "tlog.h"
 
 typedef void *(*ThreadFp)(void *param);
 
diff --git a/source/util/test/trefTest.c b/source/util/test/trefTest.c
index 1484ed2182b35aba1a9af093a1ceb0840b90736e..586151d7827066cfa4fa840cbb862a03bb435989 100644
--- a/source/util/test/trefTest.c
+++ b/source/util/test/trefTest.c
@@ -8,7 +8,7 @@
 #include "tlog.h"
 #include "tglobal.h"
 #include "taoserror.h"
-#include "ulog.h"
+#include "tlog.h"
 
 typedef struct {
   int     refNum;
diff --git a/tools/shell/src/backup/tnettest.c b/tools/shell/src/backup/tnettest.c
index be8714387f3e693dcdaf673e5dec959a39a18912..772d92d8c6956a3eed1d5273df984c15b73cffc8 100644
--- a/tools/shell/src/backup/tnettest.c
+++ b/tools/shell/src/backup/tnettest.c
@@ -18,7 +18,7 @@
 #include "taosdef.h"
 #include "tmsg.h"
 #include "taoserror.h"
-#include "tulog.h"
+#include "tlog.h"
 #include "tglobal.h"
 #include "tsocket.h"
 #include "trpc.h"
diff --git a/tools/shell/src/shellLinux.c b/tools/shell/src/shellLinux.c
index b06109184e492ca0b7a15af69156d5b136ec2172..f304f35e3e60ecc41b83da6f5d134d22cbc8f0d0 100644
--- a/tools/shell/src/shellLinux.c
+++ b/tools/shell/src/shellLinux.c
@@ -19,7 +19,7 @@
 #include "shell.h"
 #include "shellCommand.h"
 #include "tkey.h"
-#include "ulog.h"
+#include "tlog.h"
 #include "version.h"
 
 #include <wordexp.h>