diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index a87b772e8a..f6dc70d4eb 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -45,18 +45,6 @@ _LOG_DECLARE_SELF(NMDeviceEthernet);
 
 /*****************************************************************************/
 
-typedef struct Supplicant {
-	NMSupplicantManager *mgr;
-	NMSupplicantInterface *iface;
-
-	/* signal handler ids */
-	gulong iface_state_id;
-	gulong auth_state_id;
-
-	/* Timeouts and idles */
-	guint con_timeout_id;
-} Supplicant;
-
 typedef enum {
 	DCB_WAIT_UNKNOWN = 0,
 	/* Ensure carrier is up before enabling DCB */
@@ -75,7 +63,18 @@ typedef struct _NMDeviceEthernetPrivate {
 	guint32             speed;
 	gulong              carrier_id;
 
-	Supplicant          supplicant;
+	struct {
+		NMSupplicantManager *mgr;
+		NMSupplicantInterface *iface;
+
+		/* signal handler ids */
+		gulong iface_state_id;
+		gulong auth_state_id;
+
+		/* Timeouts and idles */
+		guint con_timeout_id;
+	} supplicant;
+
 	guint               supplicant_timeout_id;
 
 	/* s390 */
diff --git a/src/devices/nm-device-macsec.c b/src/devices/nm-device-macsec.c
index dbb4ac8efe..b7c9e7728e 100644
--- a/src/devices/nm-device-macsec.c
+++ b/src/devices/nm-device-macsec.c
@@ -23,17 +23,6 @@ _LOG_DECLARE_SELF(NMDeviceMacsec);
 
 /*****************************************************************************/
 
-typedef struct Supplicant {
-	NMSupplicantManager *mgr;
-	NMSupplicantInterface *iface;
-
-	/* signal handler ids */
-	gulong iface_state_id;
-
-	/* Timeouts and idles */
-	guint con_timeout_id;
-} Supplicant;
-
 NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceMacsec,
 	PROP_SCI,
 	PROP_CIPHER_SUITE,
@@ -53,7 +42,18 @@ typedef struct {
 	NMPlatformLnkMacsec props;
 	gulong parent_state_id;
 	gulong parent_mtu_id;
-	Supplicant supplicant;
+
+	struct {
+		NMSupplicantManager *mgr;
+		NMSupplicantInterface *iface;
+
+		/* signal handler ids */
+		gulong iface_state_id;
+
+		/* Timeouts and idles */
+		guint con_timeout_id;
+	} supplicant;
+
 	guint supplicant_timeout_id;
 	NMActRequestGetSecretsCallId *macsec_secrets_id;
 } NMDeviceMacsecPrivate;