diff --git a/src/rugby-app-window.c b/src/rugby-app-window.c
index 27bbbbb0fc455eb16a52f4c71d0028661f825292..a1bf283a640525e8a9c9bc03a35322067b903614 100644
--- a/src/rugby-app-window.c
+++ b/src/rugby-app-window.c
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#include <config.h>
-
+#include "config.h"
 #include "rugby-app-window.h"
+
 #include "rugby-list-store.h"
+#include "rugby-possibility.h"
 #include "rugby-possibility-widget.h"
 
 #include <glib/gi18n.h>
diff --git a/src/rugby-app-window.h b/src/rugby-app-window.h
index 1f3fb8dc9b940053de6ce2509bf7b5f9c9b4d9b0..816bee0eb8fb3422806ade0296d6797135a594ef 100644
--- a/src/rugby-app-window.h
+++ b/src/rugby-app-window.h
@@ -14,6 +14,6 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (RugbyAppWindow, rugby_app_window, RUGBY, APP_WINDOW, AdwApplicationWindow)
 
-RugbyAppWindow * rugby_app_window_new (GtkApplication *app);
+RugbyAppWindow *rugby_app_window_new (GtkApplication *app);
 
 G_END_DECLS
diff --git a/src/rugby-list-store.h b/src/rugby-list-store.h
index fb7de954d6d22999e16afe05e02a0c438c210811..e4b6c5eac30accd313d60f536c4796480995c005 100644
--- a/src/rugby-list-store.h
+++ b/src/rugby-list-store.h
@@ -1,5 +1,6 @@
 /*
  * SPDX-FileCopyrightText: 2018-2022 Bruce Cowan <bruce@bcowan.me.uk>
+ *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
@@ -10,10 +11,11 @@
 G_BEGIN_DECLS
 
 #define RUGBY_TYPE_LIST_STORE (rugby_list_store_get_type())
+
 G_DECLARE_FINAL_TYPE (RugbyListStore, rugby_list_store, RUGBY, LIST_STORE, GObject)
 
-int              rugby_list_store_get_score (RugbyListStore *self);
-void             rugby_list_store_set_score (RugbyListStore *self,
-                                             int             score);
+int  rugby_list_store_get_score (RugbyListStore *self);
+void rugby_list_store_set_score (RugbyListStore *self,
+                                 int             score);
 
 G_END_DECLS
diff --git a/src/rugby-possibility-widget.c b/src/rugby-possibility-widget.c
index ca6255ad753f23dc741227517ce6af54c7b9d597..bd1f821e11577d82160fadfbeab8a9db8875ae62 100644
--- a/src/rugby-possibility-widget.c
+++ b/src/rugby-possibility-widget.c
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#include <config.h>
+#include "config.h"
+#include "rugby-possibility-widget.h"
 
-#include <adwaita.h>
+#include "rugby-possibility.h"
 
-#include "rugby-possibility-widget.h"
+#include <adwaita.h>
 
 struct _RugbyPossibilityWidget
 {
diff --git a/src/rugby-possibility-widget.h b/src/rugby-possibility-widget.h
index e9b8a46d149420100bb037d38fc2c63378acda04..677e2784336aa68327e159d91e244fb0d33b63cd 100644
--- a/src/rugby-possibility-widget.h
+++ b/src/rugby-possibility-widget.h
@@ -8,8 +8,6 @@
 
 #include <gtk/gtk.h>
 
-#include "rugby-possibility.h"
-
 G_BEGIN_DECLS
 
 #define RUGBY_TYPE_POSSIBILITY_WIDGET (rugby_possibility_widget_get_type())
diff --git a/src/rugby-possibility.h b/src/rugby-possibility.h
index d21dedb01b5151703a35bae08c9953582d09c2f8..dd7fe742734625a4446acfa2d9c009d9d44935af 100644
--- a/src/rugby-possibility.h
+++ b/src/rugby-possibility.h
@@ -1,5 +1,6 @@
 /*
- * SPDX-FileCopyrightText: 2018 Bruce Cowan <bruce@bcowan.me.uk>
+ * SPDX-FileCopyrightText: 2018-2022 Bruce Cowan <bruce@bcowan.me.uk>
+ *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
@@ -13,8 +14,8 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (RugbyPossibility, rugby_possibility, RUGBY, POSSIBILITY, GObject)
 
-RugbyPossibility * rugby_possibility_new (int tries,
-                                          int utries,
-                                          int kicks);
+RugbyPossibility *rugby_possibility_new (int tries,
+                                         int utries,
+                                         int kicks);
 
 G_END_DECLS
diff --git a/src/rugby-pref-window.h b/src/rugby-pref-window.h
index 9a02e00ce8be68353479106d6a7efa91cb128aad..555b890ad0bb2ea67a8370c2cae3ad81aad1f4c5 100644
--- a/src/rugby-pref-window.h
+++ b/src/rugby-pref-window.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2021 Bruce Cowan <bruce@bcowan.me.uk>
+ * SPDX-FileCopyrightText: 2020-2022 Bruce Cowan <bruce@bcowan.me.uk>
  *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
@@ -8,7 +8,6 @@
 
 #include "rugby-app-window.h"
 
-#include <gtk/gtk.h>
 #include <adwaita.h>
 
 G_BEGIN_DECLS