diff --git a/clang/lib/DPCT/AnalysisInfo.cpp b/clang/lib/DPCT/AnalysisInfo.cpp
index 25fc08edd13d..fd77cacb9d14 100644
--- a/clang/lib/DPCT/AnalysisInfo.cpp
+++ b/clang/lib/DPCT/AnalysisInfo.cpp
@@ -2544,7 +2544,8 @@ std::vector<std::pair<std::string, std::vector<std::string>>>
 std::unordered_set<std::string> DpctGlobalInfo::NeedParenAPISet = {};
 std::unordered_set<std::string>
     DpctGlobalInfo::CustomHelperFunctionAddtionalIncludes = {};
-std::unordered_map<clang::tooling::UnifiedPath, std::bitset<32>>
+std::unordered_map<clang::tooling::UnifiedPath,
+                   std::bitset<HeaderType::NUM_HEADERS>>
     DpctGlobalInfo::HeaderInsertedBitMap = {};
 ///// class DpctNameGenerator /////
 void DpctNameGenerator::printName(const FunctionDecl *FD,
diff --git a/clang/lib/DPCT/AnalysisInfo.h b/clang/lib/DPCT/AnalysisInfo.h
index ff5dd1401d55..4eedfb910a25 100644
--- a/clang/lib/DPCT/AnalysisInfo.h
+++ b/clang/lib/DPCT/AnalysisInfo.h
@@ -1393,7 +1393,8 @@ class DpctGlobalInfo {
   getCustomHelperFunctionAddtionalIncludes() {
     return CustomHelperFunctionAddtionalIncludes;
   }
-  static std::unordered_map<clang::tooling::UnifiedPath, std::bitset<32>> &
+  static std::unordered_map<clang::tooling::UnifiedPath,
+                            std::bitset<HeaderType::NUM_HEADERS>> &
   getHeaderInsertedBitMap() {
     return HeaderInsertedBitMap;
   }
@@ -1722,7 +1723,8 @@ class DpctGlobalInfo {
       CodePinDumpFuncDepsVec;
   static std::unordered_set<std::string> NeedParenAPISet;
   static std::unordered_set<std::string> CustomHelperFunctionAddtionalIncludes;
-  static std::unordered_map<clang::tooling::UnifiedPath, std::bitset<32>>
+  static std::unordered_map<clang::tooling::UnifiedPath,
+                            std::bitset<HeaderType::NUM_HEADERS>>
       HeaderInsertedBitMap;
 };