10 files changed, 25 insertions, 25 deletions
diff --git a/core/include/turns/core/disposition.hpp b/core/include/turns/core/disposition.hpp
index df9d641..92a7d03 100644
--- a/core/include/turns/core/disposition.hpp
+++ b/core/include/turns/core/disposition.hpp
@@ -1,9 +1,8 @@
-#ifndef TURNS_DOMAIN_DISPOSITION_HPP
-#define TURNS_DOMAIN_DISPOSITION_HPP
+#ifndef TURNS_CORE_DISPOSITION_HPP
+#define TURNS_CORE_DISPOSITION_HPP
 
 #include <glibmm/ustring.h>
 
-#include <compare>
 #include <cstdint>
 
 namespace turns::core
diff --git a/core/include/turns/core/fwd.hpp b/core/include/turns/core/fwd.hpp
new file mode 100644
index 0000000..deac497
--- /dev/null
+++ b/core/include/turns/core/fwd.hpp
@@ -0,0 +1,14 @@
+#ifndef TURNS_CORE_FWD_HPP
+#define TURNS_CORE_FWD_HPP
+
+#include <cstdint>
+
+namespace turns::core
+{
+  enum struct disposition : std::uint8_t;
+
+  struct participant;
+  struct turn_order;
+}
+
+#endif
+\ No newline at end of file
diff --git a/core/include/turns/core/participant.hpp b/core/include/turns/core/participant.hpp
index a0ad42b..8568b03 100644
--- a/core/include/turns/core/participant.hpp
+++ b/core/include/turns/core/participant.hpp
@@ -1,11 +1,10 @@
-#ifndef TURNS_DOMAIN_PARTICIPANT_HPP
-#define TURNS_DOMAIN_PARTICIPANT_HPP
+#ifndef TURNS_CORE_PARTICIPANT_HPP
+#define TURNS_CORE_PARTICIPANT_HPP
 
 #include "turns/core/disposition.hpp"
 
 #include <glibmm/object.h>
 #include <glibmm/property.h>
-#include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 
diff --git a/core/include/turns/core/turn_order.hpp b/core/include/turns/core/turn_order.hpp
index aeb0e6d..59cab84 100644
--- a/core/include/turns/core/turn_order.hpp
+++ b/core/include/turns/core/turn_order.hpp
@@ -1,16 +1,15 @@
-#ifndef TURNS_DOMAIN_TURN_ORDER_HPP
-#define TURNS_DOMAIN_TURN_ORDER_HPP
+#ifndef TURNS_CORE_TURN_ORDER_HPP
+#define TURNS_CORE_TURN_ORDER_HPP
 
-#include "turns/core/disposition.hpp"
-#include "turns/core/participant.hpp"
+#include "turns/core/fwd.hpp"
 
 #include <glibmm/property.h>
+#include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 
 #include <giomm/listmodel.h>
 
-#include <initializer_list>
 #include <limits>
 #include <optional>
 #include <vector>
diff --git a/core/src/participant.cpp b/core/src/participant.cpp
index aa97e83..24d1cff 100644
--- a/core/src/participant.cpp
+++ b/core/src/participant.cpp
@@ -1,10 +1,9 @@
 #include "turns/core/participant.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/refptr.h>
 
 #include <typeinfo>
-#include <utility>
+#include <compare>
 
 namespace turns::core
 {
diff --git a/core/src/turn_order.cpp b/core/src/turn_order.cpp
index 20eaa83..234f394 100644
--- a/core/src/turn_order.cpp
+++ b/core/src/turn_order.cpp
@@ -5,8 +5,6 @@
 #include <glibmm/refptr.h>
 
 #include <algorithm>
-#include <compare>
-#include <limits>
 #include <typeinfo>
 
 namespace turns::core
diff --git a/core/tests/disposition.cpp b/core/tests/disposition.cpp
index 56e4e46..e003f7e 100644
--- a/core/tests/disposition.cpp
+++ b/core/tests/disposition.cpp
@@ -6,7 +6,6 @@
 #include <glibmm/i18n.h>
 #include <glibmm/ustring.h>
 
-#include <compare>
 #include <format>
 #include <limits>
 #include <utility>
diff --git a/core/tests/participant.cpp b/core/tests/participant.cpp
index b969310..99e7fa4 100644
--- a/core/tests/participant.cpp
+++ b/core/tests/participant.cpp
@@ -4,8 +4,6 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <glibmm/init.h>
-
 #include <compare>
 
 namespace turns::core::tests
diff --git a/core/tests/turn_order.cpp b/core/tests/turn_order.cpp
index fc779d7..4caf174 100644
--- a/core/tests/turn_order.cpp
+++ b/core/tests/turn_order.cpp
@@ -4,8 +4,6 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <giomm/liststore.h>
-
 namespace turns::core::tests
 {
   SCENARIO("Queries on a fresh turn_order instance", "[turn_order]")
@@ -16,8 +14,7 @@ namespace turns::core::tests
 
       THEN("get_n_items() returns 0")
       {
-        auto str = Gio::ListStore<Glib::Object>::create();
-        REQUIRE(instance->get_n_items() == str->get_n_items());
+        REQUIRE(instance->get_n_items() == 0);
       }
 
       THEN("get_type() returns participant::get_type()")
diff --git a/core/tests/turn_order_bugs.cpp b/core/tests/turn_order_bugs.cpp
index 0fa0720..d5502bc 100644
--- a/core/tests/turn_order_bugs.cpp
+++ b/core/tests/turn_order_bugs.cpp
@@ -1,10 +1,8 @@
-#include "turns/core/participant.hpp"
+#include "turns/core/disposition.hpp"
 #include "turns/core/turn_order.hpp"
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <giomm/liststore.h>
-
 namespace turns::core::tests
 {
   /**