libnm: add nm-types.h, to avoid include loops

Add nm-types.h defining all the type structs, to avoid future include
loops. Clean up the includes in all of the installed headers.

1 files changed, 4 insertions, 6 deletions

diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h
index 86a78d2e0b..349de41ea5 100644
--- a/libnm/nm-vpn-connection.h
+++ b/libnm/nm-vpn-connection.h
@@ -26,10 +26,8 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <glib.h>
-#include <glib-object.h>
-#include "nm-active-connection.h"
-#include "nm-vpn-dbus-interface.h"
+#include <nm-active-connection.h>
+#include <nm-vpn-dbus-interface.h>
 
 G_BEGIN_DECLS
 
@@ -43,9 +41,9 @@ G_BEGIN_DECLS
 #define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
 #define NM_VPN_CONNECTION_BANNER "banner"
 
-typedef struct {
+struct _NMVpnConnection {
 	NMActiveConnection parent;
-} NMVpnConnection;
+};
 
 typedef struct {
 	NMActiveConnectionClass parent;