diff --git a/libnm-core/nm-setting-6lowpan.c b/libnm-core/nm-setting-6lowpan.c
index 3ea1c69b4..dac20b86e 100644
--- a/libnm-core/nm-setting-6lowpan.c
+++ b/libnm-core/nm-setting-6lowpan.c
@@ -39,9 +39,9 @@ struct _NMSetting6Lowpan {
 	NMSetting parent;
 };
 
-typedef struct {
+struct _NMSetting6LowpanClass {
 	NMSettingClass parent;
-} NMSetting6LowpanClass;
+};
 
 /**
  * SECTION:nm-setting-6lowpan
diff --git a/libnm-core/nm-setting-6lowpan.h b/libnm-core/nm-setting-6lowpan.h
index 5663bdde3..73f57b7c7 100644
--- a/libnm-core/nm-setting-6lowpan.h
+++ b/libnm-core/nm-setting-6lowpan.h
@@ -39,6 +39,8 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_6LOWPAN_PARENT               "parent"
 
+typedef struct _NMSetting6LowpanClass NMSetting6LowpanClass;
+
 NM_AVAILABLE_IN_1_14
 GType nm_setting_6lowpan_get_type (void);
 NM_AVAILABLE_IN_1_14
diff --git a/libnm-core/nm-setting-wpan.c b/libnm-core/nm-setting-wpan.c
index 5ca1d3939..15df0f76f 100644
--- a/libnm-core/nm-setting-wpan.c
+++ b/libnm-core/nm-setting-wpan.c
@@ -53,9 +53,9 @@ struct _NMSettingWpan {
         NMSetting parent;
 };
 
-typedef struct {
+struct _NMSettingWpanClass {
         NMSettingClass parent;
-} NMSettingWpanClass;
+};
 
 /**
  * SECTION:nm-setting-wpan
diff --git a/libnm-core/nm-setting-wpan.h b/libnm-core/nm-setting-wpan.h
index a2da30f7a..a39e377ed 100644
--- a/libnm-core/nm-setting-wpan.h
+++ b/libnm-core/nm-setting-wpan.h
@@ -40,6 +40,8 @@ G_BEGIN_DECLS
 #define NM_SETTING_WPAN_PAN_ID             "pan-id"
 #define NM_SETTING_WPAN_SHORT_ADDRESS      "short-address"
 
+typedef struct _NMSettingWpanClass NMSettingWpanClass;
+
 NM_AVAILABLE_IN_1_14
 GType nm_setting_wpan_get_type (void);
 NM_AVAILABLE_IN_1_14