diff --git a/AnnService/inc/Aggregator/AggregatorExecutionContext.h b/AnnService/inc/Aggregator/AggregatorExecutionContext.h
index 12948a21..b4067235 100644
--- a/AnnService/inc/Aggregator/AggregatorExecutionContext.h
+++ b/AnnService/inc/Aggregator/AggregatorExecutionContext.h
@@ -9,6 +9,7 @@
 
 #include <memory>
 #include <atomic>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Aggregator/AggregatorSettings.h b/AnnService/inc/Aggregator/AggregatorSettings.h
index 667c07b1..f9ae7992 100644
--- a/AnnService/inc/Aggregator/AggregatorSettings.h
+++ b/AnnService/inc/Aggregator/AggregatorSettings.h
@@ -7,6 +7,7 @@
 #include "../Core/Common.h"
 
 #include <string>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Client/ClientWrapper.h b/AnnService/inc/Client/ClientWrapper.h
index d96a6706..130f5b7c 100644
--- a/AnnService/inc/Client/ClientWrapper.h
+++ b/AnnService/inc/Client/ClientWrapper.h
@@ -17,6 +17,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <functional>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Client/Options.h b/AnnService/inc/Client/Options.h
index 062061f0..c570a30d 100644
--- a/AnnService/inc/Client/Options.h
+++ b/AnnService/inc/Client/Options.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 #include <memory>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Core/BKT/Index.h b/AnnService/inc/Core/BKT/Index.h
index d0d9dc78..6ffd64ff 100644
--- a/AnnService/inc/Core/BKT/Index.h
+++ b/AnnService/inc/Core/BKT/Index.h
@@ -23,6 +23,7 @@
 
 #include <functional>
 #include <shared_mutex>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Core/Common/BKTree.h b/AnnService/inc/Core/Common/BKTree.h
index 0c043749..601e3749 100644
--- a/AnnService/inc/Core/Common/BKTree.h
+++ b/AnnService/inc/Core/Common/BKTree.h
@@ -9,6 +9,7 @@
 #include <vector>
 #include <mutex>
 #include <shared_mutex>
+#include <cstdint>
 
 #include "inc/Core/VectorIndex.h"
 
diff --git a/AnnService/inc/Core/Common/Dataset.h b/AnnService/inc/Core/Common/Dataset.h
index a2183cf8..0ee6d6b7 100644
--- a/AnnService/inc/Core/Common/Dataset.h
+++ b/AnnService/inc/Core/Common/Dataset.h
@@ -7,6 +7,7 @@
 #include "inc/Helper/Logging.h"
 #include <stdexcept>
 #include <sstream>
+#include <cstdint>
 
 namespace SPTAG
 {
@@ -237,4 +238,4 @@ namespace SPTAG
     }
 }
 
-#endif // _SPTAG_COMMON_DATASET_H_
\ No newline at end of file
+#endif // _SPTAG_COMMON_DATASET_H_
diff --git a/AnnService/inc/Core/Common/DistanceUtils.h b/AnnService/inc/Core/Common/DistanceUtils.h
index 48456113..43a001e2 100644
--- a/AnnService/inc/Core/Common/DistanceUtils.h
+++ b/AnnService/inc/Core/Common/DistanceUtils.h
@@ -6,6 +6,7 @@
 
 #include <functional>
 #include <iostream>
+#include <cstdint>
 
 #include "CommonUtils.h"
 #include "InstructionUtils.h"
diff --git a/AnnService/inc/Core/Common/KDTree.h b/AnnService/inc/Core/Common/KDTree.h
index f5ea1758..0665ea03 100644
--- a/AnnService/inc/Core/Common/KDTree.h
+++ b/AnnService/inc/Core/Common/KDTree.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <mutex>
 #include <shared_mutex>
+#include <cstdint>
 
 #include "inc/Core/VectorIndex.h"
 
diff --git a/AnnService/inc/Core/Common/Labelset.h b/AnnService/inc/Core/Common/Labelset.h
index 74014640..3f8351c5 100644
--- a/AnnService/inc/Core/Common/Labelset.h
+++ b/AnnService/inc/Core/Common/Labelset.h
@@ -5,6 +5,8 @@
 #define _SPTAG_COMMON_LABELSET_H_
 
 #include <atomic>
+#include <cstdint>
+
 #include "Dataset.h"
 
 namespace SPTAG
diff --git a/AnnService/inc/Core/Common/NeighborhoodGraph.h b/AnnService/inc/Core/Common/NeighborhoodGraph.h
index 8b37de65..23edc37f 100644
--- a/AnnService/inc/Core/Common/NeighborhoodGraph.h
+++ b/AnnService/inc/Core/Common/NeighborhoodGraph.h
@@ -14,6 +14,7 @@
 #include <chrono>
 #include <queue>
 #include <atomic>
+#include <cstdint>
 
 #if defined(GPU)
 #include <cuda.h>
diff --git a/AnnService/inc/Core/Common/OPQQuantizer.h b/AnnService/inc/Core/Common/OPQQuantizer.h
index 250a29f7..0acdd7e1 100644
--- a/AnnService/inc/Core/Common/OPQQuantizer.h
+++ b/AnnService/inc/Core/Common/OPQQuantizer.h
@@ -5,6 +5,8 @@
 
 #include "PQQuantizer.h"
 
+#include <cstdint>
+
 #if (__cplusplus < 201703L)
 #define ISNOTSAME(A, B) if (!std::is_same<A, B>::value)
 #else
diff --git a/AnnService/inc/Core/Common/PQQuantizer.h b/AnnService/inc/Core/Common/PQQuantizer.h
index 5bece022..1477f235 100644
--- a/AnnService/inc/Core/Common/PQQuantizer.h
+++ b/AnnService/inc/Core/Common/PQQuantizer.h
@@ -13,6 +13,7 @@
 #include <memory>
 #include <cassert>
 #include <cstring>
+#include <cstdint>
 
 
 namespace SPTAG
diff --git a/AnnService/inc/Core/Common/SIMDUtils.h b/AnnService/inc/Core/Common/SIMDUtils.h
index 72af65fb..ee0711b4 100644
--- a/AnnService/inc/Core/Common/SIMDUtils.h
+++ b/AnnService/inc/Core/Common/SIMDUtils.h
@@ -6,6 +6,7 @@
 
 #include <functional>
 #include <iostream>
+#include <cstdint>
 
 #include "CommonUtils.h"
 #include "InstructionUtils.h"
diff --git a/AnnService/inc/Core/CommonDataStructure.h b/AnnService/inc/Core/CommonDataStructure.h
index c158fc88..f89acac6 100644
--- a/AnnService/inc/Core/CommonDataStructure.h
+++ b/AnnService/inc/Core/CommonDataStructure.h
@@ -6,6 +6,8 @@
 
 #include "inc/Core/Common.h"
 
+#include <cstdint>
+
 namespace SPTAG
 {
 
diff --git a/AnnService/inc/Core/DefinitionList.h b/AnnService/inc/Core/DefinitionList.h
index ad561277..9a810555 100644
--- a/AnnService/inc/Core/DefinitionList.h
+++ b/AnnService/inc/Core/DefinitionList.h
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+#include <cstdint>
+
 #ifdef DefineVectorValueType
 
 DefineVectorValueType(Int8, std::int8_t)
@@ -139,4 +141,4 @@ DefineNumaStrategy(SCATTER)
 DefineOrderStrategy(ASC)
 DefineOrderStrategy(DESC)
 
-#endif // DefineOrderStrategy
\ No newline at end of file
+#endif // DefineOrderStrategy
diff --git a/AnnService/inc/Core/KDT/Index.h b/AnnService/inc/Core/KDT/Index.h
index 3456458b..68205dac 100644
--- a/AnnService/inc/Core/KDT/Index.h
+++ b/AnnService/inc/Core/KDT/Index.h
@@ -23,6 +23,7 @@
 
 #include <functional>
 #include <shared_mutex>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Core/MetadataSet.h b/AnnService/inc/Core/MetadataSet.h
index 0e67b9c2..2ef3140f 100644
--- a/AnnService/inc/Core/MetadataSet.h
+++ b/AnnService/inc/Core/MetadataSet.h
@@ -6,6 +6,8 @@
 
 #include "CommonDataStructure.h"
 
+#include <cstdint>
+
 namespace SPTAG
 {
 
diff --git a/AnnService/inc/Core/SPANN/ExtraFullGraphSearcher.h b/AnnService/inc/Core/SPANN/ExtraFullGraphSearcher.h
index cee1019c..ba9847e7 100644
--- a/AnnService/inc/Core/SPANN/ExtraFullGraphSearcher.h
+++ b/AnnService/inc/Core/SPANN/ExtraFullGraphSearcher.h
@@ -15,6 +15,7 @@
 #include <climits>
 #include <future>
 #include <numeric>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Core/SPANN/IExtraSearcher.h b/AnnService/inc/Core/SPANN/IExtraSearcher.h
index 274e30b2..5a6efc37 100644
--- a/AnnService/inc/Core/SPANN/IExtraSearcher.h
+++ b/AnnService/inc/Core/SPANN/IExtraSearcher.h
@@ -13,6 +13,7 @@
 #include <vector>
 #include <chrono>
 #include <atomic>
+#include <cstdint>
 
 namespace SPTAG {
     namespace SPANN {
@@ -210,4 +211,4 @@ namespace SPTAG {
     } // SPANN
 } // SPTAG
 
-#endif // _SPTAG_SPANN_IEXTRASEARCHER_H_
\ No newline at end of file
+#endif // _SPTAG_SPANN_IEXTRASEARCHER_H_
diff --git a/AnnService/inc/Core/SPANN/Index.h b/AnnService/inc/Core/SPANN/Index.h
index c0955e2d..75b64f53 100644
--- a/AnnService/inc/Core/SPANN/Index.h
+++ b/AnnService/inc/Core/SPANN/Index.h
@@ -27,6 +27,7 @@
 
 #include <functional>
 #include <shared_mutex>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Core/SearchQuery.h b/AnnService/inc/Core/SearchQuery.h
index ede8056b..2d7a52ce 100644
--- a/AnnService/inc/Core/SearchQuery.h
+++ b/AnnService/inc/Core/SearchQuery.h
@@ -7,6 +7,7 @@
 #include "SearchResult.h"
 
 #include <cstring>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Core/VectorIndex.h b/AnnService/inc/Core/VectorIndex.h
index d2702bbe..5e30b633 100644
--- a/AnnService/inc/Core/VectorIndex.h
+++ b/AnnService/inc/Core/VectorIndex.h
@@ -10,6 +10,7 @@
 #include "MetadataSet.h"
 #include "inc/Helper/SimpleIniReader.h"
 #include <unordered_set>
+#include <cstdint>
 #include "inc/Core/Common/IQuantizer.h"
 #include "inc/Core/Common/WorkSpace.h"
 
diff --git a/AnnService/inc/Helper/Concurrent.h b/AnnService/inc/Helper/Concurrent.h
index 35c7cc93..8b286b1c 100644
--- a/AnnService/inc/Helper/Concurrent.h
+++ b/AnnService/inc/Helper/Concurrent.h
@@ -8,6 +8,7 @@
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
+#include <cstdint>
 
 
 namespace SPTAG
diff --git a/AnnService/inc/Helper/DiskIO.h b/AnnService/inc/Helper/DiskIO.h
index eb3de16c..79af7f7d 100644
--- a/AnnService/inc/Helper/DiskIO.h
+++ b/AnnService/inc/Helper/DiskIO.h
@@ -8,6 +8,7 @@
 #include <fstream>
 #include <string.h>
 #include <memory>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Helper/StringConvert.h b/AnnService/inc/Helper/StringConvert.h
index 2024bb00..3722edf0 100644
--- a/AnnService/inc/Helper/StringConvert.h
+++ b/AnnService/inc/Helper/StringConvert.h
@@ -13,6 +13,7 @@
 #include <cctype>
 #include <limits>
 #include <cerrno>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Helper/VectorSetReader.h b/AnnService/inc/Helper/VectorSetReader.h
index ea68419d..63004b32 100644
--- a/AnnService/inc/Helper/VectorSetReader.h
+++ b/AnnService/inc/Helper/VectorSetReader.h
@@ -10,6 +10,7 @@
 #include "inc/Helper/ArgumentsParser.h"
 
 #include <memory>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Helper/VectorSetReaders/MemoryReader.h b/AnnService/inc/Helper/VectorSetReaders/MemoryReader.h
index 1a5f84a9..13ede1c1 100644
--- a/AnnService/inc/Helper/VectorSetReaders/MemoryReader.h
+++ b/AnnService/inc/Helper/VectorSetReaders/MemoryReader.h
@@ -6,6 +6,8 @@
 
 #include "inc/Helper/VectorSetReader.h"
 
+#include <cstdint>
+
 namespace SPTAG
 {
     namespace Helper
diff --git a/AnnService/inc/Helper/VectorSetReaders/TxtReader.h b/AnnService/inc/Helper/VectorSetReaders/TxtReader.h
index 9fcb726d..570807bd 100644
--- a/AnnService/inc/Helper/VectorSetReaders/TxtReader.h
+++ b/AnnService/inc/Helper/VectorSetReaders/TxtReader.h
@@ -10,6 +10,7 @@
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Server/SearchService.h b/AnnService/inc/Server/SearchService.h
index 34d0c606..91572f85 100644
--- a/AnnService/inc/Server/SearchService.h
+++ b/AnnService/inc/Server/SearchService.h
@@ -13,6 +13,7 @@
 #include <vector>
 #include <thread>
 #include <condition_variable>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Socket/Client.h b/AnnService/inc/Socket/Client.h
index a57465df..f554f8c1 100644
--- a/AnnService/inc/Socket/Client.h
+++ b/AnnService/inc/Socket/Client.h
@@ -13,6 +13,7 @@
 #include <memory>
 #include <atomic>
 #include <boost/asio.hpp>
+#include <cstdint>
 
 namespace SPTAG
 {
diff --git a/AnnService/inc/Socket/ResourceManager.h b/AnnService/inc/Socket/ResourceManager.h
index 404cac83..d52781f3 100644
--- a/AnnService/inc/Socket/ResourceManager.h
+++ b/AnnService/inc/Socket/ResourceManager.h
@@ -16,6 +16,7 @@
 #include <deque>
 #include <unordered_map>
 #include <thread>
+#include <cstdint>
 
 namespace std
 {
diff --git a/AnnService/src/Aggregator/AggregatorContext.cpp b/AnnService/src/Aggregator/AggregatorContext.cpp
index 7d523670..104facb5 100644
--- a/AnnService/src/Aggregator/AggregatorContext.cpp
+++ b/AnnService/src/Aggregator/AggregatorContext.cpp
@@ -5,6 +5,7 @@
 #include "inc/Helper/SimpleIniReader.h"
 
 #include <fstream>
+#include <cstdint>
 
 using namespace SPTAG;
 using namespace SPTAG::Aggregator;
@@ -114,4 +115,4 @@ const std::shared_ptr<VectorSet>&
 AggregatorContext::GetCenters() const
 {
     return m_centers;
-}
\ No newline at end of file
+}
diff --git a/AnnService/src/Aggregator/AggregatorExecutionContext.cpp b/AnnService/src/Aggregator/AggregatorExecutionContext.cpp
index 8f7a2837..8e1569c9 100644
--- a/AnnService/src/Aggregator/AggregatorExecutionContext.cpp
+++ b/AnnService/src/Aggregator/AggregatorExecutionContext.cpp
@@ -3,6 +3,8 @@
 
 #include "inc/Aggregator/AggregatorExecutionContext.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Aggregator;
 
diff --git a/AnnService/src/Aggregator/AggregatorService.cpp b/AnnService/src/Aggregator/AggregatorService.cpp
index a2b17a4f..75d02b7a 100644
--- a/AnnService/src/Aggregator/AggregatorService.cpp
+++ b/AnnService/src/Aggregator/AggregatorService.cpp
@@ -6,6 +6,8 @@
 #include "inc/Core/Common/DistanceUtils.h"
 #include "inc/Helper/Base64Encode.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Aggregator;
 
diff --git a/AnnService/src/BalancedDataPartition/main.cpp b/AnnService/src/BalancedDataPartition/main.cpp
index 0f0cdb90..29db4482 100644
--- a/AnnService/src/BalancedDataPartition/main.cpp
+++ b/AnnService/src/BalancedDataPartition/main.cpp
@@ -5,6 +5,8 @@
 #include <thread>
 #include <cstdlib>
 #include <algorithm>
+#include <cstdint>
+
 #include "inc/Core/Common/DistanceUtils.h"
 #include "inc/Core/Common/Dataset.h"
 #include "inc/Core/Common/BKTree.h"
diff --git a/AnnService/src/Client/ClientWrapper.cpp b/AnnService/src/Client/ClientWrapper.cpp
index b64beac7..e7da8350 100644
--- a/AnnService/src/Client/ClientWrapper.cpp
+++ b/AnnService/src/Client/ClientWrapper.cpp
@@ -5,6 +5,8 @@
 
 #include "inc/Client/ClientWrapper.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Socket;
 using namespace SPTAG::Client;
diff --git a/AnnService/src/Client/main.cpp b/AnnService/src/Client/main.cpp
index 0e67b52f..2215247d 100644
--- a/AnnService/src/Client/main.cpp
+++ b/AnnService/src/Client/main.cpp
@@ -7,6 +7,7 @@
 #include <cstdio>
 #include <atomic>
 #include <iostream>
+#include <cstdint>
 
 using namespace SPTAG;
 
diff --git a/AnnService/src/Core/BKT/BKTIndex.cpp b/AnnService/src/Core/BKT/BKTIndex.cpp
index fae2b503..4264d6c6 100644
--- a/AnnService/src/Core/BKT/BKTIndex.cpp
+++ b/AnnService/src/Core/BKT/BKTIndex.cpp
@@ -4,6 +4,7 @@
 #include "inc/Core/BKT/Index.h"
 #include <chrono>
 #include <mutex>
+#include <cstdint>
 
 #pragma warning(disable:4242)  // '=' : conversion from 'int' to 'short', possible loss of data
 #pragma warning(disable:4244)  // '=' : conversion from 'int' to 'short', possible loss of data
diff --git a/AnnService/src/Core/Common/DistanceUtils.cpp b/AnnService/src/Core/Common/DistanceUtils.cpp
index e7b1c92c..5b20b0c5 100644
--- a/AnnService/src/Core/Common/DistanceUtils.cpp
+++ b/AnnService/src/Core/Common/DistanceUtils.cpp
@@ -3,6 +3,8 @@
 
 #include "inc/Core/Common/DistanceUtils.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::COMMON;
 
diff --git a/AnnService/src/Core/Common/IQuantizer.cpp b/AnnService/src/Core/Common/IQuantizer.cpp
index ea6cf391..cca8078f 100644
--- a/AnnService/src/Core/Common/IQuantizer.cpp
+++ b/AnnService/src/Core/Common/IQuantizer.cpp
@@ -3,6 +3,8 @@
 #include <inc/Core/Common/OPQQuantizer.h>
 #include <inc/Helper/StringConvert.h>
 
+#include <cstdint>
+
 namespace SPTAG
 {
     namespace COMMON
diff --git a/AnnService/src/Core/Common/SIMDUtils.cpp b/AnnService/src/Core/Common/SIMDUtils.cpp
index 163b0441..6395f9c7 100644
--- a/AnnService/src/Core/Common/SIMDUtils.cpp
+++ b/AnnService/src/Core/Common/SIMDUtils.cpp
@@ -3,6 +3,8 @@
 
 #include "inc/Core/Common/SIMDUtils.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::COMMON;
 
diff --git a/AnnService/src/Core/KDT/KDTIndex.cpp b/AnnService/src/Core/KDT/KDTIndex.cpp
index e83cf5d2..fe165d52 100644
--- a/AnnService/src/Core/KDT/KDTIndex.cpp
+++ b/AnnService/src/Core/KDT/KDTIndex.cpp
@@ -4,6 +4,7 @@
 #include "inc/Core/KDT/Index.h"
 #include <chrono>
 #include <mutex>
+#include <cstdint>
 
 #pragma warning(disable:4242)  // '=' : conversion from 'int' to 'short', possible loss of data
 #pragma warning(disable:4244)  // '=' : conversion from 'int' to 'short', possible loss of data
diff --git a/AnnService/src/Core/MetadataSet.cpp b/AnnService/src/Core/MetadataSet.cpp
index 8353dc18..ad59779f 100644
--- a/AnnService/src/Core/MetadataSet.cpp
+++ b/AnnService/src/Core/MetadataSet.cpp
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <mutex>
 #include <shared_mutex>
+#include <cstdint>
 
 using namespace SPTAG;
 
diff --git a/AnnService/src/Core/SPANN/SPANNIndex.cpp b/AnnService/src/Core/SPANN/SPANNIndex.cpp
index ee329130..29d6ffd2 100644
--- a/AnnService/src/Core/SPANN/SPANNIndex.cpp
+++ b/AnnService/src/Core/SPANN/SPANNIndex.cpp
@@ -5,6 +5,7 @@
 #include "inc/Helper/VectorSetReaders/MemoryReader.h"
 #include "inc/Core/SPANN/ExtraFullGraphSearcher.h"
 #include <chrono>
+#include <cstdint>
 
 #pragma warning(disable:4242)  // '=' : conversion from 'int' to 'short', possible loss of data
 #pragma warning(disable:4244)  // '=' : conversion from 'int' to 'short', possible loss of data
diff --git a/AnnService/src/Core/VectorIndex.cpp b/AnnService/src/Core/VectorIndex.cpp
index 5c26429e..85c43621 100644
--- a/AnnService/src/Core/VectorIndex.cpp
+++ b/AnnService/src/Core/VectorIndex.cpp
@@ -11,6 +11,8 @@
 #include "inc/Core/KDT/Index.h"
 #include "inc/Core/SPANN/Index.h"
 
+#include <cstdint>
+
 typedef typename SPTAG::Helper::Concurrent::ConcurrentMap<std::string, SPTAG::SizeType> MetadataMap;
 
 using namespace SPTAG;
diff --git a/AnnService/src/Helper/AsyncFileReader.cpp b/AnnService/src/Helper/AsyncFileReader.cpp
index 5313c9cc..8052ceec 100644
--- a/AnnService/src/Helper/AsyncFileReader.cpp
+++ b/AnnService/src/Helper/AsyncFileReader.cpp
@@ -3,6 +3,8 @@
 
 #include "inc/Helper/AsyncFileReader.h"
 
+#include <cstdint>
+
 namespace SPTAG {
     namespace Helper {
 #ifndef _MSC_VER
diff --git a/AnnService/src/Helper/Base64Encode.cpp b/AnnService/src/Helper/Base64Encode.cpp
index 5992fa5a..97be500c 100644
--- a/AnnService/src/Helper/Base64Encode.cpp
+++ b/AnnService/src/Helper/Base64Encode.cpp
@@ -3,6 +3,8 @@
 
 #include "inc/Helper/Base64Encode.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Helper;
 
diff --git a/AnnService/src/Helper/Concurrent.cpp b/AnnService/src/Helper/Concurrent.cpp
index fd841b16..1076a299 100644
--- a/AnnService/src/Helper/Concurrent.cpp
+++ b/AnnService/src/Helper/Concurrent.cpp
@@ -5,6 +5,8 @@
 
 #include "inc/Helper/Concurrent.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Helper::Concurrent;
 
diff --git a/AnnService/src/Helper/SimpleIniReader.cpp b/AnnService/src/Helper/SimpleIniReader.cpp
index cbc2eb55..2d3f26e5 100644
--- a/AnnService/src/Helper/SimpleIniReader.cpp
+++ b/AnnService/src/Helper/SimpleIniReader.cpp
@@ -6,6 +6,7 @@
 
 #include <cctype>
 #include <functional>
+#include <cstdint>
 
 using namespace SPTAG;
 using namespace SPTAG::Helper;
diff --git a/AnnService/src/Helper/VectorSetReader.cpp b/AnnService/src/Helper/VectorSetReader.cpp
index 08c763f9..59a153c9 100644
--- a/AnnService/src/Helper/VectorSetReader.cpp
+++ b/AnnService/src/Helper/VectorSetReader.cpp
@@ -6,6 +6,8 @@
 #include "inc/Helper/VectorSetReaders/TxtReader.h"
 #include "inc/Helper/VectorSetReaders/XvecReader.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Helper;
 
diff --git a/AnnService/src/Helper/VectorSetReaders/DefaultReader.cpp b/AnnService/src/Helper/VectorSetReaders/DefaultReader.cpp
index 1b561898..d2977f40 100644
--- a/AnnService/src/Helper/VectorSetReaders/DefaultReader.cpp
+++ b/AnnService/src/Helper/VectorSetReaders/DefaultReader.cpp
@@ -4,6 +4,8 @@
 #include "inc/Helper/VectorSetReaders/DefaultReader.h"
 #include "inc/Helper/CommonHelper.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Helper;
 
diff --git a/AnnService/src/Helper/VectorSetReaders/TxtReader.cpp b/AnnService/src/Helper/VectorSetReaders/TxtReader.cpp
index 35aae3e6..5f1b9023 100644
--- a/AnnService/src/Helper/VectorSetReaders/TxtReader.cpp
+++ b/AnnService/src/Helper/VectorSetReaders/TxtReader.cpp
@@ -6,6 +6,7 @@
 #include "inc/Helper/CommonHelper.h"
 
 #include <omp.h>
+#include <cstdint>
 
 using namespace SPTAG;
 using namespace SPTAG::Helper;
diff --git a/AnnService/src/Helper/VectorSetReaders/XvecReader.cpp b/AnnService/src/Helper/VectorSetReaders/XvecReader.cpp
index 1cd3ba0b..38704899 100644
--- a/AnnService/src/Helper/VectorSetReaders/XvecReader.cpp
+++ b/AnnService/src/Helper/VectorSetReaders/XvecReader.cpp
@@ -5,6 +5,7 @@
 #include "inc/Helper/CommonHelper.h"
 
 #include <time.h>
+#include <cstdint>
 
 using namespace SPTAG;
 using namespace SPTAG::Helper;
diff --git a/AnnService/src/IndexSearcher/main.cpp b/AnnService/src/IndexSearcher/main.cpp
index 350e0871..2691b6f0 100644
--- a/AnnService/src/IndexSearcher/main.cpp
+++ b/AnnService/src/IndexSearcher/main.cpp
@@ -17,6 +17,7 @@
 #include <ctime>
 #include <thread>
 #include <chrono>
+#include <cstdint>
 
 using namespace SPTAG;
 
diff --git a/AnnService/src/Quantizer/main.cpp b/AnnService/src/Quantizer/main.cpp
index 5b61712b..56a577b9 100644
--- a/AnnService/src/Quantizer/main.cpp
+++ b/AnnService/src/Quantizer/main.cpp
@@ -9,6 +9,7 @@
 #include "inc/Quantizer/Training.h"
 
 #include <memory>
+#include <cstdint>
 
 using namespace SPTAG;
 
@@ -191,4 +192,4 @@ int main(int argc, char* argv[])
         exit(1);
     }
     }
-}
\ No newline at end of file
+}
diff --git a/AnnService/src/Server/SearchService.cpp b/AnnService/src/Server/SearchService.cpp
index cd043657..4a405f84 100644
--- a/AnnService/src/Server/SearchService.cpp
+++ b/AnnService/src/Server/SearchService.cpp
@@ -8,6 +8,7 @@
 #include "inc/Helper/ArgumentsParser.h"
 
 #include <iostream>
+#include <cstdint>
 
 using namespace SPTAG;
 using namespace SPTAG::Service;
diff --git a/AnnService/src/Server/ServiceContext.cpp b/AnnService/src/Server/ServiceContext.cpp
index e07f768d..dff28a16 100644
--- a/AnnService/src/Server/ServiceContext.cpp
+++ b/AnnService/src/Server/ServiceContext.cpp
@@ -6,6 +6,8 @@
 #include "inc/Helper/CommonHelper.h"
 #include "inc/Helper/StringConvert.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Service;
 
diff --git a/AnnService/src/Socket/Client.cpp b/AnnService/src/Socket/Client.cpp
index 9c4101e4..2e57566f 100644
--- a/AnnService/src/Socket/Client.cpp
+++ b/AnnService/src/Socket/Client.cpp
@@ -4,6 +4,7 @@
 #include "inc/Socket/Client.h"
 
 #include <limits>
+#include <cstdint>
 
 using namespace SPTAG::Socket;
 
diff --git a/AnnService/src/Socket/ConnectionManager.cpp b/AnnService/src/Socket/ConnectionManager.cpp
index 9d52dbc8..bd0f200e 100644
--- a/AnnService/src/Socket/ConnectionManager.cpp
+++ b/AnnService/src/Socket/ConnectionManager.cpp
@@ -3,6 +3,8 @@
 
 #include "inc/Socket/ConnectionManager.h"
 
+#include <cstdint>
+
 using namespace SPTAG::Socket;
 
 
diff --git a/AnnService/src/Socket/Packet.cpp b/AnnService/src/Socket/Packet.cpp
index 335400bb..3c9d77e1 100644
--- a/AnnService/src/Socket/Packet.cpp
+++ b/AnnService/src/Socket/Packet.cpp
@@ -5,6 +5,7 @@
 #include "inc/Socket/SimpleSerialization.h"
 
 #include <type_traits>
+#include <cstdint>
 
 using namespace SPTAG::Socket;
 
diff --git a/AnnService/src/Socket/RemoteSearchQuery.cpp b/AnnService/src/Socket/RemoteSearchQuery.cpp
index 2cb45032..261e67a8 100644
--- a/AnnService/src/Socket/RemoteSearchQuery.cpp
+++ b/AnnService/src/Socket/RemoteSearchQuery.cpp
@@ -4,6 +4,8 @@
 #include "inc/Socket/RemoteSearchQuery.h"
 #include "inc/Socket/SimpleSerialization.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Socket;
 
diff --git a/Test/src/AlgoTest.cpp b/Test/src/AlgoTest.cpp
index ad7f40d5..9bc71c36 100644
--- a/Test/src/AlgoTest.cpp
+++ b/Test/src/AlgoTest.cpp
@@ -8,6 +8,7 @@
 
 #include <unordered_set>
 #include <chrono>
+#include <cstdint>
 
 template <typename T>
 void Build(SPTAG::IndexAlgoType algo, std::string distCalcMethod, std::shared_ptr<SPTAG::VectorSet>& vec, std::shared_ptr<SPTAG::MetadataSet>& meta, const std::string out)
diff --git a/Test/src/ConcurrentTest.cpp b/Test/src/ConcurrentTest.cpp
index 0e742e96..e417933b 100644
--- a/Test/src/ConcurrentTest.cpp
+++ b/Test/src/ConcurrentTest.cpp
@@ -9,6 +9,7 @@
 #include <thread>
 #include <unordered_set>
 #include <ctime>
+#include <cstdint>
 
 template <typename T>
 void ConcurrentAddSearchSave(SPTAG::IndexAlgoType algo, std::string distCalcMethod, std::shared_ptr<SPTAG::VectorSet>& vec, std::shared_ptr<SPTAG::MetadataSet>& meta, const std::string out)
diff --git a/Test/src/DistanceTest.cpp b/Test/src/DistanceTest.cpp
index 872fb01f..4f4c1721 100644
--- a/Test/src/DistanceTest.cpp
+++ b/Test/src/DistanceTest.cpp
@@ -5,6 +5,8 @@
 #include <ctime>
 #include <thread>
 #include <vector>
+#include <cstdint>
+
 #include "inc/Test.h"
 #include "inc/Core/Common/DistanceUtils.h"
 
diff --git a/Test/src/FilterTest.cpp b/Test/src/FilterTest.cpp
index 37aae674..bc5ca2a8 100644
--- a/Test/src/FilterTest.cpp
+++ b/Test/src/FilterTest.cpp
@@ -8,6 +8,7 @@
 
 #include <unordered_set>
 #include <chrono>
+#include <cstdint>
 
 template <typename T>
 void BuildWithMetaMapping(SPTAG::IndexAlgoType algo, std::string distCalcMethod, std::shared_ptr<SPTAG::VectorSet>& vec, std::shared_ptr<SPTAG::MetadataSet>& meta, const std::string out)
diff --git a/Test/src/PerfTest.cpp b/Test/src/PerfTest.cpp
index 7b296e4d..c6cf23ca 100644
--- a/Test/src/PerfTest.cpp
+++ b/Test/src/PerfTest.cpp
@@ -10,6 +10,7 @@
 #include <thread>
 #include <unordered_set>
 #include <ctime>
+#include <cstdint>
 
 using namespace SPTAG;
 
@@ -228,4 +229,4 @@ BOOST_AUTO_TEST_CASE(KDTTest)
     PTest<std::int8_t>(IndexAlgoType::KDT, "Cosine");
 }
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Test/src/ReconstructIndexSimilarityTest.cpp b/Test/src/ReconstructIndexSimilarityTest.cpp
index 4170b1ef..8276b35b 100644
--- a/Test/src/ReconstructIndexSimilarityTest.cpp
+++ b/Test/src/ReconstructIndexSimilarityTest.cpp
@@ -13,6 +13,7 @@
 #include <iostream>
 #include <unordered_set>
 #include <ctime>
+#include <cstdint>
 
 using namespace SPTAG;
 
diff --git a/Test/src/SIMDTest.cpp b/Test/src/SIMDTest.cpp
index d58f9298..ab9ab7c5 100644
--- a/Test/src/SIMDTest.cpp
+++ b/Test/src/SIMDTest.cpp
@@ -3,6 +3,8 @@
 
 // #include <bitset>
 #include <vector>
+#include <cstdint>
+
 #include "inc/Test.h"
 #include "inc/Core/Common/SIMDUtils.h"
 
diff --git a/Wrappers/WinRT/AnnIndex.cpp b/Wrappers/WinRT/AnnIndex.cpp
index 0253e825..1ee949eb 100644
--- a/Wrappers/WinRT/AnnIndex.cpp
+++ b/Wrappers/WinRT/AnnIndex.cpp
@@ -5,6 +5,8 @@
 #endif
 #include "SearchResult.g.cpp"
 
+#include <cstdint>
+
 namespace winrt::SPTAG::implementation
 {
   template<typename T, typename = std::enable_if_t<std::is_pod_v<T>>>
diff --git a/Wrappers/inc/ClientInterface.h b/Wrappers/inc/ClientInterface.h
index 94d46bca..e6a72015 100644
--- a/Wrappers/inc/ClientInterface.h
+++ b/Wrappers/inc/ClientInterface.h
@@ -11,6 +11,7 @@
 #include <unordered_map>
 #include <atomic>
 #include <mutex>
+#include <cstdint>
 
 class AnnClient
 {
diff --git a/Wrappers/src/CLRCoreInterface.cpp b/Wrappers/src/CLRCoreInterface.cpp
index 1cda9cc2..337dfc36 100644
--- a/Wrappers/src/CLRCoreInterface.cpp
+++ b/Wrappers/src/CLRCoreInterface.cpp
@@ -3,6 +3,8 @@
 
 #include "inc/CLRCoreInterface.h"
 
+#include <cstdint>
+
 
 namespace Microsoft
 {
@@ -300,4 +302,4 @@ namespace Microsoft
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Wrappers/src/ClientInterface.cpp b/Wrappers/src/ClientInterface.cpp
index a2220853..f61bedc1 100644
--- a/Wrappers/src/ClientInterface.cpp
+++ b/Wrappers/src/ClientInterface.cpp
@@ -8,6 +8,7 @@
 #include "inc/Helper/StringConvert.h"
 
 #include <boost/asio.hpp>
+#include <cstdint>
 
 
 AnnClient::AnnClient(const char* p_serverAddr, const char* p_serverPort)
diff --git a/Wrappers/src/CoreInterface.cpp b/Wrappers/src/CoreInterface.cpp
index b33170bf..5983fead 100644
--- a/Wrappers/src/CoreInterface.cpp
+++ b/Wrappers/src/CoreInterface.cpp
@@ -4,6 +4,8 @@
 #include "inc/CoreInterface.h"
 #include "inc/Helper/StringConvert.h"
 
+#include <cstdint>
+
 
 AnnIndex::AnnIndex(DimensionType p_dimension)
     : m_algoType(SPTAG::IndexAlgoType::BKT),