6 files changed, 15 insertions, 18 deletions
diff --git a/app/src/application.cpp b/app/src/application.cpp
index f8156aa..211d7d9 100644
--- a/app/src/application.cpp
+++ b/app/src/application.cpp
@@ -3,13 +3,11 @@
 #include "turns/app/widgets/turn_order_view.hpp"
 #include "turns/app/windows/tracker.hpp"
 
-#include <sigc++/functors/functors.h>
-
-#include <glibmm/wrap.h>
+#include <sigc++/functors/mem_fun.h>
 
+#include <gtkmm/application.h>
 #include <gtkmm/builder.h>
 #include <gtkmm/init.h>
-#include <gtkmm/window.h>
 
 namespace turns::app
 {
diff --git a/app/src/main.cpp b/app/src/main.cpp
index 6a8a3d1..9ec90d2 100644
--- a/app/src/main.cpp
+++ b/app/src/main.cpp
@@ -2,8 +2,6 @@
 
 #include <glibmm/i18n.h>
 
-#include <adwaita.h>
-
 auto main(int argc, char * argv[]) -> int
 {
   setlocale(LC_ALL, "");
diff --git a/app/src/widgets/participant_row.cpp b/app/src/widgets/participant_row.cpp
index 81d9e31..c04eee0 100644
--- a/app/src/widgets/participant_row.cpp
+++ b/app/src/widgets/participant_row.cpp
@@ -1,16 +1,16 @@
 #include "turns/app/widgets/participant_row.hpp"
 
+#include "turns/core/disposition.hpp"
+#include "turns/core/participant.hpp"
 #include "turns/lang/messages.hpp"
 
+#include <glibmm/binding.h>
 #include <glibmm/i18n.h>
 #include <glibmm/ustring.h>
 #include <glibmm/variant.h>
 
-#include <gtkmm/stringlist.h>
-
 #include <algorithm>
 #include <format>
-#include <vector>
 
 namespace turns::app::widgets
 {
diff --git a/app/src/widgets/turn_order_view.cpp b/app/src/widgets/turn_order_view.cpp
index 82ef4e5..9e69127 100644
--- a/app/src/widgets/turn_order_view.cpp
+++ b/app/src/widgets/turn_order_view.cpp
@@ -2,13 +2,14 @@
 
 #include "turns/app/widgets/participant_row.hpp"
 #include "turns/core/participant.hpp"
-#include "turns/lang/messages.hpp"
-
-#include <algorithm>
-#include <format>
+#include "turns/core/turn_order.hpp"
 
 #include <sigc++/functors/mem_fun.h>
 
+#include <glibmm/binding.h>
+
+#include <memory>
+
 namespace turns::app::widgets
 {
   namespace
diff --git a/app/src/windows/participant_editor.cpp b/app/src/windows/participant_editor.cpp
index af75537..1c8d05c 100644
--- a/app/src/windows/participant_editor.cpp
+++ b/app/src/windows/participant_editor.cpp
@@ -1,6 +1,7 @@
 #include "turns/app/windows/participant_editor.hpp"
 
 #include "turns/core/disposition.hpp"
+#include "turns/core/participant.hpp"
 #include "turns/lang/messages.hpp"
 
 #include <glibmm/i18n.h>
diff --git a/app/src/windows/tracker.cpp b/app/src/windows/tracker.cpp
index 8c5d02c..7188968 100644
--- a/app/src/windows/tracker.cpp
+++ b/app/src/windows/tracker.cpp
@@ -1,17 +1,16 @@
 #include "turns/app/windows/tracker.hpp"
 
-#include "turns/app/widgets/participant_row.hpp"
 #include "turns/app/windows/participant_editor.hpp"
+#include "turns/core/participant.hpp"
+#include "turns/core/turn_order.hpp"
 #include "turns/lang/messages.hpp"
 
+#include <glibmm/binding.h>
 #include <glibmm/i18n.h>
 
-#include <gtkmm/stringobject.h>
-
 #include <adwaita.h>
 
-#include <format>
-#include <ranges>
+#include <utility>
 
 namespace turns::app::windows
 {