From 9788441819dcc524285a88febb7da62006d72b53 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 15 Sep 2022 19:40:34 -0400
Subject: Clean up includes

---
 chilbert/chilbert.hpp        |  2 +-
 test/bench_bitvec.cpp        | 11 ++++++++---
 test/bench_hilbert.cpp       | 10 +++++++---
 test/test_bitvec.cpp         |  3 +++
 test/test_gray_code_rank.cpp |  4 ++--
 test/test_hilbert.cpp        |  9 ++++++++-
 6 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/chilbert/chilbert.hpp b/chilbert/chilbert.hpp
index e8d10f4..c55fc14 100644
--- a/chilbert/chilbert.hpp
+++ b/chilbert/chilbert.hpp
@@ -91,6 +91,6 @@ inline void compact_index_to_coords(P&            p,
 
 } // namespace chilbert
 
-#include "chilbert/chilbert.ipp"
+#include "chilbert/chilbert.ipp" // IWYU pragma: export
 
 #endif
diff --git a/test/bench_bitvec.cpp b/test/bench_bitvec.cpp
index 741b2d2..3c7d7f6 100644
--- a/test/bench_bitvec.cpp
+++ b/test/bench_bitvec.cpp
@@ -16,13 +16,18 @@
 */
 
 #include "bench_utils.hpp"
+#include "test_utils.hpp"
 
-#include "chilbert/BoundedBitVec.hpp"
-#include "chilbert/DynamicBitVec.hpp"
+#include "chilbert/BoundedBitVec.hpp" // IWYU pragma: keep
+#include "chilbert/DynamicBitVec.hpp" // IWYU pragma: keep
 #include "chilbert/SmallBitVec.hpp"
-#include "chilbert/StaticBitVec.hpp"
+#include "chilbert/StaticBitVec.hpp" // IWYU pragma: keep
 
+#include <array>
+#include <cstddef>
 #include <fstream>
+#include <string>
+#include <vector>
 
 template <class T, size_t N>
 struct BenchAnd
diff --git a/test/bench_hilbert.cpp b/test/bench_hilbert.cpp
index e216efe..52c12dc 100644
--- a/test/bench_hilbert.cpp
+++ b/test/bench_hilbert.cpp
@@ -16,14 +16,18 @@
 */
 
 #include "bench_utils.hpp"
+#include "test_utils.hpp"
 
-#include "chilbert/BoundedBitVec.hpp"
-#include "chilbert/DynamicBitVec.hpp"
+#include "chilbert/BoundedBitVec.hpp" // IWYU pragma: keep
+#include "chilbert/DynamicBitVec.hpp" // IWYU pragma: keep
 #include "chilbert/SmallBitVec.hpp"
-#include "chilbert/StaticBitVec.hpp"
+#include "chilbert/StaticBitVec.hpp" // IWYU pragma: keep
 #include "chilbert/chilbert.hpp"
 
+#include <array>
+#include <cstddef>
 #include <fstream>
+#include <string>
 
 template <class H, size_t M, size_t D>
 struct BenchCoordsToIndex
diff --git a/test/test_bitvec.cpp b/test/test_bitvec.cpp
index 7b8a55f..a0e8b5b 100644
--- a/test/test_bitvec.cpp
+++ b/test/test_bitvec.cpp
@@ -23,9 +23,12 @@
 #include "chilbert/DynamicBitVec.hpp"
 #include "chilbert/SmallBitVec.hpp"
 #include "chilbert/StaticBitVec.hpp"
+#include "chilbert/detail/operations.hpp"
+#include "chilbert/operators.hpp"
 
 #include <cassert>
 #include <cstddef>
+#include <cstdlib>
 
 template <class T, size_t N>
 void
diff --git a/test/test_gray_code_rank.cpp b/test/test_gray_code_rank.cpp
index 9c903c1..05f1ae1 100644
--- a/test/test_gray_code_rank.cpp
+++ b/test/test_gray_code_rank.cpp
@@ -24,13 +24,13 @@
 #include "chilbert/SmallBitVec.hpp"
 #include "chilbert/StaticBitVec.hpp"
 #include "chilbert/detail/gray_code_rank.hpp"
+#include "chilbert/detail/operations.hpp"
+#include "chilbert/operators.hpp"
 
 #include <algorithm>
 #include <array>
 #include <cassert>
 #include <cstddef>
-#include <cstdint>
-#include <iostream>
 #include <iterator>
 
 template <class T, size_t Max, size_t D>
diff --git a/test/test_hilbert.cpp b/test/test_hilbert.cpp
index 5d1f52a..ac4bba1 100644
--- a/test/test_hilbert.cpp
+++ b/test/test_hilbert.cpp
@@ -23,10 +23,17 @@
 #include "chilbert/DynamicBitVec.hpp"
 #include "chilbert/SmallBitVec.hpp"
 #include "chilbert/StaticBitVec.hpp"
-#include "chilbert/chilbert.hpp"
+#include "chilbert/chilbert.ipp"
 
+#include <gmp.h>
 #include <gmpxx.h>
 
+#include <array>
+#include <cassert>
+#include <climits>
+#include <cstddef>
+#include <cstdint>
+
 /// Return a `D`-dimensional point within `ms` per-dimension precision
 template <size_t D>
 std::array<uint64_t, D>
-- 
cgit v1.2.1