core: fill in nm-types.h, clean out other headers

Clean up some of the cross-includes between headers (which made it so
that, eg, if you included NetworkManagerUtils.h in a test program, you
would need to build the test with -I$(top_srcdir)/src/platform, and if
you included nm-device.h you'd need $(POLKIT_CFLAGS)) by moving all
GObject struct definitions for src/ and src/settings/ into nm-types.h
(which already existed to solve the NMDevice/NMActRequest circular
references).

Update various .c files to explicitly include the headers they used to
get implicitly, and remove some now-unnecessary -I options from
Makefiles.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h
index 04d0f2a309..3c9175041e 100644
--- a/src/nm-connectivity.h
+++ b/src/nm-connectivity.h
@@ -26,6 +26,7 @@
 #include <gio/gio.h>
 
 #include "NetworkManager.h"
+#include "nm-types.h"
 
 #define NM_TYPE_CONNECTIVITY            (nm_connectivity_get_type ())
 #define NM_CONNECTIVITY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTIVITY, NMConnectivity))
@@ -40,9 +41,9 @@
 #define NM_CONNECTIVITY_RESPONSE  "response"
 #define NM_CONNECTIVITY_STATE     "state"
 
-typedef struct {
+struct _NMConnectivity {
 	GObject parent;
-} NMConnectivity;
+};
 
 typedef struct {
 	GObjectClass parent;