diff --git a/benchmarks/dds_replay_main.cpp b/benchmarks/dds_replay_main.cpp
index 7924e38e7..e2c766682 100644
--- a/benchmarks/dds_replay_main.cpp
+++ b/benchmarks/dds_replay_main.cpp
@@ -19,10 +19,13 @@
 
 #include <algorithm>
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
+#include <map>
 #include <set>
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include "recording.hpp"
diff --git a/benchmarks/recording.cpp b/benchmarks/recording.cpp
index f62436fa5..74c2504b2 100644
--- a/benchmarks/recording.cpp
+++ b/benchmarks/recording.cpp
@@ -9,8 +9,12 @@
 #include "recording.hpp"
 
 #include <cstdio>
+#include <cstdlib>
 #include <fstream>
 #include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace dds_replay {
 
diff --git a/benchmarks/replay.cpp b/benchmarks/replay.cpp
index 4ba16db33..976ae31e4 100644
--- a/benchmarks/replay.cpp
+++ b/benchmarks/replay.cpp
@@ -11,12 +11,15 @@
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
+#include <cstddef>
 #include <memory>
 #include <mutex>
+#include <string>
 #include <thread>
 
 #include <api/dds_c_api.h>
 #include <api/dll.h>
+#include <vector>
 
 namespace dds_replay {
 
diff --git a/benchmarks/warm_tt_benchmark.cpp b/benchmarks/warm_tt_benchmark.cpp
index 312ca9595..535d86b75 100644
--- a/benchmarks/warm_tt_benchmark.cpp
+++ b/benchmarks/warm_tt_benchmark.cpp
@@ -36,6 +36,8 @@
 #include <chrono>
 #include <cstdio>
 #include <random>
+#include <ratio>
+#include <utility>
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/library/src/ab_search.cpp b/library/src/ab_search.cpp
index 7306688f5..a055f4bba 100644
--- a/library/src/ab_search.cpp
+++ b/library/src/ab_search.cpp
@@ -11,6 +11,7 @@
 
 #include "ab_search.hpp"
 #include <ab_stats.hpp>
+#include <cstddef>
 #include <dump.hpp>
 #include <later_tricks.hpp>
 #include <quick_tricks.hpp>
diff --git a/library/src/ab_stats.cpp b/library/src/ab_stats.cpp
index 3940ca27f..866d2ee3f 100644
--- a/library/src/ab_stats.cpp
+++ b/library/src/ab_stats.cpp
@@ -11,8 +11,10 @@
    ABstats is a simple object for AB statistics and return values.
 */
 
+#include <fstream>
 #include <iomanip>
 #include <iostream>
+#include <string>
 
 #include "ab_stats.hpp"
 
diff --git a/library/src/dds_api.cpp b/library/src/dds_api.cpp
index a10973a61..841aac9a6 100644
--- a/library/src/dds_api.cpp
+++ b/library/src/dds_api.cpp
@@ -7,6 +7,7 @@
 
 #include <api/dds_api.hpp>
 #include <api/calc_par.hpp>
+#include <string>
 
 // Creation
 DLLEXPORT DDS_SOLVER_CTX dds_create_solvercontext_default()
diff --git a/library/src/dump.cpp b/library/src/dump.cpp
index eb7419c70..2ef42df6c 100644
--- a/library/src/dump.cpp
+++ b/library/src/dump.cpp
@@ -10,12 +10,15 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
+#include <memory>
 #include <sstream>
 
 #include "dump.hpp"
 #include <solver_context/solver_context.hpp>
+#include <string>
 #include <trans_table/trans_table.hpp>
 #include <utility/debug.h>
+#include <vector>
 
 
 std::string PrintSuit(const unsigned short suitCode);
diff --git a/library/src/init.cpp b/library/src/init.cpp
index c9900ad11..57492bd52 100644
--- a/library/src/init.cpp
+++ b/library/src/init.cpp
@@ -7,9 +7,12 @@
    See LICENSE and README.
 */
 
+#include <algorithm>
 #include <cstring>
 #include <cstdio>
 #include <iomanip>
+#include <ios>
+#include <memory>
 #include <sstream>
 
 #include <calc_tables.hpp>
@@ -18,6 +21,7 @@
 #include <solve_board.hpp>
 #include <lookup_tables/lookup_tables.hpp>
 #include <solver_context/solver_context.hpp>
+#include <string>
 #include <system/scheduler.hpp>
 #include <system/system.hpp>
 #include <system/thread_mgr.hpp>
diff --git a/library/src/later_tricks.cpp b/library/src/later_tricks.cpp
index 98102dcb5..6c1b7b52c 100644
--- a/library/src/later_tricks.cpp
+++ b/library/src/later_tricks.cpp
@@ -10,6 +10,7 @@
 #include <algorithm>
 
 #include "later_tricks.hpp"
+#include <cstdio>
 #include <solver_context/solver_context.hpp>
 
 
diff --git a/library/src/play_analyser.cpp b/library/src/play_analyser.cpp
index e6852196d..d9c8e916f 100644
--- a/library/src/play_analyser.cpp
+++ b/library/src/play_analyser.cpp
@@ -13,6 +13,7 @@
 #include <solver_context/solver_context.hpp>
 #include <system/scheduler.hpp>
 #include <system/system.hpp>
+#include <vector>
 
 using namespace std;
 
diff --git a/library/src/solve_board.cpp b/library/src/solve_board.cpp
index b81280f3c..575d141f7 100644
--- a/library/src/solve_board.cpp
+++ b/library/src/solve_board.cpp
@@ -18,6 +18,7 @@
 #include <system/scheduler.hpp>
 #include <system/system.hpp>
 #include <utility/debug.h>
+#include <vector>
 
 
 extern Scheduler scheduler;
diff --git a/library/src/solver_context/solver_context.cpp b/library/src/solver_context/solver_context.cpp
index 1370949ed..8344caff3 100644
--- a/library/src/solver_context/solver_context.cpp
+++ b/library/src/solver_context/solver_context.cpp
@@ -2,8 +2,10 @@
 
 #include <algorithm>
 #include <atomic>
+#include <cstdint>
 #include <cstdio>
 #include <cstdlib>
+#include <fstream>
 #include <iostream>
 #include <memory>
 #include <string>
diff --git a/library/src/solver_if.cpp b/library/src/solver_if.cpp
index 6bf8c4711..125706e29 100644
--- a/library/src/solver_if.cpp
+++ b/library/src/solver_if.cpp
@@ -13,6 +13,7 @@
 #include "solver_if.hpp"
 #include <api/solve_board.hpp>
 #include <lookup_tables/lookup_tables.hpp>
+#include <memory>
 #include <solver_context/solver_context.hpp>
 #include <system/scheduler.hpp>
 #include <system/system.hpp>
diff --git a/library/src/system/file.cpp b/library/src/system/file.cpp
index 79255ad00..98d6b1172 100644
--- a/library/src/system/file.cpp
+++ b/library/src/system/file.cpp
@@ -8,6 +8,7 @@
 */
 
 #include "file.hpp"
+#include <fstream>
 
 dds::File::~File()
 {
diff --git a/library/src/system/memory.cpp b/library/src/system/memory.cpp
index c76544cdc..206b9310c 100644
--- a/library/src/system/memory.cpp
+++ b/library/src/system/memory.cpp
@@ -10,6 +10,7 @@
 
 #include "memory.hpp"
 #include <cstdlib>
+#include <string>
 #include <trans_table/trans_table.hpp>
 
 // After moving ThreadData ownership into SolverContext, Memory no longer
diff --git a/library/src/system/parallel_boards.cpp b/library/src/system/parallel_boards.cpp
index 5621a4b94..306336f4b 100644
--- a/library/src/system/parallel_boards.cpp
+++ b/library/src/system/parallel_boards.cpp
@@ -12,10 +12,13 @@
 #include <algorithm>
 #include <atomic>
 #include <condition_variable>
+#include <cstddef>
 #include <cstdint>
+#include <functional>
 #include <memory>
 #include <mutex>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #if defined(__EMSCRIPTEN__)
diff --git a/library/src/system/scheduler.cpp b/library/src/system/scheduler.cpp
index 5e2618b26..342c0956a 100644
--- a/library/src/system/scheduler.cpp
+++ b/library/src/system/scheduler.cpp
@@ -15,6 +15,8 @@
 #include "scheduler.hpp"
 #include <fstream>
 #include <iomanip>
+#include <utility>
+#include <vector>
 #ifdef DDS_SCHEDULER
 #include <system/time_stat_list.hpp>
 
diff --git a/library/src/system/system.cpp b/library/src/system/system.cpp
index 9f827a8b4..6a7ce9e82 100644
--- a/library/src/system/system.cpp
+++ b/library/src/system/system.cpp
@@ -7,8 +7,11 @@
    See LICENSE and README.
 */
 
+#include <cstdio>
 #include <cstring>
+#include <string>
 #include <thread>
+#include <vector>
 
 #if defined(__linux__) || defined(__APPLE__) || defined(__unix__)
   #include <unistd.h>
diff --git a/library/src/system/thread_data.cpp b/library/src/system/thread_data.cpp
index f788e5697..7b7d40725 100644
--- a/library/src/system/thread_data.cpp
+++ b/library/src/system/thread_data.cpp
@@ -1,5 +1,6 @@
 // ThreadData instance methods implementation
 #include "thread_data.hpp"
+#include <string>
 #include <utility/debug.h>
 
 using std::string;
diff --git a/library/src/system/thread_mgr.cpp b/library/src/system/thread_mgr.cpp
index a5a1d6b30..eda63bf95 100644
--- a/library/src/system/thread_mgr.cpp
+++ b/library/src/system/thread_mgr.cpp
@@ -13,6 +13,7 @@
 #include <fstream>
 #include <mutex>
 #include <chrono>
+#include <string>
 #include <thread>
 
 #include "thread_mgr.hpp"
diff --git a/library/src/system/time_stat.cpp b/library/src/system/time_stat.cpp
index c8e2f80be..bd652ec50 100644
--- a/library/src/system/time_stat.cpp
+++ b/library/src/system/time_stat.cpp
@@ -12,6 +12,7 @@
 #include <iomanip>
 #include <sstream>
 #include <cmath>
+#include <string>
 
 #include "time_stat.hpp"
 
diff --git a/library/src/system/timer.cpp b/library/src/system/timer.cpp
index 8206fc04e..fb1e351b1 100644
--- a/library/src/system/timer.cpp
+++ b/library/src/system/timer.cpp
@@ -8,8 +8,11 @@
 */
 
 
+#include <chrono>
+#include <ctime>
 #include <iostream>
 #include <iomanip>
+#include <ratio>
 #include <sstream>
 
 #include "timer.hpp"
diff --git a/library/src/system/timer_group.cpp b/library/src/system/timer_group.cpp
index 5f38583e4..0f40fe0a5 100644
--- a/library/src/system/timer_group.cpp
+++ b/library/src/system/timer_group.cpp
@@ -7,6 +7,8 @@
    See LICENSE and README.
 */
 
+#include <cstddef>
+#include <string>
 #define TIMER_DEPTH 50
 
 #include <iostream>
diff --git a/library/src/system/timer_list.cpp b/library/src/system/timer_list.cpp
index ea75aa791..2363c5b8f 100644
--- a/library/src/system/timer_list.cpp
+++ b/library/src/system/timer_list.cpp
@@ -13,6 +13,8 @@
 */
 
 #include "timer_list.hpp"
+#include <fstream>
+#include <ostream>
 
 
 TimerList::TimerList()
diff --git a/library/src/trans_table/trans_table_l.cpp b/library/src/trans_table/trans_table_l.cpp
index 0a7d69cac..e8dea203c 100644
--- a/library/src/trans_table/trans_table_l.cpp
+++ b/library/src/trans_table/trans_table_l.cpp
@@ -82,12 +82,16 @@
 #include <array>
 #include <cmath>
 #include <cstdlib>
+#include <fstream>
 #include <iomanip>
+#include <ios>
 #include <new>
 
 #include "trans_table_l.hpp"
 
+#include <string>
 #include <utility/constants.h>
+#include <vector>
 
 namespace
 {
diff --git a/library/src/trans_table/trans_table_s.cpp b/library/src/trans_table/trans_table_s.cpp
index 73f92ab2a..a765b63c7 100644
--- a/library/src/trans_table/trans_table_s.cpp
+++ b/library/src/trans_table/trans_table_s.cpp
@@ -9,10 +9,12 @@
 
 #include <array>
 #include <cstdlib>
+#include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <new>
 #include <api/dds.h>
+#include <string>
 
 #include "trans_table_s.hpp"
 
diff --git a/library/tests/TestTimer.cpp b/library/tests/TestTimer.cpp
index 0ce169f13..28a1b9c38 100644
--- a/library/tests/TestTimer.cpp
+++ b/library/tests/TestTimer.cpp
@@ -8,9 +8,12 @@
 */
 
 
+#include <chrono>
 #include <ctime>
 #include <iostream>
 #include <iomanip>
+#include <ratio>
+#include <string>
 
 #include "TestTimer.hpp"
 
diff --git a/library/tests/ab_search/make3_test.cpp b/library/tests/ab_search/make3_test.cpp
index 715fbefa5..c5509f35f 100644
--- a/library/tests/ab_search/make3_test.cpp
+++ b/library/tests/ab_search/make3_test.cpp
@@ -11,6 +11,7 @@
 #include <ab_search.hpp>
 #include <api/dds.h>
 #include <api/dll.h>
+#include <memory>
 #include <solver_context/solver_context.hpp>
 #include <system/memory.hpp>
 #include <utility/constants.h>
diff --git a/library/tests/ab_search/tt_lookup_test.cpp b/library/tests/ab_search/tt_lookup_test.cpp
index e871b2899..998125d7c 100644
--- a/library/tests/ab_search/tt_lookup_test.cpp
+++ b/library/tests/ab_search/tt_lookup_test.cpp
@@ -11,6 +11,7 @@
 #include <ab_search.hpp>
 #include <api/dds.h>
 #include <api/dll.h>
+#include <memory>
 #include <solver_context/solver_context.hpp>
 #include <system/memory.hpp>
 #include <trans_table/trans_table.hpp>
diff --git a/library/tests/args.cpp b/library/tests/args.cpp
index c59c259c5..b71db9518 100644
--- a/library/tests/args.cpp
+++ b/library/tests/args.cpp
@@ -13,6 +13,7 @@
 
 #include <iostream>
 #include <iomanip>
+#include <string>
 #include <vector>
 #include <algorithm>
 #include <cctype>
diff --git a/library/tests/args_test.cpp b/library/tests/args_test.cpp
index 9451aa28e..1ac1ad2d3 100644
--- a/library/tests/args_test.cpp
+++ b/library/tests/args_test.cpp
@@ -8,6 +8,7 @@
 #include <filesystem>
 #include <fstream>
 #include <string>
+#include <system_error>
 #include <vector>
 
 #ifdef _WIN32
diff --git a/library/tests/dds_c_api_test.cpp b/library/tests/dds_c_api_test.cpp
index fb64cc387..507d34767 100644
--- a/library/tests/dds_c_api_test.cpp
+++ b/library/tests/dds_c_api_test.cpp
@@ -15,6 +15,7 @@
 
 #include <gtest/gtest.h>
 
+#include <cstdio>
 #include <cstring>
 
 #include <api/dds_c_api.h>
diff --git a/library/tests/dtest.cpp b/library/tests/dtest.cpp
index 785983036..0ee849aa9 100644
--- a/library/tests/dtest.cpp
+++ b/library/tests/dtest.cpp
@@ -8,6 +8,7 @@
 */
 
 
+#include <cstdlib>
 #include <iostream>
 #if defined(__linux__) || defined(__APPLE__) || defined(__unix__)
   #include <unistd.h>
diff --git a/library/tests/dtest_parallel.cpp b/library/tests/dtest_parallel.cpp
index 778bf26fd..4d496deb6 100644
--- a/library/tests/dtest_parallel.cpp
+++ b/library/tests/dtest_parallel.cpp
@@ -11,6 +11,7 @@
 
 #include <algorithm>
 #include <atomic>
+#include <functional>
 #include <thread>
 #include <vector>
 
diff --git a/library/tests/heuristic_sorting/minimal_weight_test.cpp b/library/tests/heuristic_sorting/minimal_weight_test.cpp
index 76ecb6bca..9e9fb160b 100644
--- a/library/tests/heuristic_sorting/minimal_weight_test.cpp
+++ b/library/tests/heuristic_sorting/minimal_weight_test.cpp
@@ -6,6 +6,7 @@
  * without segmentation faults on minimal input data.
  */
 
+#include <cstring>
 #include <gtest/gtest.h>
 #include <iostream>
 #include "heuristic_sorting/heuristic_sorting.hpp"
diff --git a/library/tests/heuristic_sorting/test_utils.cpp b/library/tests/heuristic_sorting/test_utils.cpp
index 15f947266..f807b65f9 100644
--- a/library/tests/heuristic_sorting/test_utils.cpp
+++ b/library/tests/heuristic_sorting/test_utils.cpp
@@ -6,6 +6,7 @@
 #include "test_utils.hpp"
 #include <sstream>
 #include <cstring>
+#include <string>
 #include <vector>
 #include <algorithm>
 
diff --git a/library/tests/loop.cpp b/library/tests/loop.cpp
index 908d146cd..cceb9bbc5 100644
--- a/library/tests/loop.cpp
+++ b/library/tests/loop.cpp
@@ -8,6 +8,8 @@
 */
 
 
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <iomanip>
 #include <iostream>
diff --git a/library/tests/loop_par_test.cpp b/library/tests/loop_par_test.cpp
index 67b6d3b72..ab054b432 100644
--- a/library/tests/loop_par_test.cpp
+++ b/library/tests/loop_par_test.cpp
@@ -6,6 +6,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <fstream>
+#include <ios>
 #include <regex>
 #include <sstream>
 #include <string>
diff --git a/library/tests/moves/moves_test.cpp b/library/tests/moves/moves_test.cpp
index c6aacee46..4144567ac 100644
--- a/library/tests/moves/moves_test.cpp
+++ b/library/tests/moves/moves_test.cpp
@@ -10,7 +10,9 @@
  * - Edge cases and invariant violations
  */
 
+#include <cctype>
 #include <gtest/gtest.h>
+#include <memory>
 #include <vector>
 #include <cstring>
 #include <chrono>
diff --git a/library/tests/parse.cpp b/library/tests/parse.cpp
index 72820e63c..6a7662e63 100644
--- a/library/tests/parse.cpp
+++ b/library/tests/parse.cpp
@@ -7,6 +7,7 @@
    See LICENSE and README.
 */
 
+#include <cstdlib>
 #include <iostream>
 #include <fstream>
 #include <vector>
diff --git a/library/tests/print.cpp b/library/tests/print.cpp
index 76cbc9f6c..68d146a82 100644
--- a/library/tests/print.cpp
+++ b/library/tests/print.cpp
@@ -11,6 +11,7 @@
 #include <iostream>
 #include <iomanip>
 #include <algorithm>
+#include <string>
 
 #include "print.hpp"
 
diff --git a/library/tests/regression/heuristic_sorting/heuristic_sorting_test.cpp b/library/tests/regression/heuristic_sorting/heuristic_sorting_test.cpp
index a1661b04f..4d68dd8b1 100644
--- a/library/tests/regression/heuristic_sorting/heuristic_sorting_test.cpp
+++ b/library/tests/regression/heuristic_sorting/heuristic_sorting_test.cpp
@@ -5,6 +5,7 @@
 /// heuristics maintain expected priority and consistency across scenarios.
 
 #include <algorithm>
+#include <cstddef>
 #include <gtest/gtest.h>
 #include <vector>
 
diff --git a/library/tests/report_board_timings.cpp b/library/tests/report_board_timings.cpp
index eb3a3b85c..79e981327 100644
--- a/library/tests/report_board_timings.cpp
+++ b/library/tests/report_board_timings.cpp
@@ -7,7 +7,11 @@
 #include <cmath>
 #include <cstdlib>
 #include <iomanip>
+#include <ios>
+#include <ostream>
 #include <sstream>
+#include <utility>
+#include <vector>
 
 namespace
 {
diff --git a/library/tests/report_board_timings_test.cpp b/library/tests/report_board_timings_test.cpp
index a2913dad0..3060031db 100644
--- a/library/tests/report_board_timings_test.cpp
+++ b/library/tests/report_board_timings_test.cpp
@@ -4,6 +4,7 @@
 #include <gtest/gtest.h>
 
 #include <iomanip>
+#include <ios>
 #include <sstream>
 #include <string>
 #include <utility>
diff --git a/library/tests/solve_board/analyse_play_consistency.cpp b/library/tests/solve_board/analyse_play_consistency.cpp
index abb5c4aa7..217e0e956 100644
--- a/library/tests/solve_board/analyse_play_consistency.cpp
+++ b/library/tests/solve_board/analyse_play_consistency.cpp
@@ -13,6 +13,7 @@
 #include <cstring>
 #include <random>
 #include <string>
+#include <utility>
 #include <vector>
 
 // Third-party headers
diff --git a/library/tests/system/parallel_boards_test.cpp b/library/tests/system/parallel_boards_test.cpp
index ddaa6d97f..c5571ae36 100644
--- a/library/tests/system/parallel_boards_test.cpp
+++ b/library/tests/system/parallel_boards_test.cpp
@@ -1,6 +1,7 @@
 #include <array>
 #include <atomic>
 #include <chrono>
+#include <cstdint>
 #include <cstdlib>
 #include <functional>
 #include <future>
@@ -8,6 +9,7 @@
 #include <new>
 #include <stdexcept>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/library/tests/test_timer_test.cpp b/library/tests/test_timer_test.cpp
index 202c19d6c..ca115219f 100644
--- a/library/tests/test_timer_test.cpp
+++ b/library/tests/test_timer_test.cpp
@@ -5,6 +5,7 @@
 #include <ctime>
 #include <gtest/gtest.h>
 #include <iomanip>
+#include <ios>
 #include <limits>
 #include <regex>
 #include <sstream>
diff --git a/library/tests/testcommon.cpp b/library/tests/testcommon.cpp
index af0a04828..5edefe1ee 100644
--- a/library/tests/testcommon.cpp
+++ b/library/tests/testcommon.cpp
@@ -8,8 +8,11 @@
 */
 
 
+#include <cstddef>
+#include <cstdlib>
 #include <iostream>
 #include <iomanip>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/library/tests/trans_table/mock_data_generators.cpp b/library/tests/trans_table/mock_data_generators.cpp
index 260665c89..84b39763c 100644
--- a/library/tests/trans_table/mock_data_generators.cpp
+++ b/library/tests/trans_table/mock_data_generators.cpp
@@ -6,7 +6,11 @@
 
 // C++ standard library headers
 #include <algorithm>
+#include <array>
 #include <iostream>
+#include <random>
+#include <utility>
+#include <vector>
 
 namespace dds_test {
 
diff --git a/library/tests/trans_table/test_utilities.cpp b/library/tests/trans_table/test_utilities.cpp
index 4a0ac01cc..560e7613b 100644
--- a/library/tests/trans_table/test_utilities.cpp
+++ b/library/tests/trans_table/test_utilities.cpp
@@ -6,10 +6,12 @@
 
 // C++ standard library headers
 #include <algorithm>
+#include <chrono>
 #include <cstdlib>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
+#include <string>
 
 namespace dds_test {
 
diff --git a/library/tests/trans_table/trans_table_base_test.cpp b/library/tests/trans_table/trans_table_base_test.cpp
index 53ac4e8e2..8834a91cf 100644
--- a/library/tests/trans_table/trans_table_base_test.cpp
+++ b/library/tests/trans_table/trans_table_base_test.cpp
@@ -3,6 +3,8 @@
 /// @details Tests virtual methods, polymorphism, and base class interface.
 
 // C++ standard library headers
+#include <cstdio>
+#include <fstream>
 #include <memory>
 
 // Third-party headers
diff --git a/library/tests/trans_table/trans_table_l_test.cpp b/library/tests/trans_table/trans_table_l_test.cpp
index b529e3a65..1d0b98ac7 100644
--- a/library/tests/trans_table/trans_table_l_test.cpp
+++ b/library/tests/trans_table/trans_table_l_test.cpp
@@ -1,5 +1,9 @@
+#include <algorithm>
+#include <cstdint>
+#include <cstdlib>
 #include <gtest/gtest.h>
 #include <cstring>
+#include <ios>
 
 // Include DDS types first
 #include <api/dll.h>
diff --git a/library/tests/trans_table/trans_table_s_test.cpp b/library/tests/trans_table/trans_table_s_test.cpp
index cda883ccf..fa226f080 100644
--- a/library/tests/trans_table/trans_table_s_test.cpp
+++ b/library/tests/trans_table/trans_table_s_test.cpp
@@ -1,3 +1,4 @@
+#include <cstdlib>
 #include <gtest/gtest.h>
 #include <cstring>
 
diff --git a/python/src/bindings.cpp b/python/src/bindings.cpp
index 9a3ec97fe..571effa67 100644
--- a/python/src/bindings.cpp
+++ b/python/src/bindings.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <array>
+#include <cstddef>
 #include <memory>
 #include <stdexcept>
 #include <string>
diff --git a/python/src/converters.cpp b/python/src/converters.cpp
index 620c4c2b0..ace27cbf1 100644
--- a/python/src/converters.cpp
+++ b/python/src/converters.cpp
@@ -4,6 +4,8 @@
 #include <cstring>
 
 #include <pybind11/pybind11.h>
+#include <string>
+#include <vector>
 
 namespace py = pybind11;
 
diff --git a/utilities/src/dd_table_for_deal/dd_table_for_deal_lib.cpp b/utilities/src/dd_table_for_deal/dd_table_for_deal_lib.cpp
index f97eb3374..98ee81261 100644
--- a/utilities/src/dd_table_for_deal/dd_table_for_deal_lib.cpp
+++ b/utilities/src/dd_table_for_deal/dd_table_for_deal_lib.cpp
@@ -17,9 +17,12 @@
 #include <iostream>
 #include <istream>
 #include <limits>
+#include <optional>
 #include <regex>
 #include <string>
+#include <string_view>
 #include <unordered_set>
+#include <vector>
 
 namespace dd_table_for_deal {
 namespace {
diff --git a/utilities/tests/dd_table_for_deal_test.cpp b/utilities/tests/dd_table_for_deal_test.cpp
index f73399589..e1a2b2cd5 100644
--- a/utilities/tests/dd_table_for_deal_test.cpp
+++ b/utilities/tests/dd_table_for_deal_test.cpp
@@ -11,6 +11,7 @@
 
 #include <filesystem>
 #include <fstream>
+#include <ios>
 #include <sstream>
 
 #include <api/dll.h>