diff --git a/src/nmtui/nmt-page-bridge-port.c b/src/nmtui/nmt-page-bridge-port.c
index 2374bbb792..f6c18d7c57 100644
--- a/src/nmtui/nmt-page-bridge-port.c
+++ b/src/nmtui/nmt-page-bridge-port.c
@@ -9,10 +9,11 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include "nmt-page-bridge-port.h"
 
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
+
 G_DEFINE_TYPE(NmtPageBridgePort, nmt_page_bridge_port, NMT_TYPE_EDITOR_PAGE)
 
 NmtEditorPage *
diff --git a/src/nmtui/nmt-page-bridge.c b/src/nmtui/nmt-page-bridge.c
index 78c1b7c1e1..684b17bd35 100644
--- a/src/nmtui/nmt-page-bridge.c
+++ b/src/nmtui/nmt-page-bridge.c
@@ -9,10 +9,10 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include "nmt-page-bridge.h"
 
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-address-list.h"
 #include "nmt-slave-list.h"
 
diff --git a/src/nmtui/nmt-page-dsl.c b/src/nmtui/nmt-page-dsl.c
index 700938f718..a0d8cdf446 100644
--- a/src/nmtui/nmt-page-dsl.c
+++ b/src/nmtui/nmt-page-dsl.c
@@ -9,9 +9,10 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include "nmt-page-dsl.h"
+
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-page-ppp.h"
 #include "nmt-password-fields.h"
diff --git a/src/nmtui/nmt-page-ethernet.c b/src/nmtui/nmt-page-ethernet.c
index 8ff53d770a..addbd3f390 100644
--- a/src/nmtui/nmt-page-ethernet.c
+++ b/src/nmtui/nmt-page-ethernet.c
@@ -9,13 +9,13 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include "nmt-page-ethernet.h"
 
 #include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
 
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"
 
diff --git a/src/nmtui/nmt-page-infiniband.c b/src/nmtui/nmt-page-infiniband.c
index c192d7e125..1216208f09 100644
--- a/src/nmtui/nmt-page-infiniband.c
+++ b/src/nmtui/nmt-page-infiniband.c
@@ -9,9 +9,10 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include "nmt-page-infiniband.h"
+
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-mtu-entry.h"
 
 G_DEFINE_TYPE(NmtPageInfiniband, nmt_page_infiniband, NMT_TYPE_EDITOR_PAGE_DEVICE)
diff --git a/src/nmtui/nmt-page-ip-tunnel.c b/src/nmtui/nmt-page-ip-tunnel.c
index 88aa2149a6..96864919c8 100644
--- a/src/nmtui/nmt-page-ip-tunnel.c
+++ b/src/nmtui/nmt-page-ip-tunnel.c
@@ -8,10 +8,10 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include "nmt-page-ip-tunnel.h"
 
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-device-entry.h"
 #include "nmt-mtu-entry.h"
 
diff --git a/src/nmtui/nmt-page-ip4.c b/src/nmtui/nmt-page-ip4.c
index 74da20f308..a7e4bdae74 100644
--- a/src/nmtui/nmt-page-ip4.c
+++ b/src/nmtui/nmt-page-ip4.c
@@ -9,11 +9,12 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
+
+#include "nmt-page-ip4.h"
 
 #include <stdlib.h>
 
-#include "nmt-page-ip4.h"
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"
 #include "nmt-route-editor.h"
diff --git a/src/nmtui/nmt-page-ip6.c b/src/nmtui/nmt-page-ip6.c
index f142a38451..0d4de65a60 100644
--- a/src/nmtui/nmt-page-ip6.c
+++ b/src/nmtui/nmt-page-ip6.c
@@ -9,11 +9,12 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
+
+#include "nmt-page-ip6.h"
 
 #include <stdlib.h>
 
-#include "nmt-page-ip6.h"
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"
 #include "nmt-route-editor.h"
diff --git a/src/nmtui/nmt-page-team-port.c b/src/nmtui/nmt-page-team-port.c
index 611cc2909d..c1f3cbc6d0 100644
--- a/src/nmtui/nmt-page-team-port.c
+++ b/src/nmtui/nmt-page-team-port.c
@@ -9,10 +9,11 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include "nmt-page-team-port.h"
 
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
+
 G_DEFINE_TYPE(NmtPageTeamPort, nmt_page_team_port, NMT_TYPE_EDITOR_PAGE)
 
 #define NMT_PAGE_TEAM_PORT_GET_PRIVATE(o) \
diff --git a/src/nmtui/nmt-page-team.c b/src/nmtui/nmt-page-team.c
index 28721c33f7..d61c06c529 100644
--- a/src/nmtui/nmt-page-team.c
+++ b/src/nmtui/nmt-page-team.c
@@ -9,10 +9,10 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include "nmt-page-team.h"
 
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-slave-list.h"
 
 G_DEFINE_TYPE(NmtPageTeam, nmt_page_team, NMT_TYPE_EDITOR_PAGE_DEVICE)
diff --git a/src/nmtui/nmt-page-vlan.c b/src/nmtui/nmt-page-vlan.c
index 4a12efeda5..5baf9756a4 100644
--- a/src/nmtui/nmt-page-vlan.c
+++ b/src/nmtui/nmt-page-vlan.c
@@ -9,13 +9,13 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
-#include "nm-editor-bindings.h"
+#include "nmt-page-vlan.h"
 
 #include <linux/if_ether.h>
 
-#include "nmt-page-vlan.h"
+#include "nm-editor-bindings.h"
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-device-entry.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"
diff --git a/src/nmtui/nmt-page-wifi.c b/src/nmtui/nmt-page-wifi.c
index 45edd6a700..1a476b0210 100644
--- a/src/nmtui/nmt-page-wifi.c
+++ b/src/nmtui/nmt-page-wifi.c
@@ -13,12 +13,13 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
+
+#include "nmt-page-wifi.h"
 
 #include <stdlib.h>
 #include <linux/if_ether.h>
 
-#include "nmt-page-wifi.h"
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"
 #include "nmt-password-fields.h"
diff --git a/src/nmtui/nmt-page-wireguard.c b/src/nmtui/nmt-page-wireguard.c
index b60d8f40bd..30a984e013 100644
--- a/src/nmtui/nmt-page-wireguard.c
+++ b/src/nmtui/nmt-page-wireguard.c
@@ -8,10 +8,10 @@
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
-#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include "nmt-page-wireguard.h"
 
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-device-entry.h"
 #include "nmt-mtu-entry.h"
 #include "nmt-wireguard-peer-list.h"