libnm: replace nm-types.h by defining the types in respective headers

The typedefs in nm-types.h confuse gtkdoc-scan. It generates a
libnm-sections.txt file like this:

  <SECTION>
  <FILE>nm-types</FILE>
  <TITLE>NMDeviceOvs</TITLE>
  NMAccessPoint
  NMActiveConnection
  NMCheckpoint
  NMClient
  NMDevice
  ...

Note the wrongly picked title and, more importantly, the object types in
a bogus section. This in turn makes gtkdoc-mkdb fail to include the
property and signal documentation in appropriate sections.

Without nm-types.h, we need to mind the header dependencies. This means
that we need to order the headers that define types before the ones that
use them. Also, we need to break the depencency loops in few palces.

Makefile.am

@@ -1691,7 +1691,6 @@ libnm_lib_h_pub_real = \
 	src/libnm-client-public/nm-object.h \
 	src/libnm-client-public/nm-remote-connection.h \
 	src/libnm-client-public/nm-secret-agent-old.h \
-	src/libnm-client-public/nm-types.h \
 	src/libnm-client-public/nm-vpn-connection.h \
 	src/libnm-client-public/nm-vpn-editor.h \
 	src/libnm-client-public/nm-vpn-plugin-old.h \

src/libnm-client-impl/nm-client.c

@@ -20,6 +20,7 @@
 #include "nm-checkpoint.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-helpers.h"
+#include "nm-wifi-p2p-peer.h"
 #include "nm-device-6lowpan.h"
 #include "nm-device-adsl.h"
 #include "nm-device-bond.h"
@@ -33,7 +34,6 @@
 #include "nm-device-macsec.h"
 #include "nm-device-macvlan.h"
 #include "nm-device-modem.h"
-#include "nm-device-olpc-mesh.h"
 #include "nm-device-ovs-bridge.h"
 #include "nm-device-ovs-interface.h"
 #include "nm-device-ovs-port.h"
@@ -46,6 +46,7 @@
 #include "nm-device-wifi.h"
 #include "nm-device-wireguard.h"
 #include "nm-device-wpan.h"
+#include "nm-device-olpc-mesh.h"
 #include "nm-dhcp-config.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp6-config.h"
@@ -56,7 +57,6 @@
 #include "nm-remote-connection.h"
 #include "nm-utils.h"
 #include "nm-vpn-connection.h"
-#include "nm-wifi-p2p-peer.h"
 
 /*****************************************************************************/
 

src/libnm-client-impl/nm-default-libnm.h

@@ -16,6 +16,16 @@
 /*****************************************************************************/
 
 #include "nm-version.h"
+#include "nm-dbus-interface.h"
+#include "nm-dhcp-config.h"
+#include "nm-ip-config.h"
+#include "nm-connection.h"
+#include "nm-remote-connection.h"
+#include "nm-active-connection.h"
+#include "nm-device.h"
+#include "nm-checkpoint.h"
+#include "nm-client.h"
+#include "nm-vpn-connection.h"
 #include "nm-libnm-utils.h"
 
 /*****************************************************************************/

src/libnm-client-impl/nm-device-olpc-mesh.c

@@ -5,12 +5,13 @@
 
 #include "libnm-client-impl/nm-default-libnm.h"
 
+#include "nm-access-point.h"
+#include "nm-device-wifi.h"
 #include "nm-device-olpc-mesh.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-olpc-mesh.h"
 #include "nm-object-private.h"
-#include "nm-device-wifi.h"
 
 /*****************************************************************************/
 

src/libnm-client-impl/nm-device-wifi-p2p.c

@@ -5,13 +5,13 @@
 
 #include "libnm-client-impl/nm-default-libnm.h"
 
+#include "nm-wifi-p2p-peer.h"
 #include "nm-device-wifi-p2p.h"
 
 #include "libnm-glib-aux/nm-dbus-aux.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wifi-p2p.h"
 #include "nm-utils.h"
-#include "nm-wifi-p2p-peer.h"
 #include "nm-object-private.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-helpers.h"

src/libnm-client-impl/nm-device-wifi.c

@@ -6,6 +6,7 @@
 
 #include "libnm-client-impl/nm-default-libnm.h"
 
+#include "nm-access-point.h"
 #include "nm-device-wifi.h"
 
 #include <linux/if_ether.h>
@@ -15,7 +16,6 @@
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-utils.h"
-#include "nm-access-point.h"
 #include "nm-object-private.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-helpers.h"

src/libnm-client-impl/nm-device-wimax.c

@@ -6,9 +6,8 @@
 
 #include "libnm-client-impl/nm-default-libnm.h"
 
-#include "nm-device-wimax.h"
-
 #include "nm-wimax-nsp.h"
+#include "nm-device-wimax.h"
 
 /*****************************************************************************/
 

src/libnm-client-impl/nm-libnm-utils.h

@@ -7,12 +7,8 @@
 #define __NM_LIBNM_UTILS_H__
 
 #include "c-list/src/c-list.h"
-#include "nm-device.h"
 #include "libnm-glib-aux/nm-ref-string.h"
 #include "libnm-glib-aux/nm-logging-fwd.h"
-#include "nm-types.h"
-#include "nm-object.h"
-#include "nm-client.h"
 
 /*****************************************************************************/
 

src/libnm-client-public/NetworkManager.h

@@ -8,12 +8,21 @@
 
 #define __NETWORKMANAGER_H_INSIDE__
 
-#include "nm-access-point.h"
-#include "nm-active-connection.h"
-#include "nm-client.h"
-#include "nm-connection.h"
-#include "nm-core-enum-types.h"
+#include <gio/gio.h>
+
+#include "nm-version.h"
 #include "nm-dbus-interface.h"
+#include "nm-dhcp-config.h"
+#include "nm-ip-config.h"
+#include "nm-remote-connection.h"
+#include "nm-active-connection.h"
+#include "nm-checkpoint.h"
+#include "nm-connection.h"
+#include "nm-client.h"
+#include "nm-access-point.h"
+#include "nm-core-enum-types.h"
+#include "nm-wifi-p2p-peer.h"
+#include "nm-wimax-nsp.h"
 #include "nm-device-6lowpan.h"
 #include "nm-device-adsl.h"
 #include "nm-device-bond.h"
@@ -27,7 +36,6 @@
 #include "nm-device-macsec.h"
 #include "nm-device-macvlan.h"
 #include "nm-device-modem.h"
-#include "nm-device-olpc-mesh.h"
 #include "nm-device-ovs-bridge.h"
 #include "nm-device-ovs-interface.h"
 #include "nm-device-ovs-port.h"
@@ -37,19 +45,17 @@
 #include "nm-device-veth.h"
 #include "nm-device-vlan.h"
 #include "nm-device-vxlan.h"
-#include "nm-device-wifi-p2p.h"
 #include "nm-device-wifi.h"
+#include "nm-device-wifi-p2p.h"
+#include "nm-device-olpc-mesh.h"
 #include "nm-device-wimax.h"
 #include "nm-device-wireguard.h"
 #include "nm-device-wpan.h"
 #include "nm-device.h"
-#include "nm-dhcp-config.h"
 #include "nm-enum-types.h"
 #include "nm-ethtool-utils.h"
-#include "nm-ip-config.h"
 #include "nm-keyfile.h"
 #include "nm-object.h"
-#include "nm-remote-connection.h"
 #include "nm-setting-6lowpan.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-adsl.h"
@@ -105,15 +111,12 @@
 #include "nm-setting.h"
 #include "nm-simple-connection.h"
 #include "nm-utils.h"
-#include "nm-version.h"
 #include "nm-vpn-connection.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-vpn-editor.h"
 #include "nm-vpn-editor-plugin.h"
 #include "nm-vpn-plugin-info.h"
 #include "nm-vpn-service-plugin.h"
-#include "nm-wifi-p2p-peer.h"
-#include "nm-wimax-nsp.h"
 
 #include "nm-autoptr.h"
 

src/libnm-client-public/meson.build

@@ -45,7 +45,6 @@ libnm_client_headers = files(
   'nm-object.h',
   'nm-remote-connection.h',
   'nm-secret-agent-old.h',
-  'nm-types.h',
   'nm-vpn-connection.h',
   'nm-vpn-editor.h',
   'nm-vpn-plugin-old.h',

src/libnm-client-public/nm-access-point.h

@@ -42,6 +42,7 @@ G_BEGIN_DECLS
 /**
  * NMAccessPoint:
  */
+typedef struct _NMAccessPoint      NMAccessPoint;
 typedef struct _NMAccessPointClass NMAccessPointClass;
 
 GType nm_access_point_get_type(void);

src/libnm-client-public/nm-active-connection.h

@@ -43,9 +43,12 @@ G_BEGIN_DECLS
 #define NM_ACTIVE_CONNECTION_VPN                  "vpn"
 #define NM_ACTIVE_CONNECTION_MASTER               "master"
 
+typedef struct _NMDevice NMDevice;
+
 /**
  * NMActiveConnection:
  */
+typedef struct _NMActiveConnection      NMActiveConnection;
 typedef struct _NMActiveConnectionClass NMActiveConnectionClass;
 
 GType nm_active_connection_get_type(void);

src/libnm-client-public/nm-checkpoint.h

@@ -30,6 +30,7 @@ G_BEGIN_DECLS
 /**
  * NMCheckpoint:
  */
+typedef struct _NMCheckpoint      NMCheckpoint;
 typedef struct _NMCheckpointClass NMCheckpointClass;
 
 GType nm_checkpoint_get_type(void);

src/libnm-client-public/nm-client.h

@@ -11,8 +11,6 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include "nm-types.h"
-
 G_BEGIN_DECLS
 
 /**
@@ -148,6 +146,7 @@ gboolean nm_dns_entry_get_vpn(NMDnsEntry *entry);
  * D-Bus signals gets processed and the #NMClient instance updates and
  * emits #GObject signals.
  */
+typedef struct _NMClient      NMClient;
 typedef struct _NMClientClass NMClientClass;
 
 GType nm_client_get_type(void);

src/libnm-client-public/nm-device-6lowpan.h

@@ -30,6 +30,7 @@ G_BEGIN_DECLS
 /**
  * NMDevice6Lowpan:
  */
+typedef struct _NMDevice6Lowpan      NMDevice6Lowpan;
 typedef struct _NMDevice6LowpanClass NMDevice6LowpanClass;
 
 NM_AVAILABLE_IN_1_14

src/libnm-client-public/nm-device-adsl.h

@@ -28,6 +28,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceAdsl:
  */
+typedef struct _NMDeviceAdsl      NMDeviceAdsl;
 typedef struct _NMDeviceAdslClass NMDeviceAdslClass;
 
 GType nm_device_adsl_get_type(void);

src/libnm-client-public/nm-device-bond.h

@@ -30,6 +30,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceBond:
  */
+typedef struct _NMDeviceBond      NMDeviceBond;
 typedef struct _NMDeviceBondClass NMDeviceBondClass;
 
 GType nm_device_bond_get_type(void);

src/libnm-client-public/nm-device-bridge.h

@@ -31,6 +31,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceBridge:
  */
+typedef struct _NMDeviceBridge      NMDeviceBridge;
 typedef struct _NMDeviceBridgeClass NMDeviceBridgeClass;
 
 GType nm_device_bridge_get_type(void);

src/libnm-client-public/nm-device-bt.h

@@ -31,6 +31,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceBt:
  */
+typedef struct _NMDeviceBt      NMDeviceBt;
 typedef struct _NMDeviceBtClass NMDeviceBtClass;
 
 GType nm_device_bt_get_type(void);

src/libnm-client-public/nm-device-dummy.h

@@ -29,6 +29,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceDummy:
  */
+typedef struct _NMDeviceDummy      NMDeviceDummy;
 typedef struct _NMDeviceDummyClass NMDeviceDummyClass;
 
 GType nm_device_dummy_get_type(void);

src/libnm-client-public/nm-device-ethernet.h

@@ -35,6 +35,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceEthernet:
  */
+typedef struct _NMDeviceEthernet      NMDeviceEthernet;
 typedef struct _NMDeviceEthernetClass NMDeviceEthernetClass;
 
 GType nm_device_ethernet_get_type(void);

src/libnm-client-public/nm-device-generic.h

@@ -30,6 +30,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceGeneric:
  */
+typedef struct _NMDeviceGeneric      NMDeviceGeneric;
 typedef struct _NMDeviceGenericClass NMDeviceGenericClass;
 
 GType nm_device_generic_get_type(void);

src/libnm-client-public/nm-device-infiniband.h

@@ -31,6 +31,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceInfiniband:
  */
+typedef struct _NMDeviceInfiniband      NMDeviceInfiniband;
 typedef struct _NMDeviceInfinibandClass NMDeviceInfinibandClass;
 
 GType nm_device_infiniband_get_type(void);

src/libnm-client-public/nm-device-ip-tunnel.h

@@ -42,6 +42,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceIPTunnel:
  */
+typedef struct _NMDeviceIPTunnel      NMDeviceIPTunnel;
 typedef struct _NMDeviceIPTunnelClass NMDeviceIPTunnelClass;
 
 NM_AVAILABLE_IN_1_2

src/libnm-client-public/nm-device-macsec.h

@@ -42,6 +42,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceMacsec:
  */
+typedef struct _NMDeviceMacsec      NMDeviceMacsec;
 typedef struct _NMDeviceMacsecClass NMDeviceMacsecClass;
 
 NM_AVAILABLE_IN_1_6

src/libnm-client-public/nm-device-macvlan.h

@@ -33,6 +33,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceMacvlan:
  */
+typedef struct _NMDeviceMacvlan      NMDeviceMacvlan;
 typedef struct _NMDeviceMacvlanClass NMDeviceMacvlanClass;
 
 NM_AVAILABLE_IN_1_2

src/libnm-client-public/nm-device-modem.h

@@ -34,6 +34,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceModem:
  */
+typedef struct _NMDeviceModem      NMDeviceModem;
 typedef struct _NMDeviceModemClass NMDeviceModemClass;
 
 GType nm_device_modem_get_type(void);

src/libnm-client-public/nm-device-olpc-mesh.h

@@ -32,6 +32,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceOlpcMesh:
  */
+typedef struct _NMDeviceOlpcMesh      NMDeviceOlpcMesh;
 typedef struct _NMDeviceOlpcMeshClass NMDeviceOlpcMeshClass;
 
 GType nm_device_olpc_mesh_get_type(void);

src/libnm-client-public/nm-device-ovs-bridge.h

@@ -30,6 +30,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceOvsBridge:
  */
+typedef struct _NMDeviceOvsBridge      NMDeviceOvsBridge;
 typedef struct _NMDeviceOvsBridgeClass NMDeviceOvsBridgeClass;
 
 NM_AVAILABLE_IN_1_10

src/libnm-client-public/nm-device-ovs-interface.h

@@ -29,6 +29,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceOvsInterface:
  */
+typedef struct _NMDeviceOvsInterface      NMDeviceOvsInterface;
 typedef struct _NMDeviceOvsInterfaceClass NMDeviceOvsInterfaceClass;
 
 NM_AVAILABLE_IN_1_10

src/libnm-client-public/nm-device-ovs-port.h

@@ -30,6 +30,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceOvsPort:
  */
+typedef struct _NMDeviceOvsPort      NMDeviceOvsPort;
 typedef struct _NMDeviceOvsPortClass NMDeviceOvsPortClass;
 
 NM_AVAILABLE_IN_1_10

src/libnm-client-public/nm-device-ppp.h

@@ -24,6 +24,7 @@ G_BEGIN_DECLS
 /**
  * NMDevicePpp:
  */
+typedef struct _NMDevicePpp      NMDevicePpp;
 typedef struct _NMDevicePppClass NMDevicePppClass;
 
 GType nm_device_ppp_get_type(void);

src/libnm-client-public/nm-device-team.h

@@ -31,6 +31,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceTeam:
  */
+typedef struct _NMDeviceTeam      NMDeviceTeam;
 typedef struct _NMDeviceTeamClass NMDeviceTeamClass;
 
 GType nm_device_team_get_type(void);

src/libnm-client-public/nm-device-tun.h

@@ -34,6 +34,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceTun:
  */
+typedef struct _NMDeviceTun      NMDeviceTun;
 typedef struct _NMDeviceTunClass NMDeviceTunClass;
 
 NM_AVAILABLE_IN_1_2

src/libnm-client-public/nm-device-veth.h

@@ -28,6 +28,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceVeth:
  */
+typedef struct _NMDeviceVeth      NMDeviceVeth;
 typedef struct _NMDeviceVethClass NMDeviceVethClass;
 
 NM_AVAILABLE_IN_1_30

src/libnm-client-public/nm-device-vlan.h

@@ -31,6 +31,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceVlan:
  */
+typedef struct _NMDeviceVlan      NMDeviceVlan;
 typedef struct _NMDeviceVlanClass NMDeviceVlanClass;
 
 GType nm_device_vlan_get_type(void);

src/libnm-client-public/nm-device-vrf.h

@@ -25,6 +25,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceVrf:
  */
+typedef struct _NMDeviceVrf      NMDeviceVrf;
 typedef struct _NMDeviceVrfClass NMDeviceVrfClass;
 
 NM_AVAILABLE_IN_1_24

src/libnm-client-public/nm-device-vxlan.h

@@ -46,6 +46,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceVxlan:
  */
+typedef struct _NMDeviceVxlan      NMDeviceVxlan;
 typedef struct _NMDeviceVxlanClass NMDeviceVxlanClass;
 
 NM_AVAILABLE_IN_1_2

src/libnm-client-public/nm-device-wifi-p2p.h

@@ -34,6 +34,7 @@ G_BEGIN_DECLS
  *
  * Since: 1.16
  */
+typedef struct _NMDeviceWifiP2P      NMDeviceWifiP2P;
 typedef struct _NMDeviceWifiP2PClass NMDeviceWifiP2PClass;
 
 NM_AVAILABLE_IN_1_16

src/libnm-client-public/nm-device-wifi.h

@@ -36,6 +36,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceWifi:
  */
+typedef struct _NMDeviceWifi      NMDeviceWifi;
 typedef struct _NMDeviceWifiClass NMDeviceWifiClass;
 
 GType nm_device_wifi_get_type(void);

src/libnm-client-public/nm-device-wimax.h

@@ -39,6 +39,7 @@ G_BEGIN_DECLS
  *
  * Deprecated: 1.22: WiMAX is no longer supported by NetworkManager since 1.2.0.
  */
+typedef struct _NMDeviceWimax      NMDeviceWimax;
 typedef struct _NMDeviceWimaxClass NMDeviceWimaxClass;
 
 NM_DEPRECATED_IN_1_2

src/libnm-client-public/nm-device-wireguard.h

@@ -28,6 +28,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceWireGuard:
  */
+typedef struct _NMDeviceWireGuard      NMDeviceWireGuard;
 typedef struct _NMDeviceWireGuardClass NMDeviceWireGuardClass;
 
 #define NM_DEVICE_WIREGUARD_PUBLIC_KEY  "public-key"

src/libnm-client-public/nm-device-wpan.h

@@ -28,6 +28,7 @@ G_BEGIN_DECLS
 /**
  * NMDeviceWpan:
  */
+typedef struct _NMDeviceWpan      NMDeviceWpan;
 typedef struct _NMDeviceWpanClass NMDeviceWpanClass;
 
 NM_AVAILABLE_IN_1_14

src/libnm-client-public/nm-device.h

@@ -62,6 +62,7 @@ _NM_DEPRECATED_SYNC_WRITABLE_PROPERTY
 /**
  * NMDevice:
  */
+typedef struct _NMDevice      NMDevice;
 typedef struct _NMDeviceClass NMDeviceClass;
 
 /**

src/libnm-client-public/nm-dhcp-config.h

@@ -25,6 +25,7 @@ G_BEGIN_DECLS
 /**
  * NMDhcpConfig:
  */
+typedef struct _NMDhcpConfig      NMDhcpConfig;
 typedef struct _NMDhcpConfigClass NMDhcpConfigClass;
 
 #define NM_DHCP_CONFIG_FAMILY  "family"

src/libnm-client-public/nm-enum-types.c.template

@@ -5,45 +5,9 @@
 
 #include "nm-version-macros.h"
 #include "NetworkManager.h"
-#include "nm-access-point.h"
-#include "nm-active-connection.h"
-#include "nm-checkpoint.h"
-#include "nm-client.h"
-#include "nm-device-adsl.h"
-#include "nm-device-bond.h"
-#include "nm-device-bridge.h"
-#include "nm-device-bt.h"
-#include "nm-device-dummy.h"
-#include "nm-device-ethernet.h"
-#include "nm-device-generic.h"
-#include "nm-device-infiniband.h"
-#include "nm-device-ip-tunnel.h"
-#include "nm-device-macsec.h"
-#include "nm-device-macvlan.h"
-#include "nm-device-modem.h"
-#include "nm-device-olpc-mesh.h"
-#include "nm-device-ovs-interface.h"
-#include "nm-device-ovs-port.h"
-#include "nm-device-ovs-bridge.h"
-#include "nm-device-ppp.h"
-#include "nm-device-team.h"
-#include "nm-device-tun.h"
-#include "nm-device-vlan.h"
-#include "nm-device-vxlan.h"
-#include "nm-device-wifi.h"
-#include "nm-device-wimax.h"
-#include "nm-device.h"
-#include "nm-dhcp-config.h"
-#include "nm-ip-config.h"
-#include "nm-object.h"
-#include "nm-remote-connection.h"
-#include "nm-types.h"
-#include "nm-vpn-connection.h"
-#include "nm-vpn-editor.h"
-#include "nm-wimax-nsp.h"
 #include "nm-secret-agent-old.h"
 #include "nm-vpn-plugin-old.h"
-#include "nm-vpn-service-plugin.h"
+
 /*** END file-header ***/
 
 /*** BEGIN value-header ***/

src/libnm-client-public/nm-ip-config.h

@@ -27,6 +27,7 @@ G_BEGIN_DECLS
 /**
  * NMIPConfig:
  */
+typedef struct _NMIPConfig      NMIPConfig;
 typedef struct _NMIPConfigClass NMIPConfigClass;
 
 #define NM_IP_CONFIG_FAMILY       "family"

src/libnm-client-public/nm-object.h

@@ -11,8 +11,6 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include "nm-types.h"
-
 G_BEGIN_DECLS
 
 #define NM_TYPE_OBJECT            (nm_object_get_type())
@@ -25,9 +23,12 @@ G_BEGIN_DECLS
 #define NM_OBJECT_PATH   "path"
 #define NM_OBJECT_CLIENT "client"
 
+typedef struct _NMClient NMClient;
+
 /**
  * NMObject:
  */
+typedef struct _NMObject      NMObject;
 typedef struct _NMObjectClass NMObjectClass;
 
 GType nm_object_get_type(void);

src/libnm-client-public/nm-remote-connection.h

@@ -37,6 +37,7 @@ G_BEGIN_DECLS
 /**
  * NMRemoteConnection:
  */
+typedef struct _NMRemoteConnection      NMRemoteConnection;
 typedef struct _NMRemoteConnectionClass NMRemoteConnectionClass;
 
 GType nm_remote_connection_get_type(void);

src/libnm-client-public/nm-secret-agent-old.h

@@ -6,8 +6,6 @@
 #ifndef __NM_SECRET_AGENT_OLD_H__
 #define __NM_SECRET_AGENT_OLD_H__
 
-#include "nm-types.h"
-
 G_BEGIN_DECLS
 
 #define NM_TYPE_SECRET_AGENT_OLD (nm_secret_agent_old_get_type())

src/libnm-client-public/nm-types.h

@@ -1,56 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-/*
- * Copyright (C) 2014 - 2018 Red Hat, Inc.
- */
-
-#ifndef __NM_TYPES_H__
-#define __NM_TYPES_H__
-
-#include <gio/gio.h>
-
-#include "nm-dbus-interface.h"
-#include "nm-connection.h"
-
-typedef struct _NMAccessPoint        NMAccessPoint;
-typedef struct _NMActiveConnection   NMActiveConnection;
-typedef struct _NMCheckpoint         NMCheckpoint;
-typedef struct _NMClient             NMClient;
-typedef struct _NMDevice             NMDevice;
-typedef struct _NMDevice6Lowpan      NMDevice6Lowpan;
-typedef struct _NMDeviceAdsl         NMDeviceAdsl;
-typedef struct _NMDeviceBond         NMDeviceBond;
-typedef struct _NMDeviceBridge       NMDeviceBridge;
-typedef struct _NMDeviceBt           NMDeviceBt;
-typedef struct _NMDeviceDummy        NMDeviceDummy;
-typedef struct _NMDeviceEthernet     NMDeviceEthernet;
-typedef struct _NMDeviceGeneric      NMDeviceGeneric;
-typedef struct _NMDeviceIPTunnel     NMDeviceIPTunnel;
-typedef struct _NMDeviceInfiniband   NMDeviceInfiniband;
-typedef struct _NMDeviceMacsec       NMDeviceMacsec;
-typedef struct _NMDeviceMacvlan      NMDeviceMacvlan;
-typedef struct _NMDeviceModem        NMDeviceModem;
-typedef struct _NMDeviceOlpcMesh     NMDeviceOlpcMesh;
-typedef struct _NMDeviceOvsBridge    NMDeviceOvsBridge;
-typedef struct _NMDeviceOvsInterface NMDeviceOvsInterface;
-typedef struct _NMDeviceOvsPort      NMDeviceOvsPort;
-typedef struct _NMDevicePpp          NMDevicePpp;
-typedef struct _NMDeviceTeam         NMDeviceTeam;
-typedef struct _NMDeviceTun          NMDeviceTun;
-typedef struct _NMDeviceVeth         NMDeviceVeth;
-typedef struct _NMDeviceVlan         NMDeviceVlan;
-typedef struct _NMDeviceVrf          NMDeviceVrf;
-typedef struct _NMDeviceVxlan        NMDeviceVxlan;
-typedef struct _NMDeviceWifi         NMDeviceWifi;
-typedef struct _NMDeviceWifiP2P      NMDeviceWifiP2P;
-typedef struct _NMDeviceWimax        NMDeviceWimax;
-typedef struct _NMDeviceWireGuard    NMDeviceWireGuard;
-typedef struct _NMDeviceWpan         NMDeviceWpan;
-typedef struct _NMDhcpConfig         NMDhcpConfig;
-typedef struct _NMIPConfig           NMIPConfig;
-typedef struct _NMObject             NMObject;
-typedef struct _NMRemoteConnection   NMRemoteConnection;
-typedef struct _NMVpnConnection      NMVpnConnection;
-typedef struct _NMWifiP2PPeer        NMWifiP2PPeer;
-typedef struct _NMWimaxNsp           NMWimaxNsp;
-
-#endif /* NM_TYPES_H */

src/libnm-client-public/nm-vpn-connection.h

@@ -32,6 +32,7 @@ G_BEGIN_DECLS
 /**
  * NMVpnConnection:
  */
+typedef struct _NMVpnConnection      NMVpnConnection;
 typedef struct _NMVpnConnectionClass NMVpnConnectionClass;
 
 GType nm_vpn_connection_get_type(void);

src/libnm-client-public/nm-vpn-editor.h

@@ -13,7 +13,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "nm-types.h"
 
 #include "nm-vpn-editor-plugin.h"
 

src/libnm-client-public/nm-wifi-p2p-peer.h

@@ -38,6 +38,7 @@ G_BEGIN_DECLS
 /**
  * NMWifiP2PPeer:
  */
+typedef struct _NMWifiP2PPeer      NMWifiP2PPeer;
 typedef struct _NMWifiP2PPeerClass NMWifiP2PPeerClass;
 
 NM_AVAILABLE_IN_1_16

src/libnm-client-public/nm-wimax-nsp.h

@@ -33,6 +33,7 @@ G_BEGIN_DECLS
  *
  * Deprecated: 1.22: WiMAX is no longer supported by NetworkManager since 1.2.0.
  */
+typedef struct _NMWimaxNsp      NMWimaxNsp;
 typedef struct _NMWimaxNspClass NMWimaxNspClass;
 
 GType nm_wimax_nsp_get_type(void);