From 9d18485db854f4d430e7c45d9538330b21dd66c3 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Fri, 25 Apr 2025 11:56:28 +0200
Subject: adw: perform basic code cleanup

---
 adw/src/actionrow.cpp                   | 51 +++++++++++++++++++--------------
 adw/src/alertdialog.cpp                 | 19 ++++++------
 adw/src/application.cpp                 | 10 +++++--
 adw/src/applicationwindow.cpp           | 14 ++++-----
 adw/src/breakpoint.cpp                  | 12 ++++----
 adw/src/dialog.cpp                      | 12 ++++----
 adw/src/enums.cpp                       |  8 +++++-
 adw/src/helpers/async_callback.cpp      |  6 ++++
 adw/src/preferencesdialog.cpp           | 17 ++++-------
 adw/src/preferencespage.cpp             | 14 ++++-----
 adw/src/preferencesrow.cpp              | 13 ++++-----
 adw/src/private/actionrow_p.cpp         |  7 ++++-
 adw/src/private/alertdialog_p.cpp       |  9 ++++--
 adw/src/private/application_p.cpp       |  9 +++++-
 adw/src/private/applicationwindow_p.cpp |  9 +++++-
 adw/src/private/breakpoint_p.cpp        | 10 +++++++
 adw/src/private/dialog_p.cpp            |  8 +++++-
 adw/src/private/preferencesdialog_p.cpp |  9 ++++--
 adw/src/private/preferencespage_p.cpp   |  8 +++++-
 adw/src/private/preferencesrow_p.cpp    |  7 +++++
 adw/src/private/stylemanager_p.cpp      |  9 ++++++
 adw/src/private/switch_row_p.cpp        | 32 ---------------------
 adw/src/private/switchrow_p.cpp         | 41 ++++++++++++++++++++++++++
 adw/src/private/toast_p.cpp             | 10 +++++++
 adw/src/private/toastoverlay_p.cpp      |  7 ++++-
 adw/src/stylemanager.cpp                | 19 ++++++------
 adw/src/switchrow.cpp                   | 12 ++++----
 adw/src/toast.cpp                       | 10 ++++---
 adw/src/toastoverlay.cpp                | 15 ++++------
 adw/src/wrap_init.cpp                   | 24 ++++++++++------
 30 files changed, 269 insertions(+), 162 deletions(-)
 delete mode 100644 adw/src/private/switch_row_p.cpp
 create mode 100644 adw/src/private/switchrow_p.cpp

(limited to 'adw/src')

diff --git a/adw/src/actionrow.cpp b/adw/src/actionrow.cpp
index 8242a6e..9c33aec 100644
--- a/adw/src/actionrow.cpp
+++ b/adw/src/actionrow.cpp
@@ -1,33 +1,42 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/actionrow.hpp"
-#include "adwaitamm/private/actionrow_p.hpp"
 
 #include "adwaitamm/preferencesrow.hpp"
+#include "adwaitamm/private/actionrow_p.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 #include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
-#include <glibmm/utility.h>
 #include <glibmm/wrap.h>
 
-#include <gtkmm/init.h>
-#include <gtkmm/listboxrow.h>
-#include <gtkmm/object.h>
-#include <gtkmm/private/widget_p.h>
 #include <gtkmm/widget.h>
 
-#include <adwaita.h>
 #include <glib-object.h>
 #include <glib.h>
-#include <gtk/gtk.h>
 
 namespace Adwaita
+
 {
   namespace
   {
     auto constinit _class = ActionRow_Class{};
+
+    namespace property_name
+    {
+      auto constexpr activatable_widget = "activatable-widget";
+      auto constexpr icon_name = "icon-name";
+      auto constexpr subtitle = "subtitle";
+      auto constexpr subtitle_lines = "subtitle-lines";
+      auto constexpr subtitle_selectable = "subtitle-selectable";
+      auto constexpr title_lines = "title-lines";
+    }  // namespace property_name
   }  // namespace
 
   auto ActionRow::get_type() -> GType
@@ -139,62 +148,62 @@ namespace Adwaita
 
   auto ActionRow::property_activatable_widget() noexcept -> Glib::PropertyProxy<Gtk::Widget *>
   {
-    return Glib::PropertyProxy<Gtk::Widget *>(this, "activatable-widget");
+    return Glib::PropertyProxy<Gtk::Widget *>(this, property_name::activatable_widget);
   }
 
   auto ActionRow::property_activatable_widget() const noexcept -> Glib::PropertyProxy_ReadOnly<Gtk::Widget *>
   {
-    return Glib::PropertyProxy_ReadOnly<Gtk::Widget *>(this, "activatable-widget");
+    return Glib::PropertyProxy_ReadOnly<Gtk::Widget *>(this, property_name::activatable_widget);
   }
 
   auto ActionRow::property_icon_name() noexcept -> Glib::PropertyProxy<Glib::ustring>
   {
-    return Glib::PropertyProxy<Glib::ustring>(this, "icon-name");
+    return Glib::PropertyProxy<Glib::ustring>(this, property_name::icon_name);
   }
 
   auto ActionRow::property_icon_name() const noexcept -> Glib::PropertyProxy_ReadOnly<Glib::ustring>
   {
-    return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "icon-name");
+    return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, property_name::icon_name);
   }
 
   auto ActionRow::property_subtitle() noexcept -> Glib::PropertyProxy<Glib::ustring>
   {
-    return Glib::PropertyProxy<Glib::ustring>(this, "subtitle");
+    return Glib::PropertyProxy<Glib::ustring>(this, property_name::subtitle);
   }
 
   auto ActionRow::property_subtitle() const noexcept -> Glib::PropertyProxy_ReadOnly<Glib::ustring>
   {
-    return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "subtitle");
+    return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, property_name::subtitle);
   }
 
   auto ActionRow::property_subtitle_lines() noexcept -> Glib::PropertyProxy<int>
   {
-    return Glib::PropertyProxy<int>(this, "subtitle-lines");
+    return Glib::PropertyProxy<int>(this, property_name::subtitle_lines);
   }
 
   auto ActionRow::property_subtitle_lines() const noexcept -> Glib::PropertyProxy_ReadOnly<int>
   {
-    return Glib::PropertyProxy_ReadOnly<int>(this, "subtitle-lines");
+    return Glib::PropertyProxy_ReadOnly<int>(this, property_name::subtitle_lines);
   }
 
   auto ActionRow::property_subtitle_selectable() noexcept -> Glib::PropertyProxy<bool>
   {
-    return Glib::PropertyProxy<bool>(this, "subtitle-selectable");
+    return Glib::PropertyProxy<bool>(this, property_name::subtitle_selectable);
   }
 
   auto ActionRow::property_subtitle_selectable() const noexcept -> Glib::PropertyProxy_ReadOnly<bool>
   {
-    return Glib::PropertyProxy_ReadOnly<bool>(this, "subtitle-selectable");
+    return Glib::PropertyProxy_ReadOnly<bool>(this, property_name::subtitle_selectable);
   }
 
   auto ActionRow::property_title_lines() noexcept -> Glib::PropertyProxy<int>
   {
-    return Glib::PropertyProxy<int>(this, "title-lines");
+    return Glib::PropertyProxy<int>(this, property_name::title_lines);
   }
 
   auto ActionRow::property_title_lines() const noexcept -> Glib::PropertyProxy_ReadOnly<int>
   {
-    return Glib::PropertyProxy_ReadOnly<int>(this, "title-lines");
+    return Glib::PropertyProxy_ReadOnly<int>(this, property_name::title_lines);
   }
 
 }  // namespace Adwaita
diff --git a/adw/src/alertdialog.cpp b/adw/src/alertdialog.cpp
index 24c5705..0e91e68 100644
--- a/adw/src/alertdialog.cpp
+++ b/adw/src/alertdialog.cpp
@@ -1,10 +1,15 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/alertdialog.hpp"
-#include "adwaitamm/private/alertdialog_p.hpp"
 
 #include "adwaitamm/dialog.hpp"
+#include "adwaitamm/helpers/async_callback.hpp"
+#include "adwaitamm/private/alertdialog_p.hpp"
 
-#include <glibmm/class.h>
-#include <glibmm/exceptionhandler.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 #include <glibmm/refptr.h>
@@ -15,17 +20,9 @@
 #include <giomm/asyncresult.h>
 #include <giomm/cancellable.h>
 
-#include <gtkmm/init.h>
-#include <gtkmm/object.h>
-#include <gtkmm/private/widget_p.h>
 #include <gtkmm/widget.h>
 
-#include <adwaitamm/helpers/async_callback.hpp>
-
-#include <adwaita.h>
 #include <glib-object.h>
-#include <glib.h>
-#include <gtk/gtk.h>
 
 namespace Adwaita
 {
diff --git a/adw/src/application.cpp b/adw/src/application.cpp
index 55caff5..a50d133 100644
--- a/adw/src/application.cpp
+++ b/adw/src/application.cpp
@@ -1,6 +1,12 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/application.hpp"
-#include "adwaitamm/private/application_p.hpp"
 
+#include "adwaitamm/private/application_p.hpp"
 #include "adwaitamm/wrap_init.hpp"
 
 #include <glibmm/class.h>
@@ -8,13 +14,13 @@
 #include <glibmm/objectbase.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
+#include <glibmm/utility.h>
 #include <glibmm/wrap.h>
 
 #include <giomm/application.h>
 
 #include <gtkmm/application.h>
 #include <gtkmm/init.h>
-#include <gtkmm/private/application_p.h>
 
 #include <adwaita.h>
 #include <gio/gio.h>
diff --git a/adw/src/applicationwindow.cpp b/adw/src/applicationwindow.cpp
index 50817d2..5b01cfb 100644
--- a/adw/src/applicationwindow.cpp
+++ b/adw/src/applicationwindow.cpp
@@ -1,22 +1,20 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/applicationwindow.hpp"
 
 #include "adwaitamm/private/applicationwindow_p.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-#include <glibmm/utility.h>
 #include <glibmm/wrap.h>
 
 #include <gtkmm/application.h>
 #include <gtkmm/applicationwindow.h>
-#include <gtkmm/init.h>
-#include <gtkmm/object.h>
-#include <gtkmm/private/applicationwindow_p.h>
 
-#include <adwaita.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
diff --git a/adw/src/breakpoint.cpp b/adw/src/breakpoint.cpp
index e19db41..be275e1 100644
--- a/adw/src/breakpoint.cpp
+++ b/adw/src/breakpoint.cpp
@@ -1,19 +1,21 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/breakpoint.hpp"
-#include "adwaitamm/private/breakpoint_p.hpp"
 
 #include "adwaitamm/enums.hpp"
+#include "adwaitamm/private/breakpoint_p.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
-#include <glibmm/private/object_p.h>
 #include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 #include <glibmm/wrap.h>
 
-#include <gtkmm/buildable.h>
-
 #include <glib-object.h>
 
 #include <optional>
diff --git a/adw/src/dialog.cpp b/adw/src/dialog.cpp
index 6f34d3d..c31fb8a 100644
--- a/adw/src/dialog.cpp
+++ b/adw/src/dialog.cpp
@@ -1,9 +1,14 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/dialog.hpp"
 
 #include "adwaitamm/breakpoint.hpp"
 #include "adwaitamm/private/dialog_p.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 #include <glibmm/refptr.h>
@@ -11,13 +16,8 @@
 #include <glibmm/utility.h>
 #include <glibmm/wrap.h>
 
-#include <gtkmm/init.h>
-#include <gtkmm/object.h>
-#include <gtkmm/private/widget_p.h>
-#include <gtkmm/shortcutmanager.h>
 #include <gtkmm/widget.h>
 
-#include <adwaita.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
diff --git a/adw/src/enums.cpp b/adw/src/enums.cpp
index 9261387..bcc8290 100644
--- a/adw/src/enums.cpp
+++ b/adw/src/enums.cpp
@@ -1,6 +1,12 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/enums.hpp"
 
-#include <adwaitamm/stylemanager.hpp>
+#include "adwaitamm/stylemanager.hpp"
 
 #include <adwaita.h>
 #include <glib-object.h>
diff --git a/adw/src/helpers/async_callback.cpp b/adw/src/helpers/async_callback.cpp
index 4f148f0..f8a8b27 100644
--- a/adw/src/helpers/async_callback.cpp
+++ b/adw/src/helpers/async_callback.cpp
@@ -1,3 +1,9 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/helpers/async_callback.hpp"
 
 #include <glibmm/exceptionhandler.h>
diff --git a/adw/src/preferencesdialog.cpp b/adw/src/preferencesdialog.cpp
index 19c9e35..3d70ed5 100644
--- a/adw/src/preferencesdialog.cpp
+++ b/adw/src/preferencesdialog.cpp
@@ -1,25 +1,20 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/preferencesdialog.hpp"
 
 #include "adwaitamm/dialog.hpp"
 #include "adwaitamm/preferencespage.hpp"
 #include "adwaitamm/private/preferencesdialog_p.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-#include <glibmm/utility.h>
 #include <glibmm/wrap.h>
 
-#include <gtkmm/init.h>
-#include <gtkmm/object.h>
-#include <gtkmm/private/widget_p.h>
-#include <gtkmm/widget.h>
-
-#include <adwaita.h>
 #include <glib-object.h>
-#include <gtk/gtk.h>
 
 namespace Adwaita
 {
diff --git a/adw/src/preferencespage.cpp b/adw/src/preferencespage.cpp
index 0c10d97..8ad9e8c 100644
--- a/adw/src/preferencespage.cpp
+++ b/adw/src/preferencespage.cpp
@@ -1,21 +1,19 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/preferencespage.hpp"
 
 #include "adwaitamm/private/preferencespage_p.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-#include <glibmm/utility.h>
 #include <glibmm/wrap.h>
 
-#include <gtkmm/init.h>
-#include <gtkmm/object.h>
-#include <gtkmm/private/widget_p.h>
 #include <gtkmm/widget.h>
 
-#include <adwaita.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
diff --git a/adw/src/preferencesrow.cpp b/adw/src/preferencesrow.cpp
index e54bebe..898903f 100644
--- a/adw/src/preferencesrow.cpp
+++ b/adw/src/preferencesrow.cpp
@@ -1,22 +1,21 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/preferencesrow.hpp"
 
 #include "adwaitamm/private/preferencesrow_p.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 #include <glibmm/propertyproxy.h>
-#include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
-#include <glibmm/utility.h>
 #include <glibmm/wrap.h>
 
-#include <gtkmm/init.h>
 #include <gtkmm/listboxrow.h>
-#include <gtkmm/object.h>
-#include <gtkmm/private/listboxrow_p.h>
 
-#include <adwaita.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
diff --git a/adw/src/private/actionrow_p.cpp b/adw/src/private/actionrow_p.cpp
index 843c330..4a31bc8 100644
--- a/adw/src/private/actionrow_p.cpp
+++ b/adw/src/private/actionrow_p.cpp
@@ -1,7 +1,12 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/actionrow_p.hpp"
 
 #include "adwaitamm/actionrow.hpp"
-#include "adwaitamm/private/preferencesrow_p.hpp"  // IWYU pragma: keep - Required for CppClassParent::
 
 #include <glibmm/class.h>
 #include <glibmm/objectbase.h>
diff --git a/adw/src/private/alertdialog_p.cpp b/adw/src/private/alertdialog_p.cpp
index 524446f..51cba24 100644
--- a/adw/src/private/alertdialog_p.cpp
+++ b/adw/src/private/alertdialog_p.cpp
@@ -1,14 +1,17 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/alertdialog_p.hpp"
 
 #include "adwaitamm/alertdialog.hpp"
 
 #include <glibmm/class.h>
-#include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 
 #include <gtkmm/object.h>
-#include <gtkmm/private/widget_p.h>
-#include <gtkmm/shortcutmanager.h>
 
 #include <adwaita.h>
 
diff --git a/adw/src/private/application_p.cpp b/adw/src/private/application_p.cpp
index 62a0b98..5b841a0 100644
--- a/adw/src/private/application_p.cpp
+++ b/adw/src/private/application_p.cpp
@@ -1,13 +1,20 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/application_p.hpp"
 
 #include "adwaitamm/application.hpp"
 
 #include <glibmm/class.h>
-#include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 
 #include <gtkmm/private/application_p.h>
 
+#include <adwaita.h>
+
 namespace Adwaita
 {
   auto Application_Class::init() -> Glib::Class const &
diff --git a/adw/src/private/applicationwindow_p.cpp b/adw/src/private/applicationwindow_p.cpp
index b2ba636..b5d2b19 100644
--- a/adw/src/private/applicationwindow_p.cpp
+++ b/adw/src/private/applicationwindow_p.cpp
@@ -1,13 +1,20 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/applicationwindow_p.hpp"
 
 #include "adwaitamm/applicationwindow.hpp"
 
 #include <glibmm/class.h>
-#include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 
 #include <gtkmm/private/applicationwindow_p.h>
 
+#include <adwaita.h>
+
 namespace Adwaita
 {
   auto ApplicationWindow_Class::init() -> Glib::Class const &
diff --git a/adw/src/private/breakpoint_p.cpp b/adw/src/private/breakpoint_p.cpp
index 5a41a31..ed3dda6 100644
--- a/adw/src/private/breakpoint_p.cpp
+++ b/adw/src/private/breakpoint_p.cpp
@@ -1,11 +1,21 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/breakpoint_p.hpp"
 
 #include "adwaitamm/breakpoint.hpp"
 
 #include <glibmm/class.h>
 #include <glibmm/objectbase.h>
+#include <glibmm/private/object_p.h>
+
 #include <gtkmm/buildable.h>
 
+#include <adwaita.h>
+
 namespace Adwaita
 {
   auto Breakpoint_Class::init() -> Glib::Class const &
diff --git a/adw/src/private/dialog_p.cpp b/adw/src/private/dialog_p.cpp
index da19ddc..e6ac6cd 100644
--- a/adw/src/private/dialog_p.cpp
+++ b/adw/src/private/dialog_p.cpp
@@ -1,9 +1,15 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/dialog_p.hpp"
 
 #include "adwaitamm/dialog.hpp"
 
 #include <glibmm/class.h>
-#include <glibmm/object.h>
+#include <glibmm/objectbase.h>
 
 #include <gtkmm/object.h>
 #include <gtkmm/private/widget_p.h>
diff --git a/adw/src/private/preferencesdialog_p.cpp b/adw/src/private/preferencesdialog_p.cpp
index f114fa9..14e1aa7 100644
--- a/adw/src/private/preferencesdialog_p.cpp
+++ b/adw/src/private/preferencesdialog_p.cpp
@@ -1,14 +1,17 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/preferencesdialog_p.hpp"
 
 #include "adwaitamm/preferencesdialog.hpp"
 
 #include <glibmm/class.h>
-#include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 
 #include <gtkmm/object.h>
-#include <gtkmm/private/widget_p.h>
-#include <gtkmm/shortcutmanager.h>
 
 #include <adwaita.h>
 
diff --git a/adw/src/private/preferencespage_p.cpp b/adw/src/private/preferencespage_p.cpp
index b9d9c59..0a7cd74 100644
--- a/adw/src/private/preferencespage_p.cpp
+++ b/adw/src/private/preferencespage_p.cpp
@@ -1,9 +1,15 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/preferencespage_p.hpp"
 
 #include "adwaitamm/preferencespage.hpp"
 
 #include <glibmm/class.h>
-#include <glibmm/object.h>
+#include <glibmm/objectbase.h>
 
 #include <gtkmm/object.h>
 #include <gtkmm/private/widget_p.h>
diff --git a/adw/src/private/preferencesrow_p.cpp b/adw/src/private/preferencesrow_p.cpp
index fd5909e..5823d7e 100644
--- a/adw/src/private/preferencesrow_p.cpp
+++ b/adw/src/private/preferencesrow_p.cpp
@@ -1,8 +1,15 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/preferencesrow_p.hpp"
 
 #include "adwaitamm/preferencesrow.hpp"
 
 #include <glibmm/class.h>
+#include <glibmm/objectbase.h>
 
 #include <gtkmm/object.h>
 #include <gtkmm/private/listboxrow_p.h>
diff --git a/adw/src/private/stylemanager_p.cpp b/adw/src/private/stylemanager_p.cpp
index f35c6da..336444a 100644
--- a/adw/src/private/stylemanager_p.cpp
+++ b/adw/src/private/stylemanager_p.cpp
@@ -1,9 +1,18 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/stylemanager_p.hpp"
 
 #include "adwaitamm/stylemanager.hpp"
 
 #include <glibmm/class.h>
 #include <glibmm/objectbase.h>
+#include <glibmm/private/object_p.h>
+
+#include <adwaita.h>
 
 namespace Adwaita
 {
diff --git a/adw/src/private/switch_row_p.cpp b/adw/src/private/switch_row_p.cpp
deleted file mode 100644
index 71fdf5b..0000000
--- a/adw/src/private/switch_row_p.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "adwaitamm/private/switchrow_p.hpp"
-#include "adwaitamm/switchrow.hpp"
-
-#include <glibmm/class.h>
-#include <glibmm/object.h>
-#include <glibmm/objectbase.h>
-
-#include <gtkmm/object.h>
-
-namespace Adwaita
-{
-  auto SwitchRow_Class::init() -> Glib::Class const &
-  {
-    if (!gtype_)
-    {
-      class_init_func_ = &class_init_function;
-      gtype_ = adw_switch_row_get_type();
-    }
-    return *this;
-  }
-
-  auto SwitchRow_Class::class_init_function(void * gclass, void * data) -> void
-  {
-    auto const klass = static_cast<BaseClassType *>(gclass);
-    CppClassParent::class_init_function(klass, data);
-  }
-
-  auto SwitchRow_Class::wrap_new(GObject * object) -> Glib::ObjectBase *
-  {
-    return Gtk::manage(new SwitchRow(ADW_SWITCH_ROW(object)));
-  }
-}  // namespace Adwaita
\ No newline at end of file
diff --git a/adw/src/private/switchrow_p.cpp b/adw/src/private/switchrow_p.cpp
new file mode 100644
index 0000000..0f071c4
--- /dev/null
+++ b/adw/src/private/switchrow_p.cpp
@@ -0,0 +1,41 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#include "adwaitamm/private/switchrow_p.hpp"
+
+#include "adwaitamm/switchrow.hpp"
+
+#include <glibmm/class.h>
+#include <glibmm/object.h>
+#include <glibmm/objectbase.h>
+
+#include <gtkmm/object.h>
+
+#include <adwaita.h>
+
+namespace Adwaita
+{
+  auto SwitchRow_Class::init() -> Glib::Class const &
+  {
+    if (!gtype_)
+    {
+      class_init_func_ = &class_init_function;
+      gtype_ = adw_switch_row_get_type();
+    }
+    return *this;
+  }
+
+  auto SwitchRow_Class::class_init_function(void * gclass, void * data) -> void
+  {
+    auto const klass = static_cast<BaseClassType *>(gclass);
+    CppClassParent::class_init_function(klass, data);
+  }
+
+  auto SwitchRow_Class::wrap_new(GObject * object) -> Glib::ObjectBase *
+  {
+    return Gtk::manage(new SwitchRow(ADW_SWITCH_ROW(object)));
+  }
+}  // namespace Adwaita
\ No newline at end of file
diff --git a/adw/src/private/toast_p.cpp b/adw/src/private/toast_p.cpp
index 7138835..e83bc10 100644
--- a/adw/src/private/toast_p.cpp
+++ b/adw/src/private/toast_p.cpp
@@ -1,8 +1,18 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/toast_p.hpp"
 
 #include "adwaitamm/toast.hpp"
 
 #include <glibmm/class.h>
+#include <glibmm/objectbase.h>
+#include <glibmm/private/object_p.h>
+
+#include <adwaita.h>
 
 namespace Adwaita
 {
diff --git a/adw/src/private/toastoverlay_p.cpp b/adw/src/private/toastoverlay_p.cpp
index 744f981..3834a1e 100644
--- a/adw/src/private/toastoverlay_p.cpp
+++ b/adw/src/private/toastoverlay_p.cpp
@@ -1,9 +1,14 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/private/toastoverlay_p.hpp"
 
 #include "adwaitamm/toastoverlay.hpp"
 
 #include <glibmm/class.h>
-#include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 
 #include <gtkmm/object.h>
diff --git a/adw/src/stylemanager.cpp b/adw/src/stylemanager.cpp
index f62a162..c79bcbc 100644
--- a/adw/src/stylemanager.cpp
+++ b/adw/src/stylemanager.cpp
@@ -1,25 +1,24 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/stylemanager.hpp"
-#include "adwaitamm/private/stylemanager_p.hpp"
 
 #include "adwaitamm/enums.hpp"
+#include "adwaitamm/private/stylemanager_p.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 #include <glibmm/wrap.h>
 
-#include <giomm/application.h>
-
-#include <gtkmm/application.h>
-#include <gtkmm/init.h>
-#include <gtkmm/private/application_p.h>
-
-#include <adwaita.h>
 #include <gdkmm/display.h>
 #include <gdkmm/rgba.h>
-#include <gio/gio.h>
+
+#include <adwaita.h>
 #include <glib-object.h>
 
 namespace Adwaita
diff --git a/adw/src/switchrow.cpp b/adw/src/switchrow.cpp
index 010c133..e620ee6 100644
--- a/adw/src/switchrow.cpp
+++ b/adw/src/switchrow.cpp
@@ -1,19 +1,19 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/switchrow.hpp"
 
 #include "adwaitamm/actionrow.hpp"
 #include "adwaitamm/private/switchrow_p.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 #include <glibmm/propertyproxy.h>
-#include <glibmm/refptr.h>
 #include <glibmm/wrap.h>
 
-#include <gtkmm/object.h>
-
-#include <adwaita.h>
-#include <gio/gio.h>
 #include <glib-object.h>
 
 namespace Adwaita
diff --git a/adw/src/toast.cpp b/adw/src/toast.cpp
index b5cc12c..0a95b09 100644
--- a/adw/src/toast.cpp
+++ b/adw/src/toast.cpp
@@ -1,12 +1,16 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/toast.hpp"
 
 #include "adwaitamm/enums.hpp"
 #include "adwaitamm/private/toast_p.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
-#include <glibmm/private/object_p.h>
 #include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
 #include <glibmm/signalproxy.h>
@@ -17,8 +21,6 @@
 
 #include <gtkmm/widget.h>
 
-#include <adwaita.h>
-#include <gio/gio.h>
 #include <glib-object.h>
 #include <glib.h>
 
diff --git a/adw/src/toastoverlay.cpp b/adw/src/toastoverlay.cpp
index c4e248f..7be0797 100644
--- a/adw/src/toastoverlay.cpp
+++ b/adw/src/toastoverlay.cpp
@@ -1,24 +1,21 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/toastoverlay.hpp"
 
 #include "adwaitamm/private/toastoverlay_p.hpp"
 #include "adwaitamm/toast.hpp"
 
-#include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 #include <glibmm/propertyproxy.h>
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-#include <glibmm/utility.h>
-#include <glibmm/variant.h>
 #include <glibmm/wrap.h>
 
-#include <gtkmm/object.h>
-#include <gtkmm/private/widget_p.h>
 #include <gtkmm/widget.h>
 
-#include <adwaita.h>
-#include <gio/gio.h>
 #include <glib-object.h>
 
 namespace Adwaita
diff --git a/adw/src/wrap_init.cpp b/adw/src/wrap_init.cpp
index d00105c..9a9d372 100644
--- a/adw/src/wrap_init.cpp
+++ b/adw/src/wrap_init.cpp
@@ -1,3 +1,9 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "adwaitamm/wrap_init.hpp"
 
 #include "adwaitamm/actionrow.hpp"
@@ -9,15 +15,15 @@
 #include "adwaitamm/preferencesdialog.hpp"
 #include "adwaitamm/preferencespage.hpp"
 #include "adwaitamm/preferencesrow.hpp"
-#include "adwaitamm/private/actionrow_p.hpp"
-#include "adwaitamm/private/alertdialog_p.hpp"
-#include "adwaitamm/private/application_p.hpp"
-#include "adwaitamm/private/applicationwindow_p.hpp"
-#include "adwaitamm/private/breakpoint_p.hpp"
-#include "adwaitamm/private/dialog_p.hpp"
-#include "adwaitamm/private/preferencesdialog_p.hpp"
-#include "adwaitamm/private/preferencespage_p.hpp"
-#include "adwaitamm/private/preferencesrow_p.hpp"
+#include "adwaitamm/private/actionrow_p.hpp"          // IWYU pragma: keep - required for gobj class definition.
+#include "adwaitamm/private/alertdialog_p.hpp"        // IWYU pragma: keep - required for gobj class definition.
+#include "adwaitamm/private/application_p.hpp"        // IWYU pragma: keep - required for gobj class definition.
+#include "adwaitamm/private/applicationwindow_p.hpp"  // IWYU pragma: keep - required for gobj class definition.
+#include "adwaitamm/private/breakpoint_p.hpp"         // IWYU pragma: keep - required for gobj class definition.
+#include "adwaitamm/private/dialog_p.hpp"             // IWYU pragma: keep - required for gobj class definition.
+#include "adwaitamm/private/preferencesdialog_p.hpp"  // IWYU pragma: keep - required for gobj class definition.
+#include "adwaitamm/private/preferencespage_p.hpp"    // IWYU pragma: keep - required for gobj class definition.
+#include "adwaitamm/private/preferencesrow_p.hpp"     // IWYU pragma: keep - required for gobj class definition.
 #include "adwaitamm/private/stylemanager_p.hpp"
 #include "adwaitamm/private/switchrow_p.hpp"
 #include "adwaitamm/private/toast_p.hpp"
-- 
cgit v1.2.3