diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index e383311698..4006e2c5d2 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -164,12 +164,6 @@ typedef enum {
 	IP_FAIL
 } IpState;
 
-typedef struct {
-	NMDeviceState state;
-	NMDeviceStateReason reason;
-	guint id;
-} QueuedState;
-
 typedef struct {
 	NMDevice *slave;
 	gulong watch_id;
@@ -177,16 +171,6 @@ typedef struct {
 	bool configure;
 } SlaveInfo;
 
-typedef struct {
-	NMLogDomain log_domain;
-	guint timeout;
-	guint watch;
-	GPid pid;
-	const char *binary;
-	const char *address;
-	guint deadline;
-} PingInfo;
-
 typedef struct {
 	NMDevice *device;
 	guint idle_add_id;
@@ -216,7 +200,11 @@ typedef struct _NMDevicePrivate {
 
 	NMDeviceState state;
 	NMDeviceStateReason state_reason;
-	QueuedState   queued_state;
+	struct {
+		NMDeviceState state;
+		NMDeviceStateReason reason;
+		guint id;
+	} queued_state;
 	guint queued_ip4_config_id;
 	guint queued_ip6_config_id;
 	GSList *pending_actions;
@@ -354,7 +342,15 @@ typedef struct _NMDevicePrivate {
 		guint           num_tries_left;
 	} dhcp4;
 
-	PingInfo        gw_ping;
+	struct {
+		NMLogDomain log_domain;
+		guint timeout;
+		guint watch;
+		GPid pid;
+		const char *binary;
+		const char *address;
+		guint deadline;
+	} gw_ping;
 
 	/* dnsmasq stuff for shared connections */
 	NMDnsMasqManager *dnsmasq_manager;