7 files changed, 24 insertions, 7 deletions
diff --git a/core/include/turns/core/fwd.hpp b/core/include/turns/core/fwd.hpp
index deac497..1646d4b 100644
--- a/core/include/turns/core/fwd.hpp
+++ b/core/include/turns/core/fwd.hpp
@@ -9,6 +9,6 @@ namespace turns::core
 
   struct participant;
   struct turn_order;
-}
+}  // namespace turns::core
 
 #endif
 \ No newline at end of file
diff --git a/core/include/turns/core/turn_order.hpp b/core/include/turns/core/turn_order.hpp
index a617312..52a7268 100644
--- a/core/include/turns/core/turn_order.hpp
+++ b/core/include/turns/core/turn_order.hpp
@@ -3,6 +3,7 @@
 
 #include "turns/core/fwd.hpp"
 
+#include <glibmm/object.h>
 #include <glibmm/property.h>
 #include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
@@ -10,12 +11,13 @@
 
 #include <giomm/listmodel.h>
 
+#include <glib-object.h>
+#include <nlohmann/json_fwd.hpp>
+
 #include <limits>
 #include <optional>
 #include <vector>
 
-#include <nlohmann/json_fwd.hpp>
-
 namespace turns::core
 {
 
diff --git a/core/src/disposition.cpp b/core/src/disposition.cpp
index 4eec33e..81fb410 100644
--- a/core/src/disposition.cpp
+++ b/core/src/disposition.cpp
@@ -1,6 +1,7 @@
 #include "turns/core/disposition.hpp"
 
 #include <glibmm/i18n.h>
+#include <glibmm/ustring.h>
 
 namespace turns::core
 {
diff --git a/core/src/participant.cpp b/core/src/participant.cpp
index 6b69754..63df96e 100644
--- a/core/src/participant.cpp
+++ b/core/src/participant.cpp
@@ -1,8 +1,12 @@
 #include "turns/core/participant.hpp"
 
+#include "turns/core/disposition.hpp"
 #include "turns/core/json_ext.hpp"
 
+#include <glibmm/object.h>
+#include <glibmm/objectbase.h>
 #include <glibmm/refptr.h>
+#include <glibmm/ustring.h>
 
 #include <nlohmann/json.hpp>
 
diff --git a/core/src/turn_order.cpp b/core/src/turn_order.cpp
index 3fb25d1..e7b92db 100644
--- a/core/src/turn_order.cpp
+++ b/core/src/turn_order.cpp
@@ -1,16 +1,28 @@
 #include "turns/core/turn_order.hpp"
 
+#include "turns/core/disposition.hpp"
 #include "turns/core/json_ext.hpp"
 #include "turns/core/participant.hpp"
 
+#include <sigc++/adaptors/bind.h>
+#include <sigc++/functors/mem_fun.h>
+
+#include <glibmm/objectbase.h>
+#include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
+#include <glibmm/ustring.h>
+
+#include <giomm/listmodel.h>
 
+#include <glib-object.h>
 #include <nlohmann/json.hpp>
 
 #include <algorithm>
 #include <functional>
+#include <iterator>
 #include <ranges>
 #include <typeinfo>
+#include <vector>
 
 using namespace std::placeholders;
 
@@ -22,10 +34,6 @@ namespace turns::core
     auto constexpr comparator = [](auto lhs, auto rhs) {
       return *lhs > *rhs;
     };
-
-    auto constexpr equal_comparator = [](auto lhs, auto rhs) {
-      return (lhs->get_name() == rhs->get_name()) && (lhs->get_priority() && rhs->get_priority());
-    };
   }  // namespace
 
   /** Construction */
diff --git a/core/tests/disposition.cpp b/core/tests/disposition.cpp
index e003f7e..fda605c 100644
--- a/core/tests/disposition.cpp
+++ b/core/tests/disposition.cpp
@@ -8,6 +8,7 @@
 
 #include <format>
 #include <limits>
+#include <type_traits>
 #include <utility>
 
 namespace turns::core::tests
diff --git a/core/tests/turn_order.cpp b/core/tests/turn_order.cpp
index 4caf174..b4958c5 100644
--- a/core/tests/turn_order.cpp
+++ b/core/tests/turn_order.cpp
@@ -1,5 +1,6 @@
 #include "turns/core/turn_order.hpp"
 
+#include "turns/core/disposition.hpp"
 #include "turns/core/participant.hpp"
 
 #include <catch2/catch_test_macros.hpp>