diff --git a/fbpcs/data_processing/id_combiner/AddPaddingToCols.cpp b/fbpcs/data_processing/id_combiner/AddPaddingToCols.cpp
index 9faaf45cd..966290bd0 100644
--- a/fbpcs/data_processing/id_combiner/AddPaddingToCols.cpp
+++ b/fbpcs/data_processing/id_combiner/AddPaddingToCols.cpp
@@ -10,9 +10,7 @@
 #include <iomanip>
 #include <istream>
 #include <ostream>
-#include <stdexcept>
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
diff --git a/fbpcs/data_processing/id_combiner/DataPreparationHelpers.cpp b/fbpcs/data_processing/id_combiner/DataPreparationHelpers.cpp
index 8b92616fc..f7a2ff9d5 100644
--- a/fbpcs/data_processing/id_combiner/DataPreparationHelpers.cpp
+++ b/fbpcs/data_processing/id_combiner/DataPreparationHelpers.cpp
@@ -9,14 +9,11 @@
 
 #include <folly/logging/xlog.h>
 #include <cstdint>
-#include <filesystem>
-#include <iomanip>
 #include <istream>
 #include <ostream>
 #include <sstream>
 #include <stdexcept>
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 #include <re2/re2.h>
diff --git a/fbpcs/data_processing/id_combiner/DataValidation.cpp b/fbpcs/data_processing/id_combiner/DataValidation.cpp
index 6ae2e193e..f7bedafef 100644
--- a/fbpcs/data_processing/id_combiner/DataValidation.cpp
+++ b/fbpcs/data_processing/id_combiner/DataValidation.cpp
@@ -11,14 +11,12 @@
 #include <istream>
 #include <stdexcept>
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
 #include <folly/Conv.h>
 #include <folly/String.h>
 #include <folly/logging/xlog.h>
-#include <re2/re2.h>
 
 #include "DataPreparationHelpers.h"
 
diff --git a/fbpcs/data_processing/id_combiner/GroupBy.cpp b/fbpcs/data_processing/id_combiner/GroupBy.cpp
index 436e13a0e..e4b93339e 100644
--- a/fbpcs/data_processing/id_combiner/GroupBy.cpp
+++ b/fbpcs/data_processing/id_combiner/GroupBy.cpp
@@ -7,8 +7,6 @@
 
 #include "GroupBy.h"
 
-#include <filesystem>
-#include <iomanip>
 #include <istream>
 #include <ostream>
 #include <stdexcept>
diff --git a/fbpcs/data_processing/id_combiner/IdInsert.cpp b/fbpcs/data_processing/id_combiner/IdInsert.cpp
index a325a5bfa..dfd3d5bc7 100644
--- a/fbpcs/data_processing/id_combiner/IdInsert.cpp
+++ b/fbpcs/data_processing/id_combiner/IdInsert.cpp
@@ -8,9 +8,7 @@
 #include "IdInsert.h"
 #include "DataPreparationHelpers.h"
 
-#include <filesystem>
 #include <fstream>
-#include <iomanip>
 #include <istream>
 #include <ostream>
 #include <sstream>
diff --git a/fbpcs/data_processing/id_combiner/IdSwap.cpp b/fbpcs/data_processing/id_combiner/IdSwap.cpp
index 48de4fa3a..8106e3238 100644
--- a/fbpcs/data_processing/id_combiner/IdSwap.cpp
+++ b/fbpcs/data_processing/id_combiner/IdSwap.cpp
@@ -7,11 +7,8 @@
 
 #include "IdSwap.h"
 #include "DataPreparationHelpers.h"
-#include "folly/Optional.h"
 
-#include <filesystem>
 #include <fstream>
-#include <iomanip>
 #include <istream>
 #include <ostream>
 #include <sstream>
diff --git a/fbpcs/data_processing/id_combiner/IdSwapMultiKey.cpp b/fbpcs/data_processing/id_combiner/IdSwapMultiKey.cpp
index a47c77d9c..fd33e38a3 100644
--- a/fbpcs/data_processing/id_combiner/IdSwapMultiKey.cpp
+++ b/fbpcs/data_processing/id_combiner/IdSwapMultiKey.cpp
@@ -7,13 +7,10 @@
 
 #include "IdSwapMultiKey.h"
 #include "DataPreparationHelpers.h"
-#include "folly/Optional.h"
 
 #include <algorithm>
 #include <cstdint>
-#include <filesystem>
 #include <fstream>
-#include <iomanip>
 #include <istream>
 #include <numeric>
 #include <ostream>
diff --git a/fbpcs/data_processing/id_combiner/SortIds.cpp b/fbpcs/data_processing/id_combiner/SortIds.cpp
index 6b46f5ad9..c8a115cb9 100644
--- a/fbpcs/data_processing/id_combiner/SortIds.cpp
+++ b/fbpcs/data_processing/id_combiner/SortIds.cpp
@@ -7,8 +7,6 @@
 
 #include "SortIds.h"
 
-#include <filesystem>
-#include <iomanip>
 #include <istream>
 #include <ostream>
 #include <stdexcept>
diff --git a/fbpcs/data_processing/id_combiner/test/AddPaddingToColsTest.cpp b/fbpcs/data_processing/id_combiner/test/AddPaddingToColsTest.cpp
index 2c3cc4fe3..63fac77f6 100644
--- a/fbpcs/data_processing/id_combiner/test/AddPaddingToColsTest.cpp
+++ b/fbpcs/data_processing/id_combiner/test/AddPaddingToColsTest.cpp
@@ -10,9 +10,7 @@
 #include <chrono>
 #include <cstdlib>
 #include <filesystem>
-#include <fstream>
 
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 using namespace ::pid::combiner;
diff --git a/fbpcs/data_processing/id_combiner/test/DataValidationTest.cpp b/fbpcs/data_processing/id_combiner/test/DataValidationTest.cpp
index 31e37016b..a7b2c1d7b 100644
--- a/fbpcs/data_processing/id_combiner/test/DataValidationTest.cpp
+++ b/fbpcs/data_processing/id_combiner/test/DataValidationTest.cpp
@@ -14,7 +14,6 @@
 #include <fstream>
 
 #include <folly/Conv.h>
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 using namespace ::pid::combiner;
diff --git a/fbpcs/data_processing/id_combiner/test/GroupByTest.cpp b/fbpcs/data_processing/id_combiner/test/GroupByTest.cpp
index 210bce0d1..b44ad771a 100644
--- a/fbpcs/data_processing/id_combiner/test/GroupByTest.cpp
+++ b/fbpcs/data_processing/id_combiner/test/GroupByTest.cpp
@@ -7,12 +7,8 @@
 
 #include "../GroupBy.h"
 
-#include <chrono>
 #include <cstdlib>
-#include <filesystem>
-#include <fstream>
 
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 class GroupByTest : public testing::Test {
diff --git a/fbpcs/data_processing/id_combiner/test/IdInsertTest.cpp b/fbpcs/data_processing/id_combiner/test/IdInsertTest.cpp
index 78c661038..2e02402c6 100644
--- a/fbpcs/data_processing/id_combiner/test/IdInsertTest.cpp
+++ b/fbpcs/data_processing/id_combiner/test/IdInsertTest.cpp
@@ -7,12 +7,9 @@
 
 #include "../IdInsert.h"
 
-#include <chrono>
 #include <cstdlib>
-#include <filesystem>
 #include <fstream>
 
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 #include <folly/logging/xlog.h>
diff --git a/fbpcs/data_processing/id_combiner/test/IdSwapMultiKeyTest.cpp b/fbpcs/data_processing/id_combiner/test/IdSwapMultiKeyTest.cpp
index 7477a97ab..5df247632 100644
--- a/fbpcs/data_processing/id_combiner/test/IdSwapMultiKeyTest.cpp
+++ b/fbpcs/data_processing/id_combiner/test/IdSwapMultiKeyTest.cpp
@@ -7,13 +7,10 @@
 
 #include "../IdSwapMultiKey.h"
 
-#include <chrono>
 #include <cstdlib>
-#include <filesystem>
 #include <fstream>
 
 #include <folly/Random.h>
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 #include <folly/logging/xlog.h>
diff --git a/fbpcs/data_processing/id_combiner/test/IdSwapTest.cpp b/fbpcs/data_processing/id_combiner/test/IdSwapTest.cpp
index f239707ad..345dd13af 100644
--- a/fbpcs/data_processing/id_combiner/test/IdSwapTest.cpp
+++ b/fbpcs/data_processing/id_combiner/test/IdSwapTest.cpp
@@ -7,12 +7,9 @@
 
 #include "../IdSwap.h"
 
-#include <chrono>
 #include <cstdlib>
-#include <filesystem>
 #include <fstream>
 
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 #include <folly/logging/xlog.h>
diff --git a/fbpcs/data_processing/id_combiner/test/SortIdsTest.cpp b/fbpcs/data_processing/id_combiner/test/SortIdsTest.cpp
index 3b2456dac..9a72efbf5 100644
--- a/fbpcs/data_processing/id_combiner/test/SortIdsTest.cpp
+++ b/fbpcs/data_processing/id_combiner/test/SortIdsTest.cpp
@@ -7,12 +7,8 @@
 
 #include "../SortIds.h"
 
-#include <chrono>
 #include <cstdlib>
-#include <filesystem>
-#include <fstream>
 
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 class SortIdsTest : public testing::Test {
diff --git a/fbpcs/data_processing/id_combiner/test/SortIntegralValuesTest.cpp b/fbpcs/data_processing/id_combiner/test/SortIntegralValuesTest.cpp
index d4e89ac63..07f1014db 100644
--- a/fbpcs/data_processing/id_combiner/test/SortIntegralValuesTest.cpp
+++ b/fbpcs/data_processing/id_combiner/test/SortIntegralValuesTest.cpp
@@ -10,9 +10,7 @@
 #include <chrono>
 #include <cstdlib>
 #include <filesystem>
-#include <fstream>
 
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 using namespace ::pid::combiner;