From 153c2bf2152a9ba274bb8bbe109aba6ca704d610 Mon Sep 17 00:00:00 2001
From: Junjie Qi <jqi@meta.com>
Date: Thu, 15 Aug 2024 23:03:42 -0700
Subject: [PATCH] Remove unused header file from CPP file (#3765)

Summary:
Pull Request resolved: https://github.com/facebookresearch/faiss/pull/3765

Cleaning unused headers improves build speed and clangd document open time

Differential Revision: D61368441
---
 benchs/bench_6bit_codec.cpp                     | 1 -
 benchs/bench_cppcontrib_sa_decode.cpp           | 2 --
 benchs/bench_hamming_computer.cpp               | 1 -
 benchs/bench_heap_replace.cpp                   | 1 -
 demos/demo_imi_flat.cpp                         | 1 -
 demos/demo_sift1M.cpp                           | 2 --
 faiss/AutoTune.cpp                              | 8 --------
 faiss/Index2Layer.cpp                           | 1 -
 faiss/IndexAdditiveQuantizer.cpp                | 1 -
 faiss/IndexAdditiveQuantizerFastScan.cpp        | 3 ---
 faiss/IndexBinaryFlat.cpp                       | 1 -
 faiss/IndexBinaryHNSW.cpp                       | 5 -----
 faiss/IndexBinaryHash.cpp                       | 1 -
 faiss/IndexFastScan.cpp                         | 4 ----
 faiss/IndexFlat.cpp                             | 1 -
 faiss/IndexHNSW.cpp                             | 4 ----
 faiss/IndexIDMap.cpp                            | 1 -
 faiss/IndexIVF.cpp                              | 1 -
 faiss/IndexIVFAdditiveQuantizer.cpp             | 1 -
 faiss/IndexIVFAdditiveQuantizerFastScan.cpp     | 3 ---
 faiss/IndexIVFFastScan.cpp                      | 1 -
 faiss/IndexIVFPQ.cpp                            | 1 -
 faiss/IndexIVFPQFastScan.cpp                    | 4 ----
 faiss/IndexIVFSpectralHash.cpp                  | 1 -
 faiss/IndexLSH.cpp                              | 1 -
 faiss/IndexNNDescent.cpp                        | 8 --------
 faiss/IndexNSG.cpp                              | 3 ---
 faiss/IndexPQFastScan.cpp                       | 6 ------
 faiss/IndexRefine.cpp                           | 2 --
 faiss/IndexScalarQuantizer.cpp                  | 1 -
 faiss/MetaIndexes.cpp                           | 1 -
 faiss/gpu/GpuAutoTune.cpp                       | 3 ---
 faiss/gpu/GpuCloner.cpp                         | 2 --
 faiss/gpu/perf/PerfIVFPQAdd.cpp                 | 1 -
 faiss/impl/AdditiveQuantizer.cpp                | 1 -
 faiss/impl/HNSW.cpp                             | 2 --
 faiss/impl/LocalSearchQuantizer.cpp             | 3 ---
 faiss/impl/ProductAdditiveQuantizer.cpp         | 2 --
 faiss/impl/ScalarQuantizer.cpp                  | 2 --
 faiss/impl/index_read.cpp                       | 4 ----
 faiss/impl/index_write.cpp                      | 5 -----
 faiss/impl/kmeans1d.cpp                         | 1 -
 faiss/impl/lattice_Zn.cpp                       | 1 -
 faiss/impl/pq4_fast_scan.cpp                    | 1 -
 faiss/impl/pq4_fast_scan_search_qbs.cpp         | 1 -
 faiss/index_factory.cpp                         | 2 --
 faiss/invlists/InvertedListsIOHook.cpp          | 1 -
 faiss/invlists/OnDiskInvertedLists.cpp          | 1 -
 faiss/utils/distances_fused/avx512.cpp          | 1 -
 faiss/utils/distances_fused/distances_fused.cpp | 2 --
 faiss/utils/distances_fused/simdlib_based.cpp   | 1 -
 faiss/utils/extra_distances.cpp                 | 1 -
 faiss/utils/utils.cpp                           | 3 ---
 tests/test_approx_topk.cpp                      | 1 -
 tests/test_common_ivf_empty_index.cpp           | 1 -
 tests/test_cppcontrib_sa_decode.cpp             | 2 --
 tests/test_dealloc_invlists.cpp                 | 1 -
 tests/test_ivf_index.cpp                        | 4 ----
 tests/test_ivfpq_codec.cpp                      | 1 -
 tests/test_ivfpq_indexing.cpp                   | 1 -
 tests/test_lowlevel_ivf.cpp                     | 2 --
 tests/test_ondisk_ivf.cpp                       | 1 -
 tests/test_transfer_invlists.cpp                | 1 -
 63 files changed, 128 deletions(-)

diff --git a/benchs/bench_6bit_codec.cpp b/benchs/bench_6bit_codec.cpp
index b4ac0b04b6..a06577f903 100644
--- a/benchs/bench_6bit_codec.cpp
+++ b/benchs/bench_6bit_codec.cpp
@@ -12,7 +12,6 @@
 #include <faiss/impl/ScalarQuantizer.h>
 #include <faiss/utils/distances.h>
 #include <faiss/utils/random.h>
-#include <faiss/utils/utils.h>
 
 using namespace faiss;
 
diff --git a/benchs/bench_cppcontrib_sa_decode.cpp b/benchs/bench_cppcontrib_sa_decode.cpp
index b960fb7c6a..6776bdd134 100644
--- a/benchs/bench_cppcontrib_sa_decode.cpp
+++ b/benchs/bench_cppcontrib_sa_decode.cpp
@@ -20,9 +20,7 @@
 #include <faiss/Index2Layer.h>
 #include <faiss/IndexIVFPQ.h>
 #include <faiss/IndexPQ.h>
-#include <faiss/impl/io.h>
 #include <faiss/index_factory.h>
-#include <faiss/index_io.h>
 
 #include <faiss/IndexRowwiseMinMax.h>
 #include <faiss/cppcontrib/SaDecodeKernels.h>
diff --git a/benchs/bench_hamming_computer.cpp b/benchs/bench_hamming_computer.cpp
index 36da7a1025..77559dd4ec 100644
--- a/benchs/bench_hamming_computer.cpp
+++ b/benchs/bench_hamming_computer.cpp
@@ -4,7 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
 #include <omp.h>
 #include <cstdio>
 #include <vector>
diff --git a/benchs/bench_heap_replace.cpp b/benchs/bench_heap_replace.cpp
index d53b44be41..5808bcafc5 100644
--- a/benchs/bench_heap_replace.cpp
+++ b/benchs/bench_heap_replace.cpp
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <omp.h>
 #include <cstdio>
 
 #include <faiss/impl/FaissAssert.h>
diff --git a/demos/demo_imi_flat.cpp b/demos/demo_imi_flat.cpp
index 1480422ac6..812592c101 100644
--- a/demos/demo_imi_flat.cpp
+++ b/demos/demo_imi_flat.cpp
@@ -15,7 +15,6 @@
 #include <faiss/IndexFlat.h>
 #include <faiss/IndexIVFFlat.h>
 #include <faiss/IndexPQ.h>
-#include <faiss/index_io.h>
 
 double elapsed() {
     struct timeval tv;
diff --git a/demos/demo_sift1M.cpp b/demos/demo_sift1M.cpp
index 598565f858..6de01e61ff 100644
--- a/demos/demo_sift1M.cpp
+++ b/demos/demo_sift1M.cpp
@@ -12,8 +12,6 @@
 #include <cstring>
 
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include <sys/time.h>
 
diff --git a/faiss/AutoTune.cpp b/faiss/AutoTune.cpp
index 7c663a1dd4..d143fae6d4 100644
--- a/faiss/AutoTune.cpp
+++ b/faiss/AutoTune.cpp
@@ -21,24 +21,16 @@
 #include <faiss/utils/random.h>
 #include <faiss/utils/utils.h>
 
-#include <faiss/IndexFlat.h>
 #include <faiss/IndexHNSW.h>
 #include <faiss/IndexIVF.h>
 #include <faiss/IndexIVFFlat.h>
 #include <faiss/IndexIVFPQ.h>
 #include <faiss/IndexIVFPQR.h>
-#include <faiss/IndexLSH.h>
 #include <faiss/IndexPQ.h>
 #include <faiss/IndexPreTransform.h>
 #include <faiss/IndexRefine.h>
-#include <faiss/IndexScalarQuantizer.h>
 #include <faiss/IndexShardsIVF.h>
 #include <faiss/MetaIndexes.h>
-#include <faiss/VectorTransform.h>
-
-#include <faiss/IndexBinaryFlat.h>
-#include <faiss/IndexBinaryHNSW.h>
-#include <faiss/IndexBinaryIVF.h>
 
 namespace faiss {
 
diff --git a/faiss/Index2Layer.cpp b/faiss/Index2Layer.cpp
index 743dac6cea..e5e1fb0dd9 100644
--- a/faiss/Index2Layer.cpp
+++ b/faiss/Index2Layer.cpp
@@ -9,7 +9,6 @@
 
 #include <faiss/Index2Layer.h>
 
-#include <faiss/impl/platform_macros.h>
 #include <cassert>
 #include <cinttypes>
 #include <cmath>
diff --git a/faiss/IndexAdditiveQuantizer.cpp b/faiss/IndexAdditiveQuantizer.cpp
index 719dcafbc9..04d7689cf3 100644
--- a/faiss/IndexAdditiveQuantizer.cpp
+++ b/faiss/IndexAdditiveQuantizer.cpp
@@ -16,7 +16,6 @@
 #include <faiss/impl/ResultHandler.h>
 #include <faiss/utils/distances.h>
 #include <faiss/utils/extra_distances.h>
-#include <faiss/utils/utils.h>
 
 namespace faiss {
 
diff --git a/faiss/IndexAdditiveQuantizerFastScan.cpp b/faiss/IndexAdditiveQuantizerFastScan.cpp
index 1ad4d60926..86a4701c44 100644
--- a/faiss/IndexAdditiveQuantizerFastScan.cpp
+++ b/faiss/IndexAdditiveQuantizerFastScan.cpp
@@ -8,11 +8,8 @@
 #include <faiss/IndexAdditiveQuantizerFastScan.h>
 
 #include <cassert>
-#include <climits>
 #include <memory>
 
-#include <omp.h>
-
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/impl/LocalSearchQuantizer.h>
 #include <faiss/impl/LookupTableScaler.h>
diff --git a/faiss/IndexBinaryFlat.cpp b/faiss/IndexBinaryFlat.cpp
index 89a9f6a147..2d70d4f337 100644
--- a/faiss/IndexBinaryFlat.cpp
+++ b/faiss/IndexBinaryFlat.cpp
@@ -14,7 +14,6 @@
 #include <faiss/impl/IDSelector.h>
 #include <faiss/utils/Heap.h>
 #include <faiss/utils/hamming.h>
-#include <faiss/utils/utils.h>
 #include <cstring>
 
 namespace faiss {
diff --git a/faiss/IndexBinaryHNSW.cpp b/faiss/IndexBinaryHNSW.cpp
index f1bda08fbc..56737cebfa 100644
--- a/faiss/IndexBinaryHNSW.cpp
+++ b/faiss/IndexBinaryHNSW.cpp
@@ -15,11 +15,6 @@
 #include <cstring>
 #include <memory>
 
-#include <queue>
-#include <unordered_set>
-
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <cstdint>
 
 #include <faiss/IndexBinaryFlat.h>
diff --git a/faiss/IndexBinaryHash.cpp b/faiss/IndexBinaryHash.cpp
index aca332d8d8..fb80134fc4 100644
--- a/faiss/IndexBinaryHash.cpp
+++ b/faiss/IndexBinaryHash.cpp
@@ -19,7 +19,6 @@
 
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
-#include <faiss/impl/platform_macros.h>
 
 namespace faiss {
 
diff --git a/faiss/IndexFastScan.cpp b/faiss/IndexFastScan.cpp
index 529465da3e..634a1f0093 100644
--- a/faiss/IndexFastScan.cpp
+++ b/faiss/IndexFastScan.cpp
@@ -17,11 +17,7 @@
 #include <faiss/impl/IDSelector.h>
 #include <faiss/impl/LookupTableScaler.h>
 #include <faiss/impl/ResultHandler.h>
-#include <faiss/utils/distances.h>
-#include <faiss/utils/extra_distances.h>
 #include <faiss/utils/hamming.h>
-#include <faiss/utils/random.h>
-#include <faiss/utils/utils.h>
 
 #include <faiss/impl/pq4_fast_scan.h>
 #include <faiss/impl/simd_result_handlers.h>
diff --git a/faiss/IndexFlat.cpp b/faiss/IndexFlat.cpp
index 7d29ca5387..14c18b16a2 100644
--- a/faiss/IndexFlat.cpp
+++ b/faiss/IndexFlat.cpp
@@ -16,7 +16,6 @@
 #include <faiss/utils/extra_distances.h>
 #include <faiss/utils/prefetch.h>
 #include <faiss/utils/sorting.h>
-#include <faiss/utils/utils.h>
 #include <cstring>
 
 namespace faiss {
diff --git a/faiss/IndexHNSW.cpp b/faiss/IndexHNSW.cpp
index e18e203208..8c4614dcea 100644
--- a/faiss/IndexHNSW.cpp
+++ b/faiss/IndexHNSW.cpp
@@ -19,10 +19,7 @@
 #include <memory>
 #include <queue>
 #include <random>
-#include <unordered_set>
 
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <cstdint>
 
 #include <faiss/Index2Layer.h>
@@ -31,7 +28,6 @@
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/impl/ResultHandler.h>
-#include <faiss/utils/distances.h>
 #include <faiss/utils/random.h>
 #include <faiss/utils/sorting.h>
 
diff --git a/faiss/IndexIDMap.cpp b/faiss/IndexIDMap.cpp
index dc84052b2f..09e46c3a87 100644
--- a/faiss/IndexIDMap.cpp
+++ b/faiss/IndexIDMap.cpp
@@ -12,7 +12,6 @@
 #include <cinttypes>
 #include <cstdint>
 #include <cstdio>
-#include <limits>
 
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
diff --git a/faiss/IndexIVF.cpp b/faiss/IndexIVF.cpp
index 14830475d9..9c54eea582 100644
--- a/faiss/IndexIVF.cpp
+++ b/faiss/IndexIVF.cpp
@@ -18,7 +18,6 @@
 #include <cinttypes>
 #include <cstdio>
 #include <limits>
-#include <memory>
 
 #include <faiss/utils/hamming.h>
 #include <faiss/utils/utils.h>
diff --git a/faiss/IndexIVFAdditiveQuantizer.cpp b/faiss/IndexIVFAdditiveQuantizer.cpp
index edaff51ec7..912e240a3b 100644
--- a/faiss/IndexIVFAdditiveQuantizer.cpp
+++ b/faiss/IndexIVFAdditiveQuantizer.cpp
@@ -16,7 +16,6 @@
 #include <faiss/impl/ResultHandler.h>
 #include <faiss/utils/distances.h>
 #include <faiss/utils/extra_distances.h>
-#include <faiss/utils/utils.h>
 
 namespace faiss {
 
diff --git a/faiss/IndexIVFAdditiveQuantizerFastScan.cpp b/faiss/IndexIVFAdditiveQuantizerFastScan.cpp
index 23a2de554d..69b07cc0fe 100644
--- a/faiss/IndexIVFAdditiveQuantizerFastScan.cpp
+++ b/faiss/IndexIVFAdditiveQuantizerFastScan.cpp
@@ -11,8 +11,6 @@
 #include <cinttypes>
 #include <cstdio>
 
-#include <omp.h>
-
 #include <memory>
 
 #include <faiss/impl/AuxIndexStructures.h>
@@ -23,7 +21,6 @@
 #include <faiss/utils/distances.h>
 #include <faiss/utils/hamming.h>
 #include <faiss/utils/quantize_lut.h>
-#include <faiss/utils/simdlib.h>
 #include <faiss/utils/utils.h>
 
 namespace faiss {
diff --git a/faiss/IndexIVFFastScan.cpp b/faiss/IndexIVFFastScan.cpp
index 3e40f7a3da..a7bc090a0d 100644
--- a/faiss/IndexIVFFastScan.cpp
+++ b/faiss/IndexIVFFastScan.cpp
@@ -23,7 +23,6 @@
 #include <faiss/impl/pq4_fast_scan.h>
 #include <faiss/impl/simd_result_handlers.h>
 #include <faiss/invlists/BlockInvertedLists.h>
-#include <faiss/utils/distances.h>
 #include <faiss/utils/hamming.h>
 #include <faiss/utils/quantize_lut.h>
 #include <faiss/utils/utils.h>
diff --git a/faiss/IndexIVFPQ.cpp b/faiss/IndexIVFPQ.cpp
index 100f499cc5..c5257cbe91 100644
--- a/faiss/IndexIVFPQ.cpp
+++ b/faiss/IndexIVFPQ.cpp
@@ -22,7 +22,6 @@
 #include <faiss/utils/utils.h>
 
 #include <faiss/Clustering.h>
-#include <faiss/IndexFlat.h>
 
 #include <faiss/utils/hamming.h>
 
diff --git a/faiss/IndexIVFPQFastScan.cpp b/faiss/IndexIVFPQFastScan.cpp
index 2844ae4936..302aabd629 100644
--- a/faiss/IndexIVFPQFastScan.cpp
+++ b/faiss/IndexIVFPQFastScan.cpp
@@ -11,21 +11,17 @@
 #include <cinttypes>
 #include <cstdio>
 
-#include <omp.h>
-
 #include <memory>
 
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/utils/distances.h>
 #include <faiss/utils/simdlib.h>
-#include <faiss/utils/utils.h>
 
 #include <faiss/invlists/BlockInvertedLists.h>
 
 #include <faiss/impl/pq4_fast_scan.h>
 #include <faiss/impl/simd_result_handlers.h>
-#include <faiss/utils/quantize_lut.h>
 
 namespace faiss {
 
diff --git a/faiss/IndexIVFSpectralHash.cpp b/faiss/IndexIVFSpectralHash.cpp
index 14741691d0..ec0b0b781d 100644
--- a/faiss/IndexIVFSpectralHash.cpp
+++ b/faiss/IndexIVFSpectralHash.cpp
@@ -19,7 +19,6 @@
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/utils/hamming.h>
-#include <faiss/utils/utils.h>
 
 namespace faiss {
 
diff --git a/faiss/IndexLSH.cpp b/faiss/IndexLSH.cpp
index c2cbcb8b46..af64553f8f 100644
--- a/faiss/IndexLSH.cpp
+++ b/faiss/IndexLSH.cpp
@@ -15,7 +15,6 @@
 
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/utils/hamming.h>
-#include <faiss/utils/utils.h>
 
 namespace faiss {
 
diff --git a/faiss/IndexNNDescent.cpp b/faiss/IndexNNDescent.cpp
index 382e9c41c6..e015b84839 100644
--- a/faiss/IndexNNDescent.cpp
+++ b/faiss/IndexNNDescent.cpp
@@ -9,24 +9,16 @@
 
 #include <faiss/IndexNNDescent.h>
 
-#include <omp.h>
-
 #include <cinttypes>
 #include <cstdio>
 #include <cstdlib>
 
-#include <queue>
-#include <unordered_set>
-
 #ifdef __SSE__
 #endif
 
 #include <faiss/IndexFlat.h>
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
-#include <faiss/utils/Heap.h>
-#include <faiss/utils/distances.h>
-#include <faiss/utils/random.h>
 
 extern "C" {
 
diff --git a/faiss/IndexNSG.cpp b/faiss/IndexNSG.cpp
index 45a547b93b..d54616772b 100644
--- a/faiss/IndexNSG.cpp
+++ b/faiss/IndexNSG.cpp
@@ -9,8 +9,6 @@
 
 #include <faiss/IndexNSG.h>
 
-#include <omp.h>
-
 #include <cinttypes>
 #include <memory>
 
@@ -18,7 +16,6 @@
 #include <faiss/IndexNNDescent.h>
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
-#include <faiss/utils/Heap.h>
 #include <faiss/utils/distances.h>
 
 namespace faiss {
diff --git a/faiss/IndexPQFastScan.cpp b/faiss/IndexPQFastScan.cpp
index b8a6cdbeeb..f8808a3678 100644
--- a/faiss/IndexPQFastScan.cpp
+++ b/faiss/IndexPQFastScan.cpp
@@ -7,12 +7,6 @@
 
 #include <faiss/IndexPQFastScan.h>
 
-#include <cassert>
-#include <climits>
-#include <memory>
-
-#include <omp.h>
-
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/impl/pq4_fast_scan.h>
 #include <faiss/utils/utils.h>
diff --git a/faiss/IndexRefine.cpp b/faiss/IndexRefine.cpp
index 8fb0ea80bb..ccd4e99aed 100644
--- a/faiss/IndexRefine.cpp
+++ b/faiss/IndexRefine.cpp
@@ -11,8 +11,6 @@
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/utils/Heap.h>
-#include <faiss/utils/distances.h>
-#include <faiss/utils/utils.h>
 
 namespace faiss {
 
diff --git a/faiss/IndexScalarQuantizer.cpp b/faiss/IndexScalarQuantizer.cpp
index 44a628f000..1759c8a449 100644
--- a/faiss/IndexScalarQuantizer.cpp
+++ b/faiss/IndexScalarQuantizer.cpp
@@ -14,7 +14,6 @@
 
 #include <omp.h>
 
-#include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/impl/IDSelector.h>
 #include <faiss/impl/ScalarQuantizer.h>
diff --git a/faiss/MetaIndexes.cpp b/faiss/MetaIndexes.cpp
index afa9ecc355..cd022970a1 100644
--- a/faiss/MetaIndexes.cpp
+++ b/faiss/MetaIndexes.cpp
@@ -16,7 +16,6 @@
 
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
-#include <faiss/impl/IDSelector.h>
 #include <faiss/utils/Heap.h>
 #include <faiss/utils/WorkerThread.h>
 #include <faiss/utils/random.h>
diff --git a/faiss/gpu/GpuAutoTune.cpp b/faiss/gpu/GpuAutoTune.cpp
index 4a7ba5ffcb..3f7d72d0ec 100644
--- a/faiss/gpu/GpuAutoTune.cpp
+++ b/faiss/gpu/GpuAutoTune.cpp
@@ -17,10 +17,7 @@
 #include <faiss/gpu/GpuIndexFlat.h>
 #include <faiss/gpu/GpuIndexIVFFlat.h>
 #include <faiss/gpu/GpuIndexIVFPQ.h>
-#include <faiss/gpu/GpuIndexIVFScalarQuantizer.h>
 #include <faiss/gpu/impl/IndexUtils.h>
-#include <faiss/gpu/utils/DeviceUtils.h>
-#include <faiss/impl/FaissAssert.h>
 
 namespace faiss {
 namespace gpu {
diff --git a/faiss/gpu/GpuCloner.cpp b/faiss/gpu/GpuCloner.cpp
index b6d55a47aa..3c6ddeef52 100644
--- a/faiss/gpu/GpuCloner.cpp
+++ b/faiss/gpu/GpuCloner.cpp
@@ -34,8 +34,6 @@
 #include <faiss/gpu/GpuIndexIVFFlat.h>
 #include <faiss/gpu/GpuIndexIVFPQ.h>
 #include <faiss/gpu/GpuIndexIVFScalarQuantizer.h>
-#include <faiss/gpu/utils/DeviceUtils.h>
-#include <faiss/impl/FaissAssert.h>
 #include <faiss/index_io.h>
 
 namespace faiss {
diff --git a/faiss/gpu/perf/PerfIVFPQAdd.cpp b/faiss/gpu/perf/PerfIVFPQAdd.cpp
index 9842a5273f..a4c7be1854 100644
--- a/faiss/gpu/perf/PerfIVFPQAdd.cpp
+++ b/faiss/gpu/perf/PerfIVFPQAdd.cpp
@@ -14,7 +14,6 @@
 #include <faiss/gpu/utils/DeviceUtils.h>
 #include <faiss/gpu/utils/Timer.h>
 #include <gflags/gflags.h>
-#include <map>
 #include <vector>
 
 DEFINE_int32(batches, 10, "number of batches of vectors to add");
diff --git a/faiss/impl/AdditiveQuantizer.cpp b/faiss/impl/AdditiveQuantizer.cpp
index 42d37f32a9..102b7a037f 100644
--- a/faiss/impl/AdditiveQuantizer.cpp
+++ b/faiss/impl/AdditiveQuantizer.cpp
@@ -24,7 +24,6 @@
 #include <faiss/utils/Heap.h>
 #include <faiss/utils/distances.h>
 #include <faiss/utils/hamming.h>
-#include <faiss/utils/utils.h>
 
 extern "C" {
 
diff --git a/faiss/impl/HNSW.cpp b/faiss/impl/HNSW.cpp
index 277e194b3e..e3fa80c8dc 100644
--- a/faiss/impl/HNSW.cpp
+++ b/faiss/impl/HNSW.cpp
@@ -16,8 +16,6 @@
 #include <faiss/impl/ResultHandler.h>
 #include <faiss/utils/prefetch.h>
 
-#include <faiss/impl/platform_macros.h>
-
 #ifdef __AVX2__
 #include <immintrin.h>
 
diff --git a/faiss/impl/LocalSearchQuantizer.cpp b/faiss/impl/LocalSearchQuantizer.cpp
index 943fe32c9d..31a0e3f6cb 100644
--- a/faiss/impl/LocalSearchQuantizer.cpp
+++ b/faiss/impl/LocalSearchQuantizer.cpp
@@ -15,16 +15,13 @@
 
 #include <algorithm>
 
-#include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/utils/distances.h>
-#include <faiss/utils/hamming.h> // BitstringWriter
 #include <faiss/utils/utils.h>
 
 #include <faiss/utils/approx_topk/approx_topk.h>
 
 // this is needed for prefetching
-#include <faiss/impl/platform_macros.h>
 
 #ifdef __AVX2__
 #include <xmmintrin.h>
diff --git a/faiss/impl/ProductAdditiveQuantizer.cpp b/faiss/impl/ProductAdditiveQuantizer.cpp
index 1104b778a4..3a86e5589e 100644
--- a/faiss/impl/ProductAdditiveQuantizer.cpp
+++ b/faiss/impl/ProductAdditiveQuantizer.cpp
@@ -11,7 +11,6 @@
 #include <cstdio>
 #include <cstring>
 #include <memory>
-#include <random>
 
 #include <algorithm>
 
@@ -20,7 +19,6 @@
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/utils/distances.h>
 #include <faiss/utils/hamming.h>
-#include <faiss/utils/utils.h>
 
 extern "C" {
 
diff --git a/faiss/impl/ScalarQuantizer.cpp b/faiss/impl/ScalarQuantizer.cpp
index 528843f606..87f8f1462c 100644
--- a/faiss/impl/ScalarQuantizer.cpp
+++ b/faiss/impl/ScalarQuantizer.cpp
@@ -13,7 +13,6 @@
 #include <cstdio>
 
 #include <faiss/impl/platform_macros.h>
-#include <omp.h>
 
 #ifdef __SSE__
 #include <immintrin.h>
@@ -25,7 +24,6 @@
 #include <faiss/impl/IDSelector.h>
 #include <faiss/utils/bf16.h>
 #include <faiss/utils/fp16.h>
-#include <faiss/utils/utils.h>
 
 namespace faiss {
 
diff --git a/faiss/impl/index_read.cpp b/faiss/impl/index_read.cpp
index aa041c0fac..dc2b8bc0dc 100644
--- a/faiss/impl/index_read.cpp
+++ b/faiss/impl/index_read.cpp
@@ -12,12 +12,8 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/impl/io.h>
-#include <faiss/impl/io_macros.h>
 #include <faiss/utils/hamming.h>
 
 #include <faiss/invlists/InvertedListsIOHook.h>
diff --git a/faiss/impl/index_write.cpp b/faiss/impl/index_write.cpp
index 0a924d0225..d39ed42272 100644
--- a/faiss/impl/index_write.cpp
+++ b/faiss/impl/index_write.cpp
@@ -13,14 +13,9 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include <faiss/invlists/InvertedListsIOHook.h>
 
 #include <faiss/impl/FaissAssert.h>
-#include <faiss/impl/io.h>
-#include <faiss/impl/io_macros.h>
 #include <faiss/utils/hamming.h>
 
 #include <faiss/Index2Layer.h>
diff --git a/faiss/impl/kmeans1d.cpp b/faiss/impl/kmeans1d.cpp
index faa4fad84a..6f8bdf7a76 100644
--- a/faiss/impl/kmeans1d.cpp
+++ b/faiss/impl/kmeans1d.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <algorithm>
-#include <cstdint>
 #include <cstring>
 #include <functional>
 #include <numeric>
diff --git a/faiss/impl/lattice_Zn.cpp b/faiss/impl/lattice_Zn.cpp
index b5f9a657d4..eecf784884 100644
--- a/faiss/impl/lattice_Zn.cpp
+++ b/faiss/impl/lattice_Zn.cpp
@@ -16,7 +16,6 @@
 
 #include <algorithm>
 #include <queue>
-#include <unordered_map>
 #include <unordered_set>
 
 #include <faiss/impl/platform_macros.h>
diff --git a/faiss/impl/pq4_fast_scan.cpp b/faiss/impl/pq4_fast_scan.cpp
index 127646e0eb..4f34827161 100644
--- a/faiss/impl/pq4_fast_scan.cpp
+++ b/faiss/impl/pq4_fast_scan.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <faiss/impl/FaissAssert.h>
-#include <faiss/impl/platform_macros.h>
 #include <faiss/impl/pq4_fast_scan.h>
 #include <faiss/impl/simd_result_handlers.h>
 
diff --git a/faiss/impl/pq4_fast_scan_search_qbs.cpp b/faiss/impl/pq4_fast_scan_search_qbs.cpp
index bf2ccd1f76..a970871892 100644
--- a/faiss/impl/pq4_fast_scan_search_qbs.cpp
+++ b/faiss/impl/pq4_fast_scan_search_qbs.cpp
@@ -10,7 +10,6 @@
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/impl/LookupTableScaler.h>
 #include <faiss/impl/simd_result_handlers.h>
-#include <faiss/utils/simdlib.h>
 
 namespace faiss {
 
diff --git a/faiss/index_factory.cpp b/faiss/index_factory.cpp
index bfd703653b..e128abf105 100644
--- a/faiss/index_factory.cpp
+++ b/faiss/index_factory.cpp
@@ -11,7 +11,6 @@
 
 #include <faiss/index_factory.h>
 
-#include <cinttypes>
 #include <cmath>
 
 #include <map>
@@ -20,7 +19,6 @@
 
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/utils/random.h>
-#include <faiss/utils/utils.h>
 
 #include <faiss/Index2Layer.h>
 #include <faiss/IndexAdditiveQuantizer.h>
diff --git a/faiss/invlists/InvertedListsIOHook.cpp b/faiss/invlists/InvertedListsIOHook.cpp
index 0081c4f9a0..6b796a311d 100644
--- a/faiss/invlists/InvertedListsIOHook.cpp
+++ b/faiss/invlists/InvertedListsIOHook.cpp
@@ -9,7 +9,6 @@
 
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/impl/io.h>
-#include <faiss/impl/io_macros.h>
 
 #include <faiss/invlists/BlockInvertedLists.h>
 
diff --git a/faiss/invlists/OnDiskInvertedLists.cpp b/faiss/invlists/OnDiskInvertedLists.cpp
index 8565572a9b..b083caee73 100644
--- a/faiss/invlists/OnDiskInvertedLists.cpp
+++ b/faiss/invlists/OnDiskInvertedLists.cpp
@@ -15,7 +15,6 @@
 
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include <faiss/impl/FaissAssert.h>
diff --git a/faiss/utils/distances_fused/avx512.cpp b/faiss/utils/distances_fused/avx512.cpp
index d4c442c79b..0305b4e0db 100644
--- a/faiss/utils/distances_fused/avx512.cpp
+++ b/faiss/utils/distances_fused/avx512.cpp
@@ -6,7 +6,6 @@
  */
 
 // -*- c++ -*-
-
 #include <faiss/utils/distances_fused/avx512.h>
 
 #ifdef __AVX512F__
diff --git a/faiss/utils/distances_fused/distances_fused.cpp b/faiss/utils/distances_fused/distances_fused.cpp
index 2ba7e29014..ac1fa3d44d 100644
--- a/faiss/utils/distances_fused/distances_fused.cpp
+++ b/faiss/utils/distances_fused/distances_fused.cpp
@@ -7,8 +7,6 @@
 
 #include <faiss/utils/distances_fused/distances_fused.h>
 
-#include <faiss/impl/platform_macros.h>
-
 #include <faiss/utils/distances_fused/avx512.h>
 #include <faiss/utils/distances_fused/simdlib_based.h>
 
diff --git a/faiss/utils/distances_fused/simdlib_based.cpp b/faiss/utils/distances_fused/simdlib_based.cpp
index 309fb72118..764fe8bf99 100644
--- a/faiss/utils/distances_fused/simdlib_based.cpp
+++ b/faiss/utils/distances_fused/simdlib_based.cpp
@@ -14,7 +14,6 @@
 #include <faiss/utils/simdlib.h>
 
 #if defined(__AVX2__)
-#include <immintrin.h>
 #endif
 
 namespace faiss {
diff --git a/faiss/utils/extra_distances.cpp b/faiss/utils/extra_distances.cpp
index 69ee961c7f..0d4a2453ac 100644
--- a/faiss/utils/extra_distances.cpp
+++ b/faiss/utils/extra_distances.cpp
@@ -15,7 +15,6 @@
 
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/DistanceComputer.h>
-#include <faiss/impl/FaissAssert.h>
 #include <faiss/utils/utils.h>
 
 namespace faiss {
diff --git a/faiss/utils/utils.cpp b/faiss/utils/utils.cpp
index beae93ac16..8570cd95f5 100644
--- a/faiss/utils/utils.cpp
+++ b/faiss/utils/utils.cpp
@@ -15,8 +15,6 @@
 #include <cstdio>
 #include <cstring>
 
-#include <sys/types.h>
-
 #ifdef _MSC_VER
 #define NOMINMAX
 #include <windows.h>
@@ -35,7 +33,6 @@
 
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
-#include <faiss/impl/platform_macros.h>
 #include <faiss/utils/random.h>
 
 #ifndef FINTEGER
diff --git a/tests/test_approx_topk.cpp b/tests/test_approx_topk.cpp
index 4bdf8f6c27..e05984fd5d 100644
--- a/tests/test_approx_topk.cpp
+++ b/tests/test_approx_topk.cpp
@@ -17,7 +17,6 @@
 
 #include <faiss/utils/approx_topk/approx_topk.h>
 
-#include <faiss/impl/FaissAssert.h>
 #include <faiss/impl/FaissException.h>
 #include <faiss/utils/Heap.h>
 
diff --git a/tests/test_common_ivf_empty_index.cpp b/tests/test_common_ivf_empty_index.cpp
index a3e33031bd..d4e8ba87f4 100644
--- a/tests/test_common_ivf_empty_index.cpp
+++ b/tests/test_common_ivf_empty_index.cpp
@@ -2,7 +2,6 @@
 
 #include <gtest/gtest.h>
 
-#include <omp.h>
 #include <cstddef>
 #include <memory>
 #include <vector>
diff --git a/tests/test_cppcontrib_sa_decode.cpp b/tests/test_cppcontrib_sa_decode.cpp
index cb13e8bf95..be1e1eddbb 100644
--- a/tests/test_cppcontrib_sa_decode.cpp
+++ b/tests/test_cppcontrib_sa_decode.cpp
@@ -16,9 +16,7 @@
 #include <faiss/Index2Layer.h>
 #include <faiss/IndexIVFPQ.h>
 #include <faiss/IndexPQ.h>
-#include <faiss/impl/io.h>
 #include <faiss/index_factory.h>
-#include <faiss/index_io.h>
 
 #include <faiss/IndexRowwiseMinMax.h>
 #include <faiss/cppcontrib/SaDecodeKernels.h>
diff --git a/tests/test_dealloc_invlists.cpp b/tests/test_dealloc_invlists.cpp
index f1b69379a8..2fcb3a8913 100644
--- a/tests/test_dealloc_invlists.cpp
+++ b/tests/test_dealloc_invlists.cpp
@@ -18,7 +18,6 @@
 #include <faiss/IVFlib.h>
 #include <faiss/IndexIVF.h>
 #include <faiss/index_factory.h>
-#include <faiss/index_io.h>
 
 using namespace faiss;
 
diff --git a/tests/test_ivf_index.cpp b/tests/test_ivf_index.cpp
index b3786f597b..f3560b3f44 100644
--- a/tests/test_ivf_index.cpp
+++ b/tests/test_ivf_index.cpp
@@ -8,9 +8,6 @@
 #include <omp.h>
 #include <algorithm>
 #include <cstddef>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include <map>
 #include <random>
 #include <set>
@@ -20,7 +17,6 @@
 #include <faiss/IndexFlat.h>
 #include <faiss/IndexIVFFlat.h>
 #include <faiss/impl/FaissAssert.h>
-#include <faiss/index_io.h>
 
 namespace {
 
diff --git a/tests/test_ivfpq_codec.cpp b/tests/test_ivfpq_codec.cpp
index 9ea5ce8534..68b451bf72 100644
--- a/tests/test_ivfpq_codec.cpp
+++ b/tests/test_ivfpq_codec.cpp
@@ -16,7 +16,6 @@
 #include <faiss/IndexFlat.h>
 #include <faiss/IndexIVFPQ.h>
 #include <faiss/utils/distances.h>
-#include <faiss/utils/utils.h>
 
 namespace {
 
diff --git a/tests/test_ivfpq_indexing.cpp b/tests/test_ivfpq_indexing.cpp
index 334256096c..411642f751 100644
--- a/tests/test_ivfpq_indexing.cpp
+++ b/tests/test_ivfpq_indexing.cpp
@@ -13,7 +13,6 @@
 
 #include <faiss/IndexFlat.h>
 #include <faiss/IndexIVFPQ.h>
-#include <faiss/index_io.h>
 
 TEST(IVFPQ, accuracy) {
     // dimension of the vectors to index
diff --git a/tests/test_lowlevel_ivf.cpp b/tests/test_lowlevel_ivf.cpp
index 7ce90a1d2d..1583d63fb7 100644
--- a/tests/test_lowlevel_ivf.cpp
+++ b/tests/test_lowlevel_ivf.cpp
@@ -21,9 +21,7 @@
 #include <faiss/IndexBinaryIVF.h>
 #include <faiss/IndexIVF.h>
 #include <faiss/IndexPreTransform.h>
-#include <faiss/VectorTransform.h>
 #include <faiss/index_factory.h>
-#include <faiss/index_io.h>
 
 using namespace faiss;
 
diff --git a/tests/test_ondisk_ivf.cpp b/tests/test_ondisk_ivf.cpp
index 7c41e082f8..375c94c768 100644
--- a/tests/test_ondisk_ivf.cpp
+++ b/tests/test_ondisk_ivf.cpp
@@ -9,7 +9,6 @@
 #include <cstdlib>
 #include <random>
 
-#include <omp.h>
 #include <unistd.h>
 
 #include <pthread.h>
diff --git a/tests/test_transfer_invlists.cpp b/tests/test_transfer_invlists.cpp
index 309a331dda..097fbd2144 100644
--- a/tests/test_transfer_invlists.cpp
+++ b/tests/test_transfer_invlists.cpp
@@ -14,7 +14,6 @@
 #include <faiss/AutoTune.h>
 #include <faiss/IVFlib.h>
 #include <faiss/IndexIVFFlat.h>
-#include <faiss/VectorTransform.h>
 #include <faiss/clone_index.h>
 #include <faiss/impl/io.h>
 #include <faiss/index_factory.h>