diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/DummyBidirectionObliviousTransfer.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/DummyBidirectionObliviousTransfer.cpp
index 94809db6..84a376ec 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/DummyBidirectionObliviousTransfer.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/DummyBidirectionObliviousTransfer.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "fbpcf/engine/tuple_generator/oblivious_transfer/DummyBidirectionObliviousTransfer.h"
-#include <sys/types.h>
 #include <cstdint>
 
 namespace fbpcf::engine::tuple_generator::oblivious_transfer::insecure {
diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/EmpShRandomCorrelatedObliviousTransfer.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/EmpShRandomCorrelatedObliviousTransfer.cpp
index 0935d4a8..b1e8c3be 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/EmpShRandomCorrelatedObliviousTransfer.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/EmpShRandomCorrelatedObliviousTransfer.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <emmintrin.h>
-#include <smmintrin.h>
 
 #include "fbpcf/engine/tuple_generator/oblivious_transfer/EmpShRandomCorrelatedObliviousTransfer.h"
 #include "fbpcf/engine/util/EmpNetworkAdapter.h"
diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/IknpShRandomCorrelatedObliviousTransfer.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/IknpShRandomCorrelatedObliviousTransfer.cpp
index f8676692..20df9229 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/IknpShRandomCorrelatedObliviousTransfer.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/IknpShRandomCorrelatedObliviousTransfer.cpp
@@ -7,7 +7,6 @@
 
 #include "fbpcf/engine/tuple_generator/oblivious_transfer/IknpShRandomCorrelatedObliviousTransfer.h"
 #include <emmintrin.h>
-#include <sys/types.h>
 #include <stdexcept>
 #include "fbpcf/engine/util/util.h"
 
diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/RcotBasedBidirectionObliviousTransfer.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/RcotBasedBidirectionObliviousTransfer.cpp
index 50191f68..a7e5ed1f 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/RcotBasedBidirectionObliviousTransfer.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/RcotBasedBidirectionObliviousTransfer.cpp
@@ -7,7 +7,6 @@
 
 #include "fbpcf/engine/tuple_generator/oblivious_transfer/RcotBasedBidirectionObliviousTransfer.h"
 #include <emmintrin.h>
-#include <smmintrin.h>
 #include <future>
 #include <thread>
 #include <vector>
diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/DummyMultiPointCot.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/DummyMultiPointCot.cpp
index a6a2f989..8973ac3e 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/DummyMultiPointCot.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/DummyMultiPointCot.cpp
@@ -7,7 +7,6 @@
 
 #include <assert.h>
 #include <emmintrin.h>
-#include <string.h>
 #include <algorithm>
 #include <random>
 #include "fbpcf/engine/util/util.h"
diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/DummySinglePointCot.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/DummySinglePointCot.cpp
index 29eabe90..7b0ba750 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/DummySinglePointCot.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/DummySinglePointCot.cpp
@@ -8,7 +8,6 @@
 #include "fbpcf/engine/tuple_generator/oblivious_transfer/ferret/DummySinglePointCot.h"
 #include <assert.h>
 #include <emmintrin.h>
-#include <string.h>
 #include <algorithm>
 #include <cstddef>
 #include <random>
diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/RcotExtender.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/RcotExtender.cpp
index f6d3e33f..6a3fafd4 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/RcotExtender.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/RcotExtender.cpp
@@ -12,8 +12,6 @@
 #include <iterator>
 #include <locale>
 #include <memory>
-#include <stdexcept>
-#include <string>
 
 #include "fbpcf/engine/tuple_generator/oblivious_transfer/ferret/RcotExtender.h"
 #include "fbpcf/engine/util/util.h"
diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/MatrixMultiplierTest.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/MatrixMultiplierTest.cpp
index 036e04f1..71e17fc4 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/MatrixMultiplierTest.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/MatrixMultiplierTest.cpp
@@ -8,7 +8,6 @@
 #include <emmintrin.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <immintrin.h>
 #include <future>
 #include <memory>
 
diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/MultiPointCotTest.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/MultiPointCotTest.cpp
index bf1212ab..7e53ae2b 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/MultiPointCotTest.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/MultiPointCotTest.cpp
@@ -8,7 +8,6 @@
 #include <emmintrin.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <immintrin.h>
 #include <future>
 #include <memory>
 #include <random>
diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/SinglePointCotTest.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/SinglePointCotTest.cpp
index 6fc94c45..0d55af5d 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/SinglePointCotTest.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/ferret/test/SinglePointCotTest.cpp
@@ -8,7 +8,6 @@
 #include <emmintrin.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <immintrin.h>
 #include <future>
 #include <memory>
 #include <random>
diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/test/BaseObliviousTransferTest.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/test/BaseObliviousTransferTest.cpp
index 1021012e..e71819e9 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/test/BaseObliviousTransferTest.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/test/BaseObliviousTransferTest.cpp
@@ -7,7 +7,6 @@
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <smmintrin.h>
 #include <future>
 #include <memory>
 #include <random>
diff --git a/fbpcf/engine/tuple_generator/oblivious_transfer/test/RandomCorrelatedObliviousTransferTest.cpp b/fbpcf/engine/tuple_generator/oblivious_transfer/test/RandomCorrelatedObliviousTransferTest.cpp
index e572a2c9..18caf96b 100644
--- a/fbpcf/engine/tuple_generator/oblivious_transfer/test/RandomCorrelatedObliviousTransferTest.cpp
+++ b/fbpcf/engine/tuple_generator/oblivious_transfer/test/RandomCorrelatedObliviousTransferTest.cpp
@@ -9,7 +9,6 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <smmintrin.h>
-#include <xmmintrin.h>
 #include <future>
 #include <memory>
 #include <random>