From f3317ddcaa8af0fb7b4be475dc97ef0649d1975b Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Wed, 24 Jul 2024 11:55:43 +0200
Subject: turns: clean up includes and headers

---
 core/include/turns/core/disposition.hpp |  5 ++---
 core/include/turns/core/fwd.hpp         | 14 ++++++++++++++
 core/include/turns/core/participant.hpp |  5 ++---
 core/include/turns/core/turn_order.hpp  |  9 ++++-----
 4 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 core/include/turns/core/fwd.hpp

(limited to 'core/include')

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>
-- 
cgit v1.2.3