diff --git a/source/libs/tdb/src/db/tdbPCache.c b/source/libs/tdb/src/db/tdbPCache.c
index b3343bd170..879bfca7a6 100644
--- a/source/libs/tdb/src/db/tdbPCache.c
+++ b/source/libs/tdb/src/db/tdbPCache.c
@@ -26,9 +26,6 @@ struct SPCache {
   SPage **        pgHash;
   int             nRecyclable;
   SPage           lru;
-  int             nDirty;
-  SPage *         pDirty;
-  SPage *         pDirtyTail;
 };
 
 #define PCACHE_PAGE_HASH(pPgid)                              \
@@ -248,9 +245,5 @@ static int tdbPCacheOpenImpl(SPCache *pCache) {
   pCache->lru.pLruNext = &(pCache->lru);
   pCache->lru.pLruPrev = &(pCache->lru);
 
-  // Open dirty list
-  pCache->nDirty = 0;
-  pCache->pDirty = pCache->pDirtyTail = NULL;
-
   return 0;
 }
\ No newline at end of file
diff --git a/source/libs/tdb/src/db/tdbPFile.c b/source/libs/tdb/src/db/tdbPFile.c
index 31047807bf..1e580b3262 100644
--- a/source/libs/tdb/src/db/tdbPFile.c
+++ b/source/libs/tdb/src/db/tdbPFile.c
@@ -25,6 +25,9 @@ struct SPFile {
   SPCache *pCache;
   SPgno    dbFileSize;
   SPgno    dbOrigSize;
+  int      nDirty;
+  SPage *  pDirty;
+  SPage *  pDirtyTail;
 };
 
 static int tdbPFileReadPage(SPFile *pFile, SPage *pPage);
diff --git a/source/libs/tdb/src/inc/tdbEnv.h b/source/libs/tdb/src/inc/tdbEnv.h
index 3969eae576..d779e842bd 100644
--- a/source/libs/tdb/src/inc/tdbEnv.h
+++ b/source/libs/tdb/src/inc/tdbEnv.h
@@ -20,13 +20,12 @@
 extern "C" {
 #endif
 
-typedef struct STEnv STEnv;
-struct STEnv {
+typedef struct STEnv {
   char *   rootDir;
   char *   jfname;
   int      jfd;
   SPCache *pCache;
-};
+} STEnv;
 
 int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, STEnv **ppEnv);
 int tdbEnvClose(STEnv *pEnv);