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

diff --git a/src/nm-dhcp4-config.h b/src/nm-dhcp4-config.h
index 6eb9ee5752..e893f892b7 100644
--- a/src/nm-dhcp4-config.h
+++ b/src/nm-dhcp4-config.h
@@ -24,6 +24,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include "nm-types.h"
+
 #define NM_TYPE_DHCP4_CONFIG            (nm_dhcp4_config_get_type ())
 #define NM_DHCP4_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP4_CONFIG, NMDHCP4Config))
 #define NM_DHCP4_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigClass))
@@ -31,9 +33,9 @@
 #define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG))
 #define NM_DHCP4_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigClass))
 
-typedef struct {
+struct _NMDHCP4Config {
 	GObject parent;
-} NMDHCP4Config;
+};
 
 typedef struct {
 	GObjectClass parent;