diff --git a/src/common/plugin/fulltext/FTStorageAdapter.h b/src/common/plugin/fulltext/FTStorageAdapter.h
index a0b9d4d09c4..c63e14af81a 100644
--- a/src/common/plugin/fulltext/FTStorageAdapter.h
+++ b/src/common/plugin/fulltext/FTStorageAdapter.h
@@ -8,6 +8,7 @@
 #define COMMON_PLUGIN_FULLTEXT_S_ADAPTER_H_
 
 #include "common/base/Base.h"
+#include "common/base/StatusOr.h"
 #include "common/plugin/fulltext/FTUtils.h"
 
 namespace nebula {
diff --git a/src/common/plugin/fulltext/elasticsearch/ESStorageAdapter.cpp b/src/common/plugin/fulltext/elasticsearch/ESStorageAdapter.cpp
index 373c3ef0fdf..04858c536bd 100644
--- a/src/common/plugin/fulltext/elasticsearch/ESStorageAdapter.cpp
+++ b/src/common/plugin/fulltext/elasticsearch/ESStorageAdapter.cpp
@@ -6,8 +6,7 @@
 
 #include "common/plugin/fulltext/elasticsearch/ESStorageAdapter.h"
 
-#include <common/plugin/fulltext/FTUtils.h>
-
+#include "common/plugin/fulltext/FTUtils.h"
 #include "common/process/ProcessUtils.h"
 
 namespace nebula {
diff --git a/src/common/plugin/fulltext/elasticsearch/ESStorageAdapter.h b/src/common/plugin/fulltext/elasticsearch/ESStorageAdapter.h
index c57f9649d92..23fc31590d2 100644
--- a/src/common/plugin/fulltext/elasticsearch/ESStorageAdapter.h
+++ b/src/common/plugin/fulltext/elasticsearch/ESStorageAdapter.h
@@ -7,8 +7,9 @@
 #ifndef NEBULA_PLUGIN_ESSTORAGEADAPTER_H
 #define NEBULA_PLUGIN_ESSTORAGEADAPTER_H
 
-#include <gtest/gtest.h>
+#include <gtest/gtest_prod.h>
 
+#include "common/base/StatusOr.h"
 #include "common/plugin/fulltext/FTStorageAdapter.h"
 
 namespace nebula {
diff --git a/src/common/utils/Utils.h b/src/common/utils/Utils.h
index 2bf7d5ae219..8f806b168e2 100644
--- a/src/common/utils/Utils.h
+++ b/src/common/utils/Utils.h
@@ -8,6 +8,7 @@
 #define COMMON_UTILS_UTILS_H_
 
 #include "common/base/Base.h"
+#include "common/datatypes/HostAddr.h"
 
 namespace nebula {
 class Utils final {
diff --git a/src/graph/planner/match/SegmentsConnectStrategy.h b/src/graph/planner/match/SegmentsConnectStrategy.h
index ef79edcad62..c367eaf569c 100644
--- a/src/graph/planner/match/SegmentsConnectStrategy.h
+++ b/src/graph/planner/match/SegmentsConnectStrategy.h
@@ -10,6 +10,9 @@
 namespace nebula {
 namespace graph {
 
+class PlanNode;
+class QueryContext;
+
 class SegmentsConnectStrategy {
  public:
   explicit SegmentsConnectStrategy(QueryContext* qctx) : qctx_(qctx) {}
diff --git a/src/meta/upgrade/MetaDataUpgrade.h b/src/meta/upgrade/MetaDataUpgrade.h
index df7ff2e4785..3ef242494dd 100644
--- a/src/meta/upgrade/MetaDataUpgrade.h
+++ b/src/meta/upgrade/MetaDataUpgrade.h
@@ -4,14 +4,15 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
-#ifndef TOOLS_METADATAUPGRADETOOL_METADATAUPGRADE_H_
-#define TOOLS_METADATAUPGRADETOOL_METADATAUPGRADE_H_
+#pragma once
 
 #include <rocksdb/db.h>
 
 #include "common/base/Base.h"
 #include "common/base/Status.h"
 #include "interface/gen-cpp2/meta_types.h"
+#include "kvstore/KVStore.h"
+#include "meta/processors/Common.h"
 #include "meta/upgrade/v1/gen-cpp2/meta_types.h"
 
 namespace nebula {
@@ -24,37 +25,23 @@ class MetaDataUpgrade final {
   ~MetaDataUpgrade() = default;
 
   Status rewriteHosts(const folly::StringPiece &key, const folly::StringPiece &val);
-
   Status rewriteSpaces(const folly::StringPiece &key, const folly::StringPiece &val);
-
   Status rewriteParts(const folly::StringPiece &key, const folly::StringPiece &val);
-
   Status rewriteLeaders(const folly::StringPiece &key, const folly::StringPiece &val);
-
   Status rewriteSchemas(const folly::StringPiece &key, const folly::StringPiece &val);
-
   Status rewriteIndexes(const folly::StringPiece &key, const folly::StringPiece &val);
-
   Status rewriteConfigs(const folly::StringPiece &key, const folly::StringPiece &val);
-
   Status rewriteJobDesc(const folly::StringPiece &key, const folly::StringPiece &val);
 
   Status deleteKeyVal(const folly::StringPiece &key);
 
   void printHost(const folly::StringPiece &key, const folly::StringPiece &val);
-
   void printSpaces(const folly::StringPiece &val);
-
   void printParts(const folly::StringPiece &key, const folly::StringPiece &val);
-
   void printLeaders(const folly::StringPiece &key);
-
   void printSchemas(const folly::StringPiece &val);
-
   void printIndexes(const folly::StringPiece &val);
-
   void printConfigs(const folly::StringPiece &key, const folly::StringPiece &val);
-
   void printJobDesc(const folly::StringPiece &key, const folly::StringPiece &val);
 
  private:
@@ -113,5 +100,3 @@ class MetaDataUpgrade final {
 
 }  // namespace meta
 }  // namespace nebula
-
-#endif  // TOOLS_METADATAUPGRADETOOL_METADATAUPGRADE_H_
diff --git a/src/storage/exec/IndexEdgeNode.h b/src/storage/exec/IndexEdgeNode.h
index 25df915a0cf..6b931d364f1 100644
--- a/src/storage/exec/IndexEdgeNode.h
+++ b/src/storage/exec/IndexEdgeNode.h
@@ -7,6 +7,7 @@
 #define STORAGE_EXEC_INDEXEDGENODE_H_
 
 #include "common/base/Base.h"
+#include "storage/exec/IndexScanNode.h"
 #include "storage/exec/RelNode.h"
 
 namespace nebula {
diff --git a/src/storage/exec/IndexFilterNode.h b/src/storage/exec/IndexFilterNode.h
index 6ec42470635..12ab9106179 100644
--- a/src/storage/exec/IndexFilterNode.h
+++ b/src/storage/exec/IndexFilterNode.h
@@ -9,6 +9,9 @@
 #include "common/base/Base.h"
 #include "common/context/ExpressionContext.h"
 #include "common/expression/Expression.h"
+#include "storage/exec/IndexEdgeNode.h"
+#include "storage/exec/IndexScanNode.h"
+#include "storage/exec/IndexVertexNode.h"
 #include "storage/exec/RelNode.h"
 
 namespace nebula {
diff --git a/src/storage/exec/IndexOutputNode.h b/src/storage/exec/IndexOutputNode.h
index 2bd60fbd081..9fd7d3a0435 100644
--- a/src/storage/exec/IndexOutputNode.h
+++ b/src/storage/exec/IndexOutputNode.h
@@ -7,6 +7,10 @@
 #define STORAGE_EXEC_INDEXOUTPUTNODE_H_
 
 #include "common/base/Base.h"
+#include "storage/exec/IndexEdgeNode.h"
+#include "storage/exec/IndexFilterNode.h"
+#include "storage/exec/IndexScanNode.h"
+#include "storage/exec/IndexVertexNode.h"
 #include "storage/exec/RelNode.h"
 
 namespace nebula {