diff --git a/include/libs/executor/storageapi.h b/include/libs/executor/storageapi.h
index 9b53f11ad9..7bcf6f8fd4 100644
--- a/include/libs/executor/storageapi.h
+++ b/include/libs/executor/storageapi.h
@@ -18,7 +18,6 @@
 
 #include "tsimplehash.h"
 #include "tscalablebf.h"
-//#include "tdb.h"
 #include "taosdef.h"
 #include "tmsg.h"
 #include "tcommon.h"
@@ -35,8 +34,6 @@ extern "C" {
 #define CACHESCAN_RETRIEVE_LAST_ROW    0x4
 #define CACHESCAN_RETRIEVE_LAST        0x8
 
-typedef struct SMeta SMeta;
-
 typedef struct SMetaEntry {
   int64_t  version;
   int8_t   type;
@@ -138,8 +135,10 @@ typedef struct SMetaTableInfo {
   char            tbName[TSDB_TABLE_NAME_LEN];
 } SMetaTableInfo;
 
+typedef struct SMeta SMeta;
+
 typedef struct SSnapContext {
-  SMeta *     pMeta;
+  SMeta *     pMeta;     // todo remove it
   int64_t     snapVersion;
   struct TBC *pCur;
   int64_t     suid;
diff --git a/include/libs/index/index.h b/include/libs/index/index.h
index 9260ec4b1e..fd71c531fa 100644
--- a/include/libs/index/index.h
+++ b/include/libs/index/index.h
@@ -21,7 +21,6 @@
 #include "taoserror.h"
 #include "tarray.h"
 #include "tglobal.h"
-#include "tsdstorage.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libs/scalar/filter.h b/include/libs/scalar/filter.h
index 7c5ca628cd..f20ba287de 100644
--- a/include/libs/scalar/filter.h
+++ b/include/libs/scalar/filter.h
@@ -55,16 +55,6 @@ extern bool    filterRangeExecute(SFilterInfo *info, SColumnDataAgg **pColsAgg,
 int32_t filterPartitionCond(SNode **pCondition, SNode **pPrimaryKeyCond, SNode **pTagIndexCond, SNode **pTagCond,
                             SNode **pOtherCond);
 
-typedef struct SMetaFltParam {
-  tb_uid_t suid;
-  int16_t  cid;
-  int16_t  type;
-  void    *val;
-  bool     reverse;
-  bool     equal;
-  int (*filterFunc)(void *a, void *b, int16_t type);
-} SMetaFltParam;
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/libs/executor/src/aggregateoperator.c b/source/libs/executor/src/aggregateoperator.c
index 918038635b..00aa52b593 100644
--- a/source/libs/executor/src/aggregateoperator.c
+++ b/source/libs/executor/src/aggregateoperator.c
@@ -21,7 +21,6 @@
 #include "tname.h"
 
 #include "executorInt.h"
-#include "tsdstorage.h"
 #include "operator.h"
 #include "query.h"
 #include "querytask.h"
diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c
index 460373b537..5bbfb188ed 100644
--- a/source/libs/executor/src/sysscanoperator.c
+++ b/source/libs/executor/src/sysscanoperator.c
@@ -32,7 +32,6 @@
 #include "tcompare.h"
 #include "thash.h"
 #include "ttypes.h"
-#include "tsdstorage.h"
 #include "index.h"
 
 typedef int (*__optSysFilter)(void* a, void* b, int16_t dtype);
diff --git a/source/libs/index/src/indexFilter.c b/source/libs/index/src/indexFilter.c
index 2dce931ad4..b90959579d 100644
--- a/source/libs/index/src/indexFilter.c
+++ b/source/libs/index/src/indexFilter.c
@@ -21,7 +21,6 @@
 #include "querynodes.h"
 #include "scalar.h"
 #include "tdatablock.h"
-#include "tsdstorage.h"
 
 // clang-format off
 #define SIF_ERR_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; return _code; } } while (0)