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

diff --git a/libnm/nm-device-infiniband.h b/libnm/nm-device-infiniband.h
index 279af5026f..ac15410afa 100644
--- a/libnm/nm-device-infiniband.h
+++ b/libnm/nm-device-infiniband.h
@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include "nm-device.h"
+#include <nm-device.h>
 
 G_BEGIN_DECLS
 
@@ -58,9 +58,9 @@ GQuark nm_device_infiniband_error_quark (void);
 #define NM_DEVICE_INFINIBAND_HW_ADDRESS  "hw-address"
 #define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
 
-typedef struct {
+struct _NMDeviceInfiniband {
 	NMDevice parent;
-} NMDeviceInfiniband;
+};
 
 typedef struct {
 	NMDeviceClass parent;