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, 3 insertions, 5 deletions

diff --git a/libnm/nm-object.h b/libnm/nm-object.h
index 69232364f4..829c539229 100644
--- a/libnm/nm-object.h
+++ b/libnm/nm-object.h
@@ -26,9 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <gio/gio.h>
-
-#include <nm-version.h>
+#include <nm-types.h>
 
 G_BEGIN_DECLS
 
@@ -58,9 +56,9 @@ GQuark nm_object_error_quark (void);
 #define NM_OBJECT_PATH "path"
 #define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 
-typedef struct {
+struct _NMObject {
 	GObject parent;
-} NMObject;
+};
 
 typedef struct {
 	GObjectClass parent;