Merge branch 'debian/master' into ubuntu/master

1 files changed, 61 insertions, 48 deletions

diff --git a/src/libnm-client-public/NetworkManager.h b/src/libnm-client-public/NetworkManager.h
index 66f676a1..1cd94d11 100644
--- a/src/libnm-client-public/NetworkManager.h
+++ b/src/libnm-client-public/NetworkManager.h
@@ -8,48 +8,19 @@
 
 #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-device-6lowpan.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-bridge.h"
-#include "nm-device-ovs-interface.h"
-#include "nm-device-ovs-port.h"
-#include "nm-device-ppp.h"
-#include "nm-device-team.h"
-#include "nm-device-tun.h"
-#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-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-core-enum-types.h"
+
+#include "nm-connection.h"
+#include "nm-simple-connection.h"
 #include "nm-keyfile.h"
-#include "nm-object.h"
-#include "nm-remote-connection.h"
+#include "nm-setting.h"
+#include "nm-utils.h"
+
 #include "nm-setting-6lowpan.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-adsl.h"
@@ -102,18 +73,60 @@
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-wpan.h"
-#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-vpn-editor-plugin.h"
+
+#include "nm-enum-types.h"
+
+#include "nm-ethtool-utils.h"
+
+#include "nm-object.h"
+#include "nm-conn-utils.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-access-point.h"
 #include "nm-wifi-p2p-peer.h"
 #include "nm-wimax-nsp.h"
+#include "nm-device.h"
+#include "nm-vpn-connection.h"
+#include "nm-vpn-editor.h"
+#include "nm-vpn-service-plugin.h"
+
+#include "nm-client.h"
+
+#include "nm-device-6lowpan.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-ovs-bridge.h"
+#include "nm-device-ovs-interface.h"
+#include "nm-device-ovs-port.h"
+#include "nm-device-ppp.h"
+#include "nm-device-team.h"
+#include "nm-device-tun.h"
+#include "nm-device-veth.h"
+#include "nm-device-vlan.h"
+#include "nm-device-vxlan.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-autoptr.h"