diff --git a/bcos-codec/CMakeLists.txt b/bcos-codec/CMakeLists.txt
index e1bbc00d4b..50ddd4e558 100644
--- a/bcos-codec/CMakeLists.txt
+++ b/bcos-codec/CMakeLists.txt
@@ -30,7 +30,6 @@ find_package(Microsoft.GSL CONFIG REQUIRED)
 add_library(${CODEC_TARGET} ${SRC_LIST} ${HEADERS})
 target_include_directories(${CODEC_TARGET} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     $<INSTALL_INTERFACE:include/bcos-codec>
 )
 target_link_libraries(${CODEC_TARGET} PUBLIC bcos-crypto Microsoft.GSL::GSL)
diff --git a/bcos-crypto/bcos-crypto/KeyCompareTools.h b/bcos-crypto/bcos-crypto/KeyCompareTools.h
index b441278099..009a8d261f 100644
--- a/bcos-crypto/bcos-crypto/KeyCompareTools.h
+++ b/bcos-crypto/bcos-crypto/KeyCompareTools.h
@@ -21,9 +21,9 @@
 
 #pragma once
 
-#include "bcos-crypto/bcos-crypto/interfaces/crypto/CommonType.h"
-#include "bcos-utilities/bcos-utilities/FixedBytes.h"
-#include "bcos-utilities/bcos-utilities/Ranges.h"
+#include "bcos-crypto/interfaces/crypto/CommonType.h"
+#include "bcos-utilities/FixedBytes.h"
+#include "bcos-utilities/Ranges.h"
 
 namespace bcos::crypto
 {
diff --git a/bcos-executor/test/unittest/libprecompiled/PreCompiledFixture.h b/bcos-executor/test/unittest/libprecompiled/PreCompiledFixture.h
index 25d828e00e..0cef3cc8be 100644
--- a/bcos-executor/test/unittest/libprecompiled/PreCompiledFixture.h
+++ b/bcos-executor/test/unittest/libprecompiled/PreCompiledFixture.h
@@ -19,15 +19,6 @@
  */
 
 #pragma once
-#include "bcos-executor/src/precompiled/common/Common.h"
-#include "bcos-executor/src/precompiled/common/Utilities.h"
-#include "bcos-framework/bcos-framework/testutils/faker/FakeBlock.h"
-#include "bcos-framework/bcos-framework/testutils/faker/FakeBlockHeader.h"
-#include "bcos-framework/ledger/LedgerTypeDef.h"
-#include "bcos-framework/protocol/Protocol.h"
-#include "bcos-framework/protocol/ProtocolTypeDef.h"
-#include "bcos-table/src/StateStorageFactory.h"
-#include "bcos-tars-protocol/protocol/BlockHeaderImpl.h"
 #include "executive/BlockContext.h"
 #include "executive/TransactionExecutive.h"
 #include "executor/TransactionExecutorFactory.h"
@@ -40,8 +31,17 @@
 #include <bcos-crypto/hash/SM3.h>
 #include <bcos-crypto/signature/secp256k1/Secp256k1Crypto.h>
 #include <bcos-crypto/signature/sm2.h>
+#include <bcos-executor/src/precompiled/common/Common.h>
+#include <bcos-executor/src/precompiled/common/Utilities.h>
 #include <bcos-framework/executor/NativeExecutionMessage.h>
+#include <bcos-framework/ledger/LedgerTypeDef.h>
+#include <bcos-framework/protocol/Protocol.h>
+#include <bcos-framework/protocol/ProtocolTypeDef.h>
 #include <bcos-framework/storage/Table.h>
+#include <bcos-framework/testutils/faker/FakeBlock.h>
+#include <bcos-framework/testutils/faker/FakeBlockHeader.h>
+#include <bcos-table/src/StateStorageFactory.h>
+#include <bcos-tars-protocol/protocol/BlockHeaderImpl.h>
 #include <bcos-tool/BfsFileFactory.h>
 #include <bcos-utilities/testutils/TestPromptFixture.h>
 #include <libinitializer/AuthInitializer.h>
diff --git a/bcos-framework/CMakeLists.txt b/bcos-framework/CMakeLists.txt
index eac1929f80..d5aa1c7e3f 100644
--- a/bcos-framework/CMakeLists.txt
+++ b/bcos-framework/CMakeLists.txt
@@ -18,7 +18,6 @@
 
 cmake_minimum_required(VERSION 3.12)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-framework)
 
 find_package(Microsoft.GSL CONFIG REQUIRED)
diff --git a/bcos-framework/bcos-framework/protocol/ProtocolInfoCodec.h b/bcos-framework/bcos-framework/protocol/ProtocolInfoCodec.h
index 6226de6f57..807ea1827f 100644
--- a/bcos-framework/bcos-framework/protocol/ProtocolInfoCodec.h
+++ b/bcos-framework/bcos-framework/protocol/ProtocolInfoCodec.h
@@ -19,7 +19,7 @@
  * @date 2022-03-22
  */
 #pragma once
-#include "bcos-framework/bcos-framework/protocol/ProtocolInfo.h"
+#include "bcos-framework/protocol/ProtocolInfo.h"
 #include <bcos-utilities/Common.h>
 #include <memory>
 namespace bcos
diff --git a/bcos-framework/bcos-framework/testutils/faker/FakeBlockHeader.h b/bcos-framework/bcos-framework/testutils/faker/FakeBlockHeader.h
index 5c777d0585..e89b0162d6 100644
--- a/bcos-framework/bcos-framework/testutils/faker/FakeBlockHeader.h
+++ b/bcos-framework/bcos-framework/testutils/faker/FakeBlockHeader.h
@@ -18,12 +18,12 @@
  * @date: 2021-03-16
  */
 #pragma once
-#include "bcos-crypto/bcos-crypto/hash/Keccak256.h"
-#include "bcos-crypto/bcos-crypto/hash/SM3.h"
-#include "bcos-crypto/bcos-crypto/signature/secp256k1/Secp256k1Crypto.h"
+#include "bcos-crypto/hash/Keccak256.h"
+#include "bcos-crypto/hash/SM3.h"
+#include "bcos-crypto/signature/secp256k1/Secp256k1Crypto.h"
 #include "bcos-protocol/Common.h"
 #include "bcos-tars-protocol/protocol/BlockHeaderFactoryImpl.h"
-#include "bcos-utilities/bcos-utilities/Common.h"
+#include "bcos-utilities/Common.h"
 #include <tbb/parallel_invoke.h>
 #include <boost/test/tools/old/interface.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/bcos-framework/bcos-framework/testutils/faker/FakeTransaction.h b/bcos-framework/bcos-framework/testutils/faker/FakeTransaction.h
index e75685df4f..7bd5c6141b 100644
--- a/bcos-framework/bcos-framework/testutils/faker/FakeTransaction.h
+++ b/bcos-framework/bcos-framework/testutils/faker/FakeTransaction.h
@@ -21,13 +21,13 @@
 #include "bcos-tars-protocol/bcos-tars-protocol/impl/TarsHashable.h"
 
 #include "bcos-concepts/Hash.h"
-#include "bcos-crypto/bcos-crypto/hash/Keccak256.h"
-#include "bcos-crypto/bcos-crypto/hash/SM3.h"
-#include "bcos-crypto/bcos-crypto/signature/secp256k1/Secp256k1Crypto.h"
+#include "bcos-crypto/hash/Keccak256.h"
+#include "bcos-crypto/hash/SM3.h"
 #include "bcos-crypto/interfaces/crypto/KeyPairInterface.h"
+#include "bcos-crypto/signature/secp256k1/Secp256k1Crypto.h"
 #include "bcos-tars-protocol/bcos-tars-protocol/protocol/TransactionFactoryImpl.h"
 #include "bcos-tars-protocol/protocol/TransactionImpl.h"
-#include "bcos-utilities/bcos-utilities/Common.h"
+#include "bcos-utilities/Common.h"
 #include <boost/test/unit_test.hpp>
 
 using namespace bcos;
diff --git a/bcos-framework/bcos-framework/testutils/faker/FakeTransactionReceipt.h b/bcos-framework/bcos-framework/testutils/faker/FakeTransactionReceipt.h
index b0a395d2ad..62e7529063 100644
--- a/bcos-framework/bcos-framework/testutils/faker/FakeTransactionReceipt.h
+++ b/bcos-framework/bcos-framework/testutils/faker/FakeTransactionReceipt.h
@@ -18,13 +18,13 @@
  * @date: 2021-03-16
  */
 #pragma once
-#include "bcos-crypto/bcos-crypto/hash/Keccak256.h"
-#include "bcos-crypto/bcos-crypto/hash/SM3.h"
-#include "bcos-crypto/bcos-crypto/signature/secp256k1/Secp256k1Crypto.h"
+#include "bcos-crypto/hash/Keccak256.h"
+#include "bcos-crypto/hash/SM3.h"
+#include "bcos-crypto/signature/secp256k1/Secp256k1Crypto.h"
 #include "bcos-protocol/TransactionStatus.h"
 #include "bcos-tars-protocol/bcos-tars-protocol/protocol/TransactionReceiptImpl.h"
 #include "bcos-tars-protocol/protocol/TransactionReceiptFactoryImpl.h"
-#include "bcos-utilities/bcos-utilities/Common.h"
+#include "bcos-utilities/Common.h"
 #include <boost/test/unit_test.hpp>
 
 using namespace bcos;
diff --git a/bcos-gateway/bcos-gateway/libnetwork/PeerBlackWhitelistInterface.h b/bcos-gateway/bcos-gateway/libnetwork/PeerBlackWhitelistInterface.h
index dd278835a8..6aec2fb355 100644
--- a/bcos-gateway/bcos-gateway/libnetwork/PeerBlackWhitelistInterface.h
+++ b/bcos-gateway/bcos-gateway/libnetwork/PeerBlackWhitelistInterface.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <bcos-utilities/bcos-utilities/FixedBytes.h>
+#include <bcos-utilities/FixedBytes.h>
 
 #include <memory>
 #include <set>
diff --git a/bcos-ledger/src/libledger/LedgerImpl.h b/bcos-ledger/src/libledger/LedgerImpl.h
index c43585161d..dda9202370 100644
--- a/bcos-ledger/src/libledger/LedgerImpl.h
+++ b/bcos-ledger/src/libledger/LedgerImpl.h
@@ -14,7 +14,7 @@
 #include <bcos-executor/src/Common.h>
 #include <bcos-framework/ledger/LedgerTypeDef.h>
 #include <bcos-table/src/StateStorageFactory.h>
-#include <bcos-tool/bcos-tool/VersionConverter.h>
+#include <bcos-tool/VersionConverter.h>
 #include <bcos-utilities/DataConvertUtility.h>
 #include <bcos-utilities/Ranges.h>
 #include <tbb/blocked_range.h>
@@ -449,10 +449,10 @@ class LedgerImpl : public bcos::concepts::ledger::LedgerBase<LedgerImpl<Hasher,
     }
 
     template <class Type>
-        requires std::same_as<Type, concepts::ledger::TRANSACTIONS> ||
-                 std::same_as<Type, concepts::ledger::RECEIPTS>
-    task::Task<void> getBlockData(
-        std::string_view blockNumberKey, bcos::concepts::block::Block auto& block)
+    requires std::same_as<Type, concepts::ledger::TRANSACTIONS> ||
+        std::same_as<Type, concepts::ledger::RECEIPTS>
+            task::Task<void> getBlockData(
+                std::string_view blockNumberKey, bcos::concepts::block::Block auto& block)
     {
         LEDGER_LOG(DEBUG) << "getBlockData transactions or receipts: " << blockNumberKey;
 
diff --git a/bcos-pbft/bcos-pbft/pbft/config/PBFTConfig.h b/bcos-pbft/bcos-pbft/pbft/config/PBFTConfig.h
index c59d49ab46..e0e87e2c8b 100644
--- a/bcos-pbft/bcos-pbft/pbft/config/PBFTConfig.h
+++ b/bcos-pbft/bcos-pbft/pbft/config/PBFTConfig.h
@@ -28,7 +28,7 @@
 #include "bcos-pbft/pbft/interfaces/PBFTMessageFactory.h"
 #include "bcos-pbft/pbft/interfaces/PBFTStorage.h"
 #include "bcos-pbft/pbft/utilities/Common.h"
-#include "bcos-rpbft/bcos-rpbft/rpbft/config/RPBFTConfigTools.h"
+#include "bcos-rpbft/rpbft/config/RPBFTConfigTools.h"
 #include <bcos-crypto/interfaces/crypto/CryptoSuite.h>
 #include <bcos-framework/front/FrontServiceInterface.h>
 #include <bcos-framework/sync/BlockSyncInterface.h>
diff --git a/bcos-pbft/bcos-pbft/pbft/engine/PBFTEngine.h b/bcos-pbft/bcos-pbft/pbft/engine/PBFTEngine.h
index cd048b1451..3cc2e75ee6 100644
--- a/bcos-pbft/bcos-pbft/pbft/engine/PBFTEngine.h
+++ b/bcos-pbft/bcos-pbft/pbft/engine/PBFTEngine.h
@@ -21,7 +21,7 @@
 #pragma once
 #include "PBFTLogSync.h"
 #include "bcos-pbft/core/ConsensusEngine.h"
-#include "bcos-rpbft/bcos-rpbft/rpbft/config/RPBFTConfigTools.h"
+#include "bcos-rpbft/rpbft/config/RPBFTConfigTools.h"
 #include <bcos-tool/LedgerConfigFetcher.h>
 #include <bcos-utilities/ConcurrentQueue.h>
 #include <bcos-utilities/Error.h>
diff --git a/bcos-pbft/bcos-pbft/pbft/protocol/PB/PBFTBaseMessage.h b/bcos-pbft/bcos-pbft/pbft/protocol/PB/PBFTBaseMessage.h
index c31feaad5c..0315407e2b 100644
--- a/bcos-pbft/bcos-pbft/pbft/protocol/PB/PBFTBaseMessage.h
+++ b/bcos-pbft/bcos-pbft/pbft/protocol/PB/PBFTBaseMessage.h
@@ -21,7 +21,7 @@
 #pragma once
 #include "bcos-pbft/pbft/interfaces/PBFTBaseMessageInterface.h"
 #include "bcos-pbft/pbft/protocol/proto/PBFT.pb.h"
-#include "bcos-utilities/bcos-utilities/Common.h"
+#include "bcos-utilities/Common.h"
 #include <bcos-protocol/Common.h>
 namespace bcos
 {
diff --git a/bcos-protocol/CMakeLists.txt b/bcos-protocol/CMakeLists.txt
index 99a047ac25..16e960a70b 100644
--- a/bcos-protocol/CMakeLists.txt
+++ b/bcos-protocol/CMakeLists.txt
@@ -23,7 +23,6 @@ add_subdirectory(bcos-protocol)
 add_library(bcos-protocol INTERFACE)
 target_include_directories(bcos-protocol INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     $<INSTALL_INTERFACE:include/bcos-protocol>
 )
 target_link_libraries(bcos-protocol INTERFACE ${CODEC_TARGET})
diff --git a/bcos-rpc/test/unittests/common/RPCFixture.h b/bcos-rpc/test/unittests/common/RPCFixture.h
index 100450319f..5f0a3f4723 100644
--- a/bcos-rpc/test/unittests/common/RPCFixture.h
+++ b/bcos-rpc/test/unittests/common/RPCFixture.h
@@ -20,22 +20,22 @@
 
 #pragma once
 
-#include "bcos-crypto/encrypt/AESCrypto.h"
-#include "bcos-crypto/signature/secp256k1/Secp256k1Crypto.h"
-#include "bcos-crypto/signature/secp256k1/Secp256k1KeyPair.h"
-#include "bcos-crypto/signature/sm2/SM2Crypto.h"
-#include "bcos-crypto/signature/sm2/SM2KeyPair.h"
-#include "bcos-framework/protocol/GlobalConfig.h"
-#include "bcos-rpc/bcos-rpc/RpcFactory.h"
+#include <bcos-crypto/encrypt/AESCrypto.h>
 #include <bcos-crypto/hash/Keccak256.h>
 #include <bcos-crypto/hash/SM3.h>
 #include <bcos-crypto/signature/key/KeyFactoryImpl.h>
+#include <bcos-crypto/signature/secp256k1/Secp256k1Crypto.h>
+#include <bcos-crypto/signature/secp256k1/Secp256k1KeyPair.h>
+#include <bcos-crypto/signature/sm2/SM2Crypto.h>
+#include <bcos-crypto/signature/sm2/SM2KeyPair.h>
 #include <bcos-framework/executor/PrecompiledTypeDef.h>
+#include <bcos-framework/protocol/GlobalConfig.h>
 #include <bcos-framework/testutils/faker/FakeFrontService.h>
 #include <bcos-framework/testutils/faker/FakeLedger.h>
 #include <bcos-framework/testutils/faker/FakeScheduler.h>
 #include <bcos-framework/testutils/faker/FakeSealer.h>
 #include <bcos-framework/testutils/faker/FakeTxPool.h>
+#include <bcos-rpc/RpcFactory.h>
 #include <bcos-rpc/tarsRPC/RPCServer.h>
 #include <bcos-rpc/validator/CallValidator.h>
 #include <bcos-utilities/Exceptions.h>
diff --git a/bcos-scheduler/test/mock/MockLedger3.h b/bcos-scheduler/test/mock/MockLedger3.h
index ab89f402f3..f164ebe3ba 100644
--- a/bcos-scheduler/test/mock/MockLedger3.h
+++ b/bcos-scheduler/test/mock/MockLedger3.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include "bcos-framework/bcos-framework/ledger/LedgerConfig.h"
-#include "bcos-framework/bcos-framework/ledger/LedgerInterface.h"
-#include "bcos-framework/bcos-framework/ledger/LedgerTypeDef.h"
-#include "bcos-framework/bcos-framework/protocol/Block.h"
-#include "bcos-framework/bcos-framework/protocol/Protocol.h"
-#include "bcos-framework/bcos-framework/protocol/Transaction.h"
-#include "bcos-framework/bcos-framework/protocol/TransactionReceipt.h"
-#include "bcos-framework/bcos-framework/storage/StorageInterface.h"
 #include "bcos-framework/ledger/Features.h"
+#include "bcos-framework/ledger/LedgerConfig.h"
+#include "bcos-framework/ledger/LedgerInterface.h"
+#include "bcos-framework/ledger/LedgerTypeDef.h"
+#include "bcos-framework/protocol/Block.h"
+#include "bcos-framework/protocol/Protocol.h"
+#include "bcos-framework/protocol/Transaction.h"
+#include "bcos-framework/protocol/TransactionReceipt.h"
+#include "bcos-framework/storage/StorageInterface.h"
 #include "bcos-ledger/src/libledger/utilities/Common.h"
 #include <bcos-crypto/interfaces/crypto/CommonType.h>
 #include <bcos-utilities/Error.h>
diff --git a/bcos-scheduler/test/mock/MockTxPool1.h b/bcos-scheduler/test/mock/MockTxPool1.h
index addaec3827..76047b7cbd 100644
--- a/bcos-scheduler/test/mock/MockTxPool1.h
+++ b/bcos-scheduler/test/mock/MockTxPool1.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "bcos-framework/bcos-framework/testutils/faker/FakeBlockHeader.h"
-#include "bcos-framework/bcos-framework/testutils/faker/FakeTransaction.h"
+#include "bcos-framework/testutils/faker/FakeBlockHeader.h"
+#include "bcos-framework/testutils/faker/FakeTransaction.h"
 #include "bcos-scheduler/src/Common.h"
 #include <bcos-crypto/hash/Keccak256.h>
 #include <bcos-crypto/hash/SM3.h>
diff --git a/bcos-storage/bcos-storage/RocksDBStorage.h b/bcos-storage/bcos-storage/RocksDBStorage.h
index 82e908ba22..6d8dc5be99 100644
--- a/bcos-storage/bcos-storage/RocksDBStorage.h
+++ b/bcos-storage/bcos-storage/RocksDBStorage.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <bcos-framework/storage/StorageInterface.h>
-#include <bcos-security/bcos-security/DataEncryption.h>
+#include <bcos-security/DataEncryption.h>
 #include <rocksdb/db.h>
 #include <tbb/parallel_for.h>
 
diff --git a/bcos-tool/bcos-tool/TreeTopology.h b/bcos-tool/bcos-tool/TreeTopology.h
index 9c83433438..ff46c3ccbe 100644
--- a/bcos-tool/bcos-tool/TreeTopology.h
+++ b/bcos-tool/bcos-tool/TreeTopology.h
@@ -20,7 +20,7 @@
  */
 #pragma once
 
-#include "bcos-crypto/bcos-crypto/KeyCompareTools.h"
+#include "bcos-crypto/KeyCompareTools.h"
 #include <bcos-crypto/interfaces/crypto/KeyFactory.h>
 
 #define TREE_LOG(LEVEL)                                                      \
diff --git a/bcos-txpool/bcos-txpool/txpool/storage/MemoryStorage.h b/bcos-txpool/bcos-txpool/txpool/storage/MemoryStorage.h
index edd1794807..01568cd08e 100644
--- a/bcos-txpool/bcos-txpool/txpool/storage/MemoryStorage.h
+++ b/bcos-txpool/bcos-txpool/txpool/storage/MemoryStorage.h
@@ -23,7 +23,7 @@
 #include "bcos-task/Task.h"
 #include "bcos-txpool/TxPoolConfig.h"
 #include "bcos-txpool/txpool/utilities/Common.h"
-#include <bcos-txpool/bcos-txpool/txpool/utilities/TransactionBucket.h>
+#include <bcos-txpool/txpool/utilities/TransactionBucket.h>
 #include <bcos-utilities/BucketMap.h>
 #include <bcos-utilities/FixedBytes.h>
 #include <bcos-utilities/RateCollector.h>
diff --git a/bcos-txpool/bcos-txpool/txpool/utilities/TransactionBucket.h b/bcos-txpool/bcos-txpool/txpool/utilities/TransactionBucket.h
index 84d64f78ba..be55b0ac44 100644
--- a/bcos-txpool/bcos-txpool/txpool/utilities/TransactionBucket.h
+++ b/bcos-txpool/bcos-txpool/txpool/utilities/TransactionBucket.h
@@ -1,7 +1,7 @@
-#include "bcos-crypto/bcos-crypto/interfaces/crypto/CommonType.h"
-#include "bcos-framework/bcos-framework/protocol/Transaction.h"
-#include "bcos-utilities/bcos-utilities/BucketMap.h"
-#include "bcos-utilities/bcos-utilities/FixedBytes.h"
+#include "bcos-crypto/interfaces/crypto/CommonType.h"
+#include "bcos-framework/protocol/Transaction.h"
+#include "bcos-utilities/BucketMap.h"
+#include "bcos-utilities/FixedBytes.h"
 #include "boost/multi_index/hashed_index.hpp"
 #include "boost/multi_index/mem_fun.hpp"
 #include "boost/multi_index/member.hpp"
diff --git a/bcos-txpool/test/unittests/txpool/TxPoolFixture.h b/bcos-txpool/test/unittests/txpool/TxPoolFixture.h
index b6e0b1d6f5..b70c0790c8 100644
--- a/bcos-txpool/test/unittests/txpool/TxPoolFixture.h
+++ b/bcos-txpool/test/unittests/txpool/TxPoolFixture.h
@@ -19,17 +19,10 @@
  * @date 2021-05-25
  */
 #pragma once
-#include "bcos-framework/bcos-framework/testutils/faker/FakeBlock.h"
-#include "bcos-framework/bcos-framework/testutils/faker/FakeBlockHeader.h"
-#include "bcos-framework/protocol/GlobalConfig.h"
-
-#include "bcos-tool/TreeTopology.h"
-#include "bcos-txpool/TxPoolConfig.h"
-#include "bcos-txpool/TxPoolFactory.h"
-#include "bcos-txpool/sync/TransactionSync.h"
-#include "bcos-txpool/txpool/storage/MemoryStorage.h"
-#include "bcos-txpool/txpool/validator/TxValidator.h"
 #include <bcos-framework/consensus/ConsensusNode.h>
+#include <bcos-framework/protocol/GlobalConfig.h>
+#include <bcos-framework/testutils/faker/FakeBlock.h>
+#include <bcos-framework/testutils/faker/FakeBlockHeader.h>
 #include <bcos-framework/testutils/faker/FakeFrontService.h>
 #include <bcos-framework/testutils/faker/FakeLedger.h>
 #include <bcos-framework/testutils/faker/FakeSealer.h>
@@ -39,6 +32,12 @@
 #include <bcos-tars-protocol/protocol/TransactionFactoryImpl.h>
 #include <bcos-tars-protocol/protocol/TransactionReceiptFactoryImpl.h>
 #include <bcos-task/Wait.h>
+#include <bcos-tool/TreeTopology.h>
+#include <bcos-txpool/TxPoolConfig.h>
+#include <bcos-txpool/TxPoolFactory.h>
+#include <bcos-txpool/sync/TransactionSync.h>
+#include <bcos-txpool/txpool/storage/MemoryStorage.h>
+#include <bcos-txpool/txpool/validator/TxValidator.h>
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/test/unit_test.hpp>
 #include <chrono>
diff --git a/cmake/IncludeDirectories.cmake b/cmake/IncludeDirectories.cmake
index 2dc166f78c..bc9b08b43d 100644
--- a/cmake/IncludeDirectories.cmake
+++ b/cmake/IncludeDirectories.cmake
@@ -2,11 +2,16 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 # include_directories(${CMAKE_CURRENT_BINARY_DIR})
 # include_directories(${CMAKE_CURRENT_BINARY_DIR}/bcos-protocol)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-protocol)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/bcos-txpool)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-utilities)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-framework)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-txpool)
+if (NOT ONLY_CPP_SDK)
+    include_directories(${CMAKE_CURRENT_BINARY_DIR}/bcos-txpool)
+endif ()
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-front)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-sealer)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-pbft)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-rpbft)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-sync)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-gateway)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bcos-rpc)
diff --git a/libinitializer/LedgerInitializer.h b/libinitializer/LedgerInitializer.h
index cf33ba1274..10bffe1f8b 100644
--- a/libinitializer/LedgerInitializer.h
+++ b/libinitializer/LedgerInitializer.h
@@ -25,7 +25,7 @@
 #include <bcos-framework/protocol/BlockFactory.h>
 #include <bcos-framework/storage/StorageInterface.h>
 #include <bcos-ledger/src/libledger/LedgerImpl.h>
-#include <bcos-storage/bcos-storage/StorageWrapperImpl.h>
+#include <bcos-storage/StorageWrapperImpl.h>
 #include <bcos-tool/NodeConfig.h>
 
 namespace bcos::initializer
diff --git a/libinitializer/StorageInitializer.h b/libinitializer/StorageInitializer.h
index 73cd5d32e9..99ae13a43b 100644
--- a/libinitializer/StorageInitializer.h
+++ b/libinitializer/StorageInitializer.h
@@ -23,8 +23,8 @@
  * @date 2021-10-14
  */
 #pragma once
-#include "bcos-storage/bcos-storage/RocksDBStorage.h"
-#include "bcos-storage/bcos-storage/TiKVStorage.h"
+#include "bcos-storage/RocksDBStorage.h"
+#include "bcos-storage/TiKVStorage.h"
 #include "boost/filesystem.hpp"
 #include "rocksdb/convenience.h"
 #include "rocksdb/filter_policy.h"
@@ -79,14 +79,14 @@ class StorageInitializer
             options.statistics = rocksdb::CreateDBStatistics();
         }
         // block cache 128MB
-        std::shared_ptr<rocksdb::Cache> cache =
-            rocksdb::NewLRUCache(rocksDBOption.blockCacheSize);
+        std::shared_ptr<rocksdb::Cache> cache = rocksdb::NewLRUCache(rocksDBOption.blockCacheSize);
         rocksdb::BlockBasedTableOptions table_options;
         table_options.block_cache = cache;
         // use bloom filter to optimize point lookup, i.e. get
         table_options.filter_policy.reset(rocksdb::NewBloomFilterPolicy(10, false));
         table_options.optimize_filters_for_memory = true;
-        // table_options.cache_index_and_filter_blocks = true; // this will increase memory and lower performance
+        // table_options.cache_index_and_filter_blocks = true; // this will increase memory and
+        // lower performance
         options.table_factory.reset(rocksdb::NewBlockBasedTableFactory(table_options));
 
         if (boost::filesystem::space(_path).available < 1 << 30)
diff --git a/tests/unittest/ConsensusNodeTest.cpp b/tests/unittest/ConsensusNodeTest.cpp
index 035c3f8c5e..be65566e3e 100644
--- a/tests/unittest/ConsensusNodeTest.cpp
+++ b/tests/unittest/ConsensusNodeTest.cpp
@@ -136,7 +136,8 @@ BOOST_AUTO_TEST_CASE(test_moduleIDToString)
     BOOST_CHECK("amop" == protocol::moduleIDToString(protocol::ModuleID::AMOP));
     BOOST_CHECK("block_sync" == protocol::moduleIDToString(protocol::ModuleID::BlockSync));
     BOOST_CHECK("txs_sync" == protocol::moduleIDToString(protocol::ModuleID::TxsSync));
-    BOOST_CHECK("light_node" == protocol::moduleIDToString(protocol::ModuleID::LIGHTNODE_GET_BLOCK));
+    BOOST_CHECK(
+        "light_node" == protocol::moduleIDToString(protocol::ModuleID::LIGHTNODE_GET_BLOCK));
     BOOST_CHECK("cons_txs_sync" == protocol::moduleIDToString(protocol::ModuleID::ConsTxsSync));
 }
 
diff --git a/tools/archive-tool/ArchiveService.h b/tools/archive-tool/ArchiveService.h
index 44f399f5e0..7abdd5bb5f 100644
--- a/tools/archive-tool/ArchiveService.h
+++ b/tools/archive-tool/ArchiveService.h
@@ -19,14 +19,13 @@
  * @date 2022-11-09
  */
 #pragma once
-#include "bcos-boostssl/bcos-boostssl/httpserver/HttpServer.h"
-#include "bcos-boostssl/bcos-boostssl/httpserver/HttpStream.h"
-#include "bcos-framework/bcos-framework/protocol/Transaction.h"
-#include "bcos-framework/bcos-framework/protocol/TransactionReceipt.h"
+#include "bcos-boostssl/httpserver/HttpServer.h"
+#include "bcos-boostssl/httpserver/HttpStream.h"
 #include "bcos-framework/protocol/Transaction.h"
+#include "bcos-framework/protocol/TransactionReceipt.h"
 #include "bcos-ledger/src/libledger/Ledger.h"
-#include "bcos-rpc/bcos-rpc/jsonrpc/Common.h"
-#include "bcos-rpc/bcos-rpc/jsonrpc/JsonRpcInterface.h"
+#include "bcos-rpc/jsonrpc/Common.h"
+#include "bcos-rpc/jsonrpc/JsonRpcInterface.h"
 #include <bcos-framework/storage/StorageInterface.h>
 #include <bcos-utilities/Error.h>
 #include <json/json.h>