diff --git a/src/tsdb/inc/tsdbBuffer.h b/src/tsdb/inc/tsdbBuffer.h
index 8083b4418246a7cc39ee7e620f56d49a687f23b8..414ace00097d95742080a8f173177d5e44497237 100644
--- a/src/tsdb/inc/tsdbBuffer.h
+++ b/src/tsdb/inc/tsdbBuffer.h
@@ -16,10 +16,6 @@
 #ifndef _TD_TSDB_BUFFER_H_
 #define _TD_TSDB_BUFFER_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct {
   int64_t blockId;
   int     offset;
@@ -44,8 +40,4 @@ int           tsdbOpenBufPool(STsdbRepo* pRepo);
 void          tsdbCloseBufPool(STsdbRepo* pRepo);
 SListNode*    tsdbAllocBufBlockFromPool(STsdbRepo* pRepo);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _TD_TSDB_BUFFER_H_ */
\ No newline at end of file
diff --git a/src/tsdb/inc/tsdbCommit.h b/src/tsdb/inc/tsdbCommit.h
index 969733e598923991df5ab8ddabc36517a61dc585..5e740081d187466435860a3a6c066412419ab571 100644
--- a/src/tsdb/inc/tsdbCommit.h
+++ b/src/tsdb/inc/tsdbCommit.h
@@ -16,10 +16,6 @@
 #ifndef _TD_TSDB_COMMIT_H_
 #define _TD_TSDB_COMMIT_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct {
   int   minFid;
   int   midFid;
@@ -50,8 +46,4 @@ static FORCE_INLINE int tsdbGetFidLevel(int fid, SRtn *pRtn) {
   }
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _TD_TSDB_COMMIT_H_ */
\ No newline at end of file
diff --git a/src/tsdb/inc/tsdbCommitQueue.h b/src/tsdb/inc/tsdbCommitQueue.h
index f1fd35986d8dbc0e66420ca55f3bc5ffd48c5c7b..c2353391f9ad88185097eb52907e890c96021f8c 100644
--- a/src/tsdb/inc/tsdbCommitQueue.h
+++ b/src/tsdb/inc/tsdbCommitQueue.h
@@ -16,14 +16,6 @@
 #ifndef _TD_TSDB_COMMIT_QUEUE_H_
 #define _TD_TSDB_COMMIT_QUEUE_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 int tsdbScheduleCommit(STsdbRepo *pRepo);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _TD_TSDB_COMMIT_QUEUE_H_ */
\ No newline at end of file
diff --git a/src/tsdb/inc/tsdbFS.h b/src/tsdb/inc/tsdbFS.h
index 45ff223a17ccdb8f3efa5b9793c5d8fababf930b..ef0e0800c5b640f012894f5b698251b55e6442e5 100644
--- a/src/tsdb/inc/tsdbFS.h
+++ b/src/tsdb/inc/tsdbFS.h
@@ -16,10 +16,6 @@
 #ifndef _TD_TSDB_FS_H_
 #define _TD_TSDB_FS_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define TSDB_FS_VERSION 0
 
 // ================== CURRENT file header info
@@ -112,8 +108,4 @@ static FORCE_INLINE int tsdbUnLockFS(STsdbFS* pFs) {
   return 0;
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _TD_TSDB_FS_H_ */
\ No newline at end of file
diff --git a/src/tsdb/inc/tsdbFile.h b/src/tsdb/inc/tsdbFile.h
index 46810aa47d1657895d3d7147f19b691dcce787c6..cb5c78ca841cf4d5602c435ca020810861caffb4 100644
--- a/src/tsdb/inc/tsdbFile.h
+++ b/src/tsdb/inc/tsdbFile.h
@@ -16,10 +16,6 @@
 #ifndef _TS_TSDB_FILE_H_
 #define _TS_TSDB_FILE_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define TSDB_FILE_HEAD_SIZE 512
 #define TSDB_FILE_DELIMITER 0xF00AFA0F
 #define TSDB_FILE_INIT_MAGIC 0xFFFFFFFF
@@ -350,8 +346,4 @@ static FORCE_INLINE void tsdbGetFidKeyRange(int days, int8_t precision, int fid,
   *maxKey = *minKey + days * tsMsPerDay[precision] - 1;
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _TS_TSDB_FILE_H_ */
\ No newline at end of file
diff --git a/src/tsdb/inc/tsdbLog.h b/src/tsdb/inc/tsdbLog.h
index 185474b205df05bb7c336bd48e782e0b1215f3f4..fdd04e968a2ce5345030aa4cef2bb87becd8f3f9 100644
--- a/src/tsdb/inc/tsdbLog.h
+++ b/src/tsdb/inc/tsdbLog.h
@@ -16,10 +16,6 @@
 #ifndef _TD_TSDB_LOG_H_
 #define _TD_TSDB_LOG_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern int32_t tsdbDebugFlag;
 
 #define tsdbFatal(...) do { if (tsdbDebugFlag & DEBUG_FATAL) { taosPrintLog("TDB FATAL ", 255, __VA_ARGS__); }}     while(0)
@@ -29,8 +25,4 @@ extern int32_t tsdbDebugFlag;
 #define tsdbDebug(...) do { if (tsdbDebugFlag & DEBUG_DEBUG) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} while(0)
 #define tsdbTrace(...) do { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} while(0)
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _TD_TSDB_LOG_H_ */
\ No newline at end of file
diff --git a/src/tsdb/inc/tsdbMemTable.h b/src/tsdb/inc/tsdbMemTable.h
index a533975b32d094d9ae51bf02ec737335795f7a1d..3b3f1dd1f6a9307bbe3954374b005a23a9f15ab0 100644
--- a/src/tsdb/inc/tsdbMemTable.h
+++ b/src/tsdb/inc/tsdbMemTable.h
@@ -16,10 +16,6 @@
 #ifndef _TD_TSDB_MEMTABLE_H_
 #define _TD_TSDB_MEMTABLE_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct {
   int   rowsInserted;
   int   rowsUpdated;
@@ -111,9 +107,4 @@ static FORCE_INLINE TKEY tsdbNextIterTKey(SSkipListIterator* pIter) {
   return dataRowTKey(row);
 }
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _TD_TSDB_MEMTABLE_H_ */
\ No newline at end of file
diff --git a/src/tsdb/inc/tsdbMeta.h b/src/tsdb/inc/tsdbMeta.h
index 9efb2ba36a09022bf410d7f2e0e45ce0dd13ff23..cc916fa689a89f96e36c4419f1b2d413516ed5fc 100644
--- a/src/tsdb/inc/tsdbMeta.h
+++ b/src/tsdb/inc/tsdbMeta.h
@@ -16,10 +16,6 @@
 #ifndef _TD_TSDB_META_H_
 #define _TD_TSDB_META_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define TSDB_MAX_TABLE_SCHEMAS 16
 
 typedef struct STable {
@@ -145,8 +141,4 @@ static FORCE_INLINE TSKEY tsdbGetTableLastKeyImpl(STable* pTable) {
   return pTable->lastKey;
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _TD_TSDB_META_H_ */
\ No newline at end of file
diff --git a/src/tsdb/inc/tsdbReadImpl.h b/src/tsdb/inc/tsdbReadImpl.h
index 73ae35732a95e87e4036d6f4d64a18b7a6a69b7f..0efbcc55bbbdc70b3fb705370bd9330d716670fb 100644
--- a/src/tsdb/inc/tsdbReadImpl.h
+++ b/src/tsdb/inc/tsdbReadImpl.h
@@ -16,10 +16,6 @@
 #ifndef _TD_TSDB_READ_IMPL_H_
 #define _TD_TSDB_READ_IMPL_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct SReadH SReadH;
 
 typedef struct {
@@ -134,8 +130,4 @@ static FORCE_INLINE int tsdbMakeRoom(void **ppBuf, size_t size) {
   return 0;
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /*_TD_TSDB_READ_IMPL_H_*/
\ No newline at end of file
diff --git a/src/tsdb/inc/tsdbint.h b/src/tsdb/inc/tsdbint.h
index a2c6f40b2881cf20b2370d3e9d31c706c6d3bbae..074ff20f2298918f1fa0698be0a291081ead8f05 100644
--- a/src/tsdb/inc/tsdbint.h
+++ b/src/tsdb/inc/tsdbint.h
@@ -16,15 +16,15 @@
 #ifndef _TD_TSDB_INT_H_
 #define _TD_TSDB_INT_H_
 
-// TODO: remove the include
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <inttypes.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <semaphore.h>
-#include <dirent.h>
+// // TODO: remove the include
+// #include <errno.h>
+// #include <fcntl.h>
+// #include <limits.h>
+// #include <inttypes.h>
+// #include <sys/stat.h>
+// #include <sys/types.h>
+// #include <semaphore.h>
+// #include <dirent.h>
 
 #include "os.h"
 #include "tlog.h"