diff --git a/app/src/matchmaking/sprt/sprt.cpp b/app/src/matchmaking/sprt/sprt.cpp
index fd989a484..f5b179e7b 100644
--- a/app/src/matchmaking/sprt/sprt.cpp
+++ b/app/src/matchmaking/sprt/sprt.cpp
@@ -3,6 +3,10 @@
 #include <cmath>
 #include <iomanip>
 #include <sstream>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <core/logger/logger.hpp>
 #include <matchmaking/stats.hpp>
diff --git a/app/src/matchmaking/tournament/base/tournament.cpp b/app/src/matchmaking/tournament/base/tournament.cpp
index 851e02f67..edf39b3b6 100644
--- a/app/src/matchmaking/tournament/base/tournament.cpp
+++ b/app/src/matchmaking/tournament/base/tournament.cpp
@@ -1,5 +1,12 @@
 #include <matchmaking/tournament/base/tournament.hpp>
 
+#include <atomic>
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <affinity/affinity_manager.hpp>
 #include <core/filesystem/file_writer.hpp>
 #include <core/logger/logger.hpp>
diff --git a/app/src/matchmaking/tournament/base/tournament.hpp b/app/src/matchmaking/tournament/base/tournament.hpp
index 90de7dc24..404beab53 100644
--- a/app/src/matchmaking/tournament/base/tournament.hpp
+++ b/app/src/matchmaking/tournament/base/tournament.hpp
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <atomic>
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include <affinity/affinity_manager.hpp>
diff --git a/app/src/matchmaking/tournament/roundrobin/roundrobin.cpp b/app/src/matchmaking/tournament/roundrobin/roundrobin.cpp
index 770e5e545..f0becdcd4 100644
--- a/app/src/matchmaking/tournament/roundrobin/roundrobin.cpp
+++ b/app/src/matchmaking/tournament/roundrobin/roundrobin.cpp
@@ -1,5 +1,13 @@
 #include <matchmaking/tournament/roundrobin/roundrobin.hpp>
 
+#include <atomic>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <thread>
+#include <utility>
+#include <vector>
+
 #include <chess.hpp>
 
 #include <core/logger/logger.hpp>
diff --git a/app/src/matchmaking/tournament/roundrobin/roundrobin.hpp b/app/src/matchmaking/tournament/roundrobin/roundrobin.hpp
index 1284dbf99..76a4e3446 100644
--- a/app/src/matchmaking/tournament/roundrobin/roundrobin.hpp
+++ b/app/src/matchmaking/tournament/roundrobin/roundrobin.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <atomic>
+#include <mutex>
+#include <vector>
+
 #include <affinity/affinity_manager.hpp>
 #include <core/filesystem/file_writer.hpp>
 #include <core/memory/cache.hpp>
diff --git a/app/src/matchmaking/tournament/roundrobin/scheduler.hpp b/app/src/matchmaking/tournament/roundrobin/scheduler.hpp
index c6526bcfe..175eb4a86 100644
--- a/app/src/matchmaking/tournament/roundrobin/scheduler.hpp
+++ b/app/src/matchmaking/tournament/roundrobin/scheduler.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <core/config/config.hpp>
 #include <optional>
 #include <tuple>
 #include <vector>
 
+#include <core/config/config.hpp>
 #include <game/book/opening_book.hpp>
 #include <matchmaking/tournament/schedule/scheduler.hpp>