diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h
index d8867b9261..5cdcb3d5bc 100644
--- a/libnm-core/nm-setting-8021x.h
+++ b/libnm-core/nm-setting-8021x.h
@@ -136,6 +136,9 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
  * properties to the paths to their respective objects.
  */
 
+/**
+ * NMSetting8021x:
+ */
 struct _NMSetting8021x {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-adsl.h b/libnm-core/nm-setting-adsl.h
index 2b44d68687..5afbe5bffc 100644
--- a/libnm-core/nm-setting-adsl.h
+++ b/libnm-core/nm-setting-adsl.h
@@ -54,6 +54,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux"
 #define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
 
+/**
+ * NMSettingAdsl:
+ */
 struct _NMSettingAdsl {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-bluetooth.h b/libnm-core/nm-setting-bluetooth.h
index 6bb5ce80a4..6746782e7c 100644
--- a/libnm-core/nm-setting-bluetooth.h
+++ b/libnm-core/nm-setting-bluetooth.h
@@ -59,6 +59,9 @@ G_BEGIN_DECLS
  */
 #define NM_SETTING_BLUETOOTH_TYPE_PANU "panu"
 
+/**
+ * NMSettingBluetooth:
+ */
 struct _NMSettingBluetooth {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-bond.h b/libnm-core/nm-setting-bond.h
index 98fcc6d0fa..8ee31888a8 100644
--- a/libnm-core/nm-setting-bond.h
+++ b/libnm-core/nm-setting-bond.h
@@ -70,6 +70,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB    "tlb_dynamic_lb"
 #define NM_SETTING_BOND_OPTION_LP_INTERVAL       "lp_interval"
 
+/**
+ * NMSettingBond:
+ */
 struct _NMSettingBond {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-bridge-port.h b/libnm-core/nm-setting-bridge-port.h
index 49ca38b34e..b43f636608 100644
--- a/libnm-core/nm-setting-bridge-port.h
+++ b/libnm-core/nm-setting-bridge-port.h
@@ -43,6 +43,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_PORT_PATH_COST    "path-cost"
 #define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
 
+/**
+ * NMSettingBridgePort:
+ */
 struct _NMSettingBridgePort {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 020d6db63b..844c06ad38 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -48,6 +48,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
 #define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping"
 
+/**
+ * NMSettingBridge:
+ */
 struct _NMSettingBridge {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-cdma.h b/libnm-core/nm-setting-cdma.h
index 6e333dccc9..091c530ed8 100644
--- a/libnm-core/nm-setting-cdma.h
+++ b/libnm-core/nm-setting-cdma.h
@@ -45,6 +45,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_CDMA_PASSWORD       "password"
 #define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
 
+/**
+ * NMSettingCdma:
+ */
 struct _NMSettingCdma {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-dcb.h b/libnm-core/nm-setting-dcb.h
index e5bc4bcfa7..6cc2ce41b5 100644
--- a/libnm-core/nm-setting-dcb.h
+++ b/libnm-core/nm-setting-dcb.h
@@ -92,7 +92,9 @@ typedef enum { /*< flags >*/
 #define NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH "priority-strict-bandwidth"
 #define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS    "priority-traffic-class"
 
-
+/**
+ * NMSettingDcb:
+ */
 struct _NMSettingDcb {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-generic.h b/libnm-core/nm-setting-generic.h
index 7a209da259..0ce3b1605f 100644
--- a/libnm-core/nm-setting-generic.h
+++ b/libnm-core/nm-setting-generic.h
@@ -39,6 +39,9 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_GENERIC_SETTING_NAME "generic"
 
+/**
+ * NMSettingGeneric:
+ */
 struct _NMSettingGeneric {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-gsm.h b/libnm-core/nm-setting-gsm.h
index 2dfe73fae2..7f97d38678 100644
--- a/libnm-core/nm-setting-gsm.h
+++ b/libnm-core/nm-setting-gsm.h
@@ -53,6 +53,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_GSM_SIM_ID          "sim-id"
 #define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id"
 
+/**
+ * NMSettingGsm:
+ */
 struct _NMSettingGsm {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-infiniband.h b/libnm-core/nm-setting-infiniband.h
index c5ad418b22..f19983b462 100644
--- a/libnm-core/nm-setting-infiniband.h
+++ b/libnm-core/nm-setting-infiniband.h
@@ -45,6 +45,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_INFINIBAND_P_KEY          "p-key"
 #define NM_SETTING_INFINIBAND_PARENT         "parent"
 
+/**
+ * NMSettingInfiniband:
+ */
 struct _NMSettingInfiniband {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h
index 39e4c9f083..79c7e63921 100644
--- a/libnm-core/nm-setting-ip-config.h
+++ b/libnm-core/nm-setting-ip-config.h
@@ -165,6 +165,9 @@ void         nm_ip_route_set_attribute       (NMIPRoute   *route,
 #define NM_SETTING_DNS_OPTION_NO_TLD_QUERY              "no-tld-query"
 #define NM_SETTING_DNS_OPTION_USE_VC                    "use-vc"
 
+/**
+ * NMSettingIPConfig:
+ */
 struct _NMSettingIPConfig {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-ip-tunnel.h b/libnm-core/nm-setting-ip-tunnel.h
index 09814f350c..3ee4aafe44 100644
--- a/libnm-core/nm-setting-ip-tunnel.h
+++ b/libnm-core/nm-setting-ip-tunnel.h
@@ -51,6 +51,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_IP_TUNNEL_FLOW_LABEL          "flow-label"
 #define NM_SETTING_IP_TUNNEL_MTU                 "mtu"
 
+/**
+ * NMSettingIPTunnel:
+ */
 struct _NMSettingIPTunnel {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-ip4-config.h b/libnm-core/nm-setting-ip4-config.h
index 8e6524cb4f..adef375464 100644
--- a/libnm-core/nm-setting-ip4-config.h
+++ b/libnm-core/nm-setting-ip4-config.h
@@ -87,6 +87,9 @@ G_BEGIN_DECLS
  */
 #define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
 
+/**
+ * NMSettingIP4Config:
+ */
 struct _NMSettingIP4Config {
 	NMSettingIPConfig parent;
 };
diff --git a/libnm-core/nm-setting-ip6-config.h b/libnm-core/nm-setting-ip6-config.h
index f8923d195f..2966e558cb 100644
--- a/libnm-core/nm-setting-ip6-config.h
+++ b/libnm-core/nm-setting-ip6-config.h
@@ -135,6 +135,9 @@ typedef enum {
 	NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY = 1,
 } NMSettingIP6ConfigAddrGenMode;
 
+/**
+ * NMSettingIP6Config:
+ */
 struct _NMSettingIP6Config {
 	NMSettingIPConfig parent;
 };
diff --git a/libnm-core/nm-setting-macvlan.h b/libnm-core/nm-setting-macvlan.h
index 3922cd93f6..33860aacc2 100644
--- a/libnm-core/nm-setting-macvlan.h
+++ b/libnm-core/nm-setting-macvlan.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_MACVLAN_PROMISCUOUS          "promiscuous"
 #define NM_SETTING_MACVLAN_TAP                  "tap"
 
+/**
+ * NMSettingMacvlan:
+ */
 struct _NMSettingMacvlan {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-olpc-mesh.h b/libnm-core/nm-setting-olpc-mesh.h
index 6a1656514b..2506cec9c5 100644
--- a/libnm-core/nm-setting-olpc-mesh.h
+++ b/libnm-core/nm-setting-olpc-mesh.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 #define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 
+/**
+ * NMSettingOlpcMesh:
+ */
 struct _NMSettingOlpcMesh {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-ppp.h b/libnm-core/nm-setting-ppp.h
index 2e0162cc59..a835ef8a05 100644
--- a/libnm-core/nm-setting-ppp.h
+++ b/libnm-core/nm-setting-ppp.h
@@ -59,6 +59,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 #define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 
+/**
+ * NMSettingPpp:
+ */
 struct _NMSettingPpp {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-pppoe.h b/libnm-core/nm-setting-pppoe.h
index b1e0d92feb..1f5b6ed97c 100644
--- a/libnm-core/nm-setting-pppoe.h
+++ b/libnm-core/nm-setting-pppoe.h
@@ -45,6 +45,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_PPPOE_PASSWORD       "password"
 #define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
 
+/**
+ * NMSettingPppoe:
+ */
 struct _NMSettingPppoe {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-serial.h b/libnm-core/nm-setting-serial.h
index 582892277b..182efc6176 100644
--- a/libnm-core/nm-setting-serial.h
+++ b/libnm-core/nm-setting-serial.h
@@ -60,6 +60,9 @@ typedef enum {
 #define NM_SETTING_SERIAL_STOPBITS "stopbits"
 #define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 
+/**
+ * NMSettingSerial:
+ */
 struct _NMSettingSerial {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-team-port.h b/libnm-core/nm-setting-team-port.h
index 86efb97c40..546cc69a9a 100644
--- a/libnm-core/nm-setting-team-port.h
+++ b/libnm-core/nm-setting-team-port.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_TEAM_PORT_CONFIG     "config"
 
+/**
+ * NMSettingTeamPort:
+ */
 struct _NMSettingTeamPort {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h
index d66eb6858a..726f84202a 100644
--- a/libnm-core/nm-setting-team.h
+++ b/libnm-core/nm-setting-team.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_TEAM_CONFIG "config"
 
+/**
+ * NMSettingTeam:
+ */
 struct _NMSettingTeam {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-tun.h b/libnm-core/nm-setting-tun.h
index 2b368a694a..63c0cbd8cb 100644
--- a/libnm-core/nm-setting-tun.h
+++ b/libnm-core/nm-setting-tun.h
@@ -60,6 +60,9 @@ typedef enum {
 	NM_SETTING_TUN_MODE_TAP        = 2,
 } NMSettingTunMode;
 
+/**
+ * NMSettingTun:
+ */
 struct _NMSettingTun {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-vlan.h b/libnm-core/nm-setting-vlan.h
index cf41ba177e..b147a18574 100644
--- a/libnm-core/nm-setting-vlan.h
+++ b/libnm-core/nm-setting-vlan.h
@@ -46,6 +46,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map"
 #define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
 
+/**
+ * NMSettingVlan:
+ */
 struct _NMSettingVlan {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-vpn.h b/libnm-core/nm-setting-vpn.h
index 31f3c7b87a..539656f826 100644
--- a/libnm-core/nm-setting-vpn.h
+++ b/libnm-core/nm-setting-vpn.h
@@ -47,6 +47,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_VPN_SECRETS      "secrets"
 #define NM_SETTING_VPN_TIMEOUT      "timeout"
 
+/**
+ * NMSettingVpn:
+ */
 struct _NMSettingVpn {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-vxlan.h b/libnm-core/nm-setting-vxlan.h
index c410338eeb..fab2d8201d 100644
--- a/libnm-core/nm-setting-vxlan.h
+++ b/libnm-core/nm-setting-vxlan.h
@@ -56,6 +56,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_VXLAN_L2_MISS            "l2-miss"
 #define NM_SETTING_VXLAN_L3_MISS            "l3-miss"
 
+/**
+ * NMSettingVxlan:
+ */
 struct _NMSettingVxlan {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-wimax.h b/libnm-core/nm-setting-wimax.h
index 0a98fbb5c5..3f0767e969 100644
--- a/libnm-core/nm-setting-wimax.h
+++ b/libnm-core/nm-setting-wimax.h
@@ -42,6 +42,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_WIMAX_NETWORK_NAME "network-name"
 #define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
 
+/**
+ * NMSettingWimax:
+ */
 struct _NMSettingWimax {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-wired.h b/libnm-core/nm-setting-wired.h
index 7eb53d3021..6bc6678238 100644
--- a/libnm-core/nm-setting-wired.h
+++ b/libnm-core/nm-setting-wired.h
@@ -93,6 +93,9 @@ typedef enum { /*< flags >*/
 #define NM_SETTING_WIRED_WAKE_ON_LAN "wake-on-lan"
 #define NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD "wake-on-lan-password"
 
+/**
+ * NMSettingWired:
+ */
 struct _NMSettingWired {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-wireless-security.h b/libnm-core/nm-setting-wireless-security.h
index 8c4e1f0382..093cb386cb 100644
--- a/libnm-core/nm-setting-wireless-security.h
+++ b/libnm-core/nm-setting-wireless-security.h
@@ -89,6 +89,9 @@ typedef enum {
 #define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 #define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 
+/**
+ * NMSettingWirelessSecurity:
+ */
 struct _NMSettingWirelessSecurity {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h
index 606733fa91..574cee54f2 100644
--- a/libnm-core/nm-setting-wireless.h
+++ b/libnm-core/nm-setting-wireless.h
@@ -98,7 +98,9 @@ typedef enum {
 	NM_SETTING_WIRELESS_POWERSAVE_LAST          =  _NM_SETTING_WIRELESS_POWERSAVE_NUM - 1, /*< skip >*/
 } NMSettingWirelessPowersave;
 
-
+/**
+ * NMSettingWireless:
+ */
 struct _NMSettingWireless {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-simple-connection.h b/libnm-core/nm-simple-connection.h
index da6030a882..d6a6044713 100644
--- a/libnm-core/nm-simple-connection.h
+++ b/libnm-core/nm-simple-connection.h
@@ -36,6 +36,9 @@ G_BEGIN_DECLS
 #define NM_IS_SIMPLE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SIMPLE_CONNECTION))
 #define NM_SIMPLE_CONNECTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SIMPLE_CONNECTION, NMSimpleConnectionClass))
 
+/**
+ * NMSimpleConnection:
+ */
 struct _NMSimpleConnection {
 	GObject parent;
 };
diff --git a/libnm-core/nm-vpn-plugin-info.h b/libnm-core/nm-vpn-plugin-info.h
index 667a4fe2d9..c7fef8574a 100644
--- a/libnm-core/nm-vpn-plugin-info.h
+++ b/libnm-core/nm-vpn-plugin-info.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM        "libnm"
 #define NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME        "GNOME"
 
+/**
+ * NMVpnPluginInfo:
+ */
 typedef struct {
 	NM_AVAILABLE_IN_1_2
 	GObject parent;
diff --git a/libnm/nm-access-point.h b/libnm/nm-access-point.h
index f1e2654812..142ab2955e 100644
--- a/libnm/nm-access-point.h
+++ b/libnm/nm-access-point.h
@@ -51,7 +51,9 @@ G_BEGIN_DECLS
 /* DEPRECATED */
 #define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
 
-
+/**
+ * NMAccessPoint:
+ */
 struct _NMAccessPoint {
 	NMObject parent;
 };
diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h
index 4bc8414828..13e50a0602 100644
--- a/libnm/nm-active-connection.h
+++ b/libnm/nm-active-connection.h
@@ -53,6 +53,9 @@ G_BEGIN_DECLS
 #define NM_ACTIVE_CONNECTION_VPN                  "vpn"
 #define NM_ACTIVE_CONNECTION_MASTER               "master"
 
+/**
+ * NMActiveConnection:
+ */
 struct _NMActiveConnection {
 	NMObject parent;
 };
diff --git a/libnm/nm-client.h b/libnm/nm-client.h
index 54d6deeeeb..66ec9ea5bb 100644
--- a/libnm/nm-client.h
+++ b/libnm/nm-client.h
@@ -157,6 +157,9 @@ typedef enum {
 #define NM_CLIENT_ERROR nm_client_error_quark ()
 GQuark nm_client_error_quark (void);
 
+/**
+ * NMClient:
+ */
 struct _NMClient {
 	GObject parent;
 };
diff --git a/libnm/nm-device-adsl.h b/libnm/nm-device-adsl.h
index d01745148f..113d25b12d 100644
--- a/libnm/nm-device-adsl.h
+++ b/libnm/nm-device-adsl.h
@@ -38,6 +38,9 @@ G_BEGIN_DECLS
 
 #define NM_DEVICE_ADSL_CARRIER "carrier"
 
+/**
+ * NMDeviceAdsl:
+ */
 struct _NMDeviceAdsl {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-bond.h b/libnm/nm-device-bond.h
index b7a0b11315..67f64280bf 100644
--- a/libnm/nm-device-bond.h
+++ b/libnm/nm-device-bond.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_BOND_CARRIER     "carrier"
 #define NM_DEVICE_BOND_SLAVES      "slaves"
 
+/**
+ * NMDeviceBond:
+ */
 struct _NMDeviceBond {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-bridge.h b/libnm/nm-device-bridge.h
index 42a0b3a51f..df0cb30359 100644
--- a/libnm/nm-device-bridge.h
+++ b/libnm/nm-device-bridge.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_BRIDGE_CARRIER     "carrier"
 #define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 
+/**
+ * NMDeviceBridge:
+ */
 struct _NMDeviceBridge {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-bt.h b/libnm/nm-device-bt.h
index e066cbcd8c..773cb14872 100644
--- a/libnm/nm-device-bt.h
+++ b/libnm/nm-device-bt.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_BT_NAME         "name"
 #define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 
+/**
+ * NMDeviceBt:
+ */
 struct _NMDeviceBt {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-ethernet.h b/libnm/nm-device-ethernet.h
index 07cf4c4de6..76f4fde193 100644
--- a/libnm/nm-device-ethernet.h
+++ b/libnm/nm-device-ethernet.h
@@ -43,6 +43,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_ETHERNET_CARRIER     "carrier"
 #define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels"
 
+/**
+ * NMDeviceEthernet:
+ */
 struct _NMDeviceEthernet {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-generic.h b/libnm/nm-device-generic.h
index 457a88403e..2a4a1160f4 100644
--- a/libnm/nm-device-generic.h
+++ b/libnm/nm-device-generic.h
@@ -39,6 +39,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_GENERIC_HW_ADDRESS       "hw-address"
 #define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description"
 
+/**
+ * NMDeviceGeneric:
+ */
 struct _NMDeviceGeneric {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-infiniband.h b/libnm/nm-device-infiniband.h
index c1f9be073f..1f4ea217e4 100644
--- a/libnm/nm-device-infiniband.h
+++ b/libnm/nm-device-infiniband.h
@@ -39,6 +39,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_INFINIBAND_HW_ADDRESS  "hw-address"
 #define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
 
+/**
+ * NMDeviceInfiniband:
+ */
 struct _NMDeviceInfiniband {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-ip-tunnel.h b/libnm/nm-device-ip-tunnel.h
index 820eab16dc..142518498a 100644
--- a/libnm/nm-device-ip-tunnel.h
+++ b/libnm/nm-device-ip-tunnel.h
@@ -48,6 +48,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT "encapsulation-limit"
 #define NM_DEVICE_IP_TUNNEL_FLOW_LABEL          "flow-label"
 
+/**
+ * NMDeviceIPTunnel:
+ */
 struct _NMDeviceIPTunnel {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-macvlan.h b/libnm/nm-device-macvlan.h
index 7ffb80c153..aec280bdfb 100644
--- a/libnm/nm-device-macvlan.h
+++ b/libnm/nm-device-macvlan.h
@@ -42,6 +42,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_MACVLAN_TAP         "tap"
 #define NM_DEVICE_MACVLAN_HW_ADDRESS  "hw-address"
 
+/**
+ * NMDeviceMacvlan:
+ */
 struct _NMDeviceMacvlan {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-modem.h b/libnm/nm-device-modem.h
index 38a4ddbb73..fdf5c41fa7 100644
--- a/libnm/nm-device-modem.h
+++ b/libnm/nm-device-modem.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
 #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 
+/**
+ * NMDeviceModem:
+ */
 struct _NMDeviceModem {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-olpc-mesh.h b/libnm/nm-device-olpc-mesh.h
index b58994456c..fc88beb972 100644
--- a/libnm/nm-device-olpc-mesh.h
+++ b/libnm/nm-device-olpc-mesh.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_OLPC_MESH_COMPANION      "companion"
 #define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
 
+/**
+ * NMDeviceOlpcMesh:
+ */
 struct _NMDeviceOlpcMesh {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-team.h b/libnm/nm-device-team.h
index a718579581..a9b71c6ab0 100644
--- a/libnm/nm-device-team.h
+++ b/libnm/nm-device-team.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_TEAM_CARRIER     "carrier"
 #define NM_DEVICE_TEAM_SLAVES      "slaves"
 
+/**
+ * NMDeviceTeam:
+ */
 struct _NMDeviceTeam {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-tun.h b/libnm/nm-device-tun.h
index b83e2b3fb9..71649f8fe1 100644
--- a/libnm/nm-device-tun.h
+++ b/libnm/nm-device-tun.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_TUN_VNET_HDR     "vnet-hdr"
 #define NM_DEVICE_TUN_MULTI_QUEUE  "multi-queue"
 
+/**
+ * NMDeviceTun:
+ */
 struct _NMDeviceTun {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-vlan.h b/libnm/nm-device-vlan.h
index 6ab2420220..1ee03bd52f 100644
--- a/libnm/nm-device-vlan.h
+++ b/libnm/nm-device-vlan.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_VLAN_PARENT      "parent"
 #define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
 
+/**
+ * NMDeviceVlan:
+ */
 struct _NMDeviceVlan {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-vxlan.h b/libnm/nm-device-vxlan.h
index 1fb63597e7..70c7ed5151 100644
--- a/libnm/nm-device-vxlan.h
+++ b/libnm/nm-device-vxlan.h
@@ -55,6 +55,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_VXLAN_L3MISS        "l3miss"
 #define NM_DEVICE_VXLAN_DST_PORT      "dst-port"
 
+/**
+ * NMDeviceVxlan:
+ */
 struct _NMDeviceVxlan {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-wifi.h b/libnm/nm-device-wifi.h
index b5974ba2c2..ee0238df0c 100644
--- a/libnm/nm-device-wifi.h
+++ b/libnm/nm-device-wifi.h
@@ -45,6 +45,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 #define NM_DEVICE_WIFI_ACCESS_POINTS       "access-points"
 
+/**
+ * NMDeviceWifi:
+ */
 struct _NMDeviceWifi {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-wimax.h b/libnm/nm-device-wimax.h
index cdd6ba561c..424779bd30 100644
--- a/libnm/nm-device-wimax.h
+++ b/libnm/nm-device-wimax.h
@@ -46,6 +46,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_WIMAX_BSID             "bsid"
 #define NM_DEVICE_WIMAX_NSPS             "nsps"
 
+/**
+ * NMDeviceWimax:
+ */
 struct _NMDeviceWimax {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device.h b/libnm/nm-device.h
index c16ead9ed2..5ffeb42ee3 100644
--- a/libnm/nm-device.h
+++ b/libnm/nm-device.h
@@ -65,6 +65,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_METERED "metered"
 #define NM_DEVICE_LLDP_NEIGHBORS "lldp-neighbors"
 
+/**
+ * NMDevice:
+ */
 struct _NMDevice {
 	NMObject parent;
 };
diff --git a/libnm/nm-dhcp-config.h b/libnm/nm-dhcp-config.h
index 85aa3bd2c1..be32992f75 100644
--- a/libnm/nm-dhcp-config.h
+++ b/libnm/nm-dhcp-config.h
@@ -36,6 +36,9 @@ G_BEGIN_DECLS
 #define NM_IS_DHCP_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_CONFIG))
 #define NM_IS_DHCP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_CONFIG))
 
+/**
+ * NMDhcpConfig:
+ */
 struct _NMDhcpConfig {
 	NMObject parent;
 };
diff --git a/libnm/nm-dhcp4-config.h b/libnm/nm-dhcp4-config.h
index 3423740db8..4978f84883 100644
--- a/libnm/nm-dhcp4-config.h
+++ b/libnm/nm-dhcp4-config.h
@@ -31,6 +31,9 @@ G_BEGIN_DECLS
 #define NM_IS_DHCP4_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP4_CONFIG))
 #define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG))
 
+/**
+ * NMDhcp4Config:
+ */
 typedef struct {
 	NMDhcpConfig parent;
 } NMDhcp4Config;
diff --git a/libnm/nm-dhcp6-config.h b/libnm/nm-dhcp6-config.h
index abb24adfd6..b7c7c822e1 100644
--- a/libnm/nm-dhcp6-config.h
+++ b/libnm/nm-dhcp6-config.h
@@ -31,6 +31,9 @@ G_BEGIN_DECLS
 #define NM_IS_DHCP6_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP6_CONFIG))
 #define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP6_CONFIG))
 
+/**
+ * NMDhcp6Config:
+ */
 typedef struct {
 	NMDhcpConfig parent;
 } NMDhcp6Config;
diff --git a/libnm/nm-ip-config.h b/libnm/nm-ip-config.h
index 815135a055..38d5b454fd 100644
--- a/libnm/nm-ip-config.h
+++ b/libnm/nm-ip-config.h
@@ -37,6 +37,9 @@ G_BEGIN_DECLS
 #define NM_IS_IP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP_CONFIG))
 #define NM_IP_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP_CONFIG, NMIPConfigClass))
 
+/**
+ * NMIPConfig:
+ */
 struct _NMIPConfig {
 	NMObject parent;
 };
diff --git a/libnm/nm-ip4-config.h b/libnm/nm-ip4-config.h
index e2a18e0f31..196fe09a88 100644
--- a/libnm/nm-ip4-config.h
+++ b/libnm/nm-ip4-config.h
@@ -33,6 +33,9 @@ G_BEGIN_DECLS
 #define NM_IS_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP4_CONFIG))
 #define NM_IP4_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP4_CONFIG, NMIP4ConfigClass))
 
+/**
+ * NMIP4Config:
+ */
 typedef struct {
 	NMIPConfig parent;
 } NMIP4Config;
diff --git a/libnm/nm-ip6-config.h b/libnm/nm-ip6-config.h
index 1953476d00..fa67517c18 100644
--- a/libnm/nm-ip6-config.h
+++ b/libnm/nm-ip6-config.h
@@ -33,6 +33,9 @@ G_BEGIN_DECLS
 #define NM_IS_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP6_CONFIG))
 #define NM_IP6_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass))
 
+/**
+ * NMIP6Config:
+ */
 typedef struct {
 	NMIPConfig parent;
 } NMIP6Config;
diff --git a/libnm/nm-manager.h b/libnm/nm-manager.h
index f9e4cd0e28..7b6dd675d3 100644
--- a/libnm/nm-manager.h
+++ b/libnm/nm-manager.h
@@ -53,6 +53,9 @@ G_BEGIN_DECLS
 #define NM_MANAGER_METERED "metered"
 #define NM_MANAGER_ALL_DEVICES "all-devices"
 
+/**
+ * NMManager:
+ */
 typedef struct {
 	NMObject parent;
 } NMManager;
diff --git a/libnm/nm-object.h b/libnm/nm-object.h
index b42f160d5c..fcfc718c22 100644
--- a/libnm/nm-object.h
+++ b/libnm/nm-object.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_OBJECT_PATH "path"
 #define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 
+/**
+ * NMObject:
+ */
 struct _NMObject {
 	GObject parent;
 };
diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h
index 3ea8037fba..a723575555 100644
--- a/libnm/nm-remote-connection.h
+++ b/libnm/nm-remote-connection.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_REMOTE_CONNECTION_UNSAVED         "unsaved"
 #define NM_REMOTE_CONNECTION_VISIBLE         "visible"
 
+/**
+ * NMRemoteConnection:
+ */
 struct _NMRemoteConnection {
 	NMObject parent;
 };
diff --git a/libnm/nm-remote-settings.h b/libnm/nm-remote-settings.h
index 1ffc0bf20b..f8eddc5bae 100644
--- a/libnm/nm-remote-settings.h
+++ b/libnm/nm-remote-settings.h
@@ -43,6 +43,9 @@ G_BEGIN_DECLS
 typedef struct _NMRemoteSettings NMRemoteSettings;
 typedef struct _NMRemoteSettingsClass NMRemoteSettingsClass;
 
+/**
+ * NMRemoteSettings:
+ */
 struct _NMRemoteSettings {
 	NMObject parent;
 };
diff --git a/libnm/nm-secret-agent-old.h b/libnm/nm-secret-agent-old.h
index 6198e2c040..476cc2a259 100644
--- a/libnm/nm-secret-agent-old.h
+++ b/libnm/nm-secret-agent-old.h
@@ -37,6 +37,9 @@ G_BEGIN_DECLS
 #define NM_SECRET_AGENT_OLD_REGISTERED          "registered"
 #define NM_SECRET_AGENT_OLD_CAPABILITIES        "capabilities"
 
+/**
+ * NMSecretAgentOld:
+ */
 typedef struct {
 	GObject parent;
 } NMSecretAgentOld;
diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h
index 349de41ea5..79ec90a0d1 100644
--- a/libnm/nm-vpn-connection.h
+++ b/libnm/nm-vpn-connection.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
 #define NM_VPN_CONNECTION_BANNER "banner"
 
+/**
+ * NMVpnConnection:
+ */
 struct _NMVpnConnection {
 	NMActiveConnection parent;
 };
diff --git a/libnm/nm-vpn-plugin-old.h b/libnm/nm-vpn-plugin-old.h
index 59cf4600c5..50e34450ad 100644
--- a/libnm/nm-vpn-plugin-old.h
+++ b/libnm/nm-vpn-plugin-old.h
@@ -38,6 +38,9 @@ G_BEGIN_DECLS
 #define NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME "service-name"
 #define NM_VPN_PLUGIN_OLD_STATE             "state"
 
+/**
+ * NMVpnPluginOld:
+ */
 typedef struct {
 	NM_DEPRECATED_IN_1_2
 	GObject parent;
diff --git a/libnm/nm-vpn-service-plugin.h b/libnm/nm-vpn-service-plugin.h
index 29319189f9..0b65529630 100644
--- a/libnm/nm-vpn-service-plugin.h
+++ b/libnm/nm-vpn-service-plugin.h
@@ -43,6 +43,9 @@ G_BEGIN_DECLS
 #define NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER   "watch-peer"
 #define NM_VPN_SERVICE_PLUGIN_STATE             "state"
 
+/**
+ * NMVpnServicePlugin:
+ */
 typedef struct {
 	NM_AVAILABLE_IN_1_2
 	GObject parent;
diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h
index 5dd982efe7..e1f63400e0 100644
--- a/libnm/nm-wimax-nsp.h
+++ b/libnm/nm-wimax-nsp.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
 #define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 
+/**
+ * NMWimaxNsp:
+ */
 struct _NMWimaxNsp {
 	NMObject parent;
 };