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

diff --git a/libnm/nm-device-wifi.h b/libnm/nm-device-wifi.h
index bb9788cc07..7947f6959f 100644
--- a/libnm/nm-device-wifi.h
+++ b/libnm/nm-device-wifi.h
@@ -26,8 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include "nm-device.h"
-#include "nm-access-point.h"
+#include <nm-device.h>
 
 G_BEGIN_DECLS
 
@@ -71,9 +70,9 @@ GQuark nm_device_wifi_error_quark (void);
 #define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 #define NM_DEVICE_WIFI_ACCESS_POINTS       "access-points"
 
-typedef struct {
+struct _NMDeviceWifi {
 	NMDevice parent;
-} NMDeviceWifi;
+};
 
 typedef struct {
 	NMDeviceClass parent;