libnm: add NetworkManager.h, disallow including individual headers

Add NetworkManager.h, which includes all of the other NM header, and
require all external users of libnm to use that rather than the
individual headers.

(An exception is made for nm-dbus-interface.h,
nm-vpn-dbus-interface.h, and nm-version.h, which can be included
separately.)

33 files changed, 22 insertions, 147 deletions

diff --git a/clients/cli/common.h b/clients/cli/common.h
index 1397194f17..a1a45e3ad3 100644
--- a/clients/cli/common.h
+++ b/clients/cli/common.h
@@ -22,14 +22,6 @@
 #ifndef NMC_COMMON_H
 #define NMC_COMMON_H
 
-#include <glib.h>
-
-#include <nm-ip4-config.h>
-#include <nm-ip6-config.h>
-#include <nm-dhcp4-config.h>
-#include <nm-dhcp6-config.h>
-#include <nm-device.h>
-
 #include "nmcli.h"
 
 gboolean print_ip4_config (NMIP4Config *cfg4, NmCli *nmc, const char *group_prefix, const char *one_field);
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 605de2e0cc..0c6d0e3a00 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -33,25 +33,6 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include <nm-client.h>
-#include <nm-device-ethernet.h>
-#include <nm-device-adsl.h>
-#include <nm-device-wifi.h>
-#if WITH_WIMAX
-#include <nm-device-wimax.h>
-#endif
-#include <nm-device-modem.h>
-#include <nm-device-bt.h>
-#include <nm-device-olpc-mesh.h>
-#include <nm-device-infiniband.h>
-#include <nm-device-bond.h>
-#include <nm-device-team.h>
-#include <nm-device-bridge.h>
-#include <nm-device-vlan.h>
-#include <nm-remote-settings.h>
-#include <nm-vpn-connection.h>
-#include <nm-utils.h>
-
 #include "utils.h"
 #include "common.h"
 #include "settings.h"
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 9cf8203d7d..65629a68ff 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -29,39 +29,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <nm-client.h>
-#include <nm-device.h>
-#include <nm-device-ethernet.h>
-#include <nm-device-adsl.h>
-#include <nm-device-wifi.h>
-#include <nm-device-modem.h>
-#include <nm-device-bt.h>
-#include <nm-device-olpc-mesh.h>
-#if WITH_WIMAX
-#include <nm-device-wimax.h>
-#endif
-#include <nm-device-infiniband.h>
-#include <nm-device-bond.h>
-#include <nm-device-bridge.h>
-#include <nm-device-vlan.h>
-#include <nm-utils.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-vpn-connection.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-adsl.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-bluetooth.h>
-#include <nm-setting-olpc-mesh.h>
-#if WITH_WIMAX
-#include <nm-setting-wimax.h>
-#endif
-#include <nm-setting-infiniband.h>
-
 #include "utils.h"
 #include "common.h"
 #include "devices.h"
diff --git a/clients/cli/network-manager.c b/clients/cli/network-manager.c
index dc55100abd..cace83256f 100644
--- a/clients/cli/network-manager.c
+++ b/clients/cli/network-manager.c
@@ -25,8 +25,6 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <nm-client.h>
-#include <nm-setting-connection.h>
 
 #include "utils.h"
 #include "network-manager.h"
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index d5076a6012..ab0455d473 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -33,9 +33,6 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <nm-client.h>
-#include <nm-setting-connection.h>
-#include <nm-remote-settings.h>
 
 #include "nmcli.h"
 #include "utils.h"
diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h
index 163832eac7..5582b1d2ad 100644
--- a/clients/cli/nmcli.h
+++ b/clients/cli/nmcli.h
@@ -20,10 +20,7 @@
 #ifndef NMC_NMCLI_H
 #define NMC_NMCLI_H
 
-#include <glib.h>
-
-#include <nm-client.h>
-#include <nm-remote-settings.h>
+#include <NetworkManager.h>
 
 /* nmcli exit codes */
 typedef enum {
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index c952ecda96..6d49545787 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -25,7 +25,6 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <nm-utils.h>
 
 #include "utils.h"
 #include "common.h"
diff --git a/clients/cli/settings.h b/clients/cli/settings.h
index 709c8977fa..5960586512 100644
--- a/clients/cli/settings.h
+++ b/clients/cli/settings.h
@@ -20,30 +20,6 @@
 #ifndef NMC_SETTINGS_H
 #define NMC_SETTINGS_H
 
-#include <nm-setting-connection.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-adsl.h>
-#include <nm-setting-8021x.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-wireless-security.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-setting-serial.h>
-#include <nm-setting-ppp.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-bluetooth.h>
-#include <nm-setting-olpc-mesh.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-wimax.h>
-#include <nm-setting-infiniband.h>
-#include <nm-setting-bond.h>
-#include <nm-setting-bridge.h>
-#include <nm-setting-bridge-port.h>
-#include <nm-setting-vlan.h>
-#include <nm-setting-dcb.h>
-
 #include "nmcli.h"
 #include "utils.h"
 
diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index e92952f331..ea59c4ed55 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -20,8 +20,6 @@
 #ifndef NMC_UTILS_H
 #define NMC_UTILS_H
 
-#include <glib.h>
-
 #include "nmcli.h"
 
 /* === Types === */
diff --git a/clients/nm-online.c b/clients/nm-online.c
index 234eac9b0a..af40022b31 100644
--- a/clients/nm-online.c
+++ b/clients/nm-online.c
@@ -40,7 +40,7 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-client.h"
+#include <NetworkManager.h>
 
 #define PROGRESS_STEPS 15
 #define WAIT_STARTUP_TAG "wait-startup"
diff --git a/clients/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h
index a7a32dd142..e1637f45d7 100644
--- a/clients/tui/nm-editor-bindings.h
+++ b/clients/tui/nm-editor-bindings.h
@@ -19,10 +19,7 @@
 #ifndef NM_EDITOR_BINDINGS_H
 #define NM_EDITOR_BINDINGS_H
 
-#include <glib-object.h>
-#include <nm-connection.h>
-#include <nm-setting-wireless-security.h>
-#include <nm-setting-vlan.h>
+#include <NetworkManager.h>
 
 G_BEGIN_DECLS
 
diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c
index 4ac0eb6413..96f35cc670 100644
--- a/clients/tui/nm-editor-utils.c
+++ b/clients/tui/nm-editor-utils.c
@@ -28,16 +28,7 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <nm-utils.h>
-
-#include <nm-device-bond.h>
-#include <nm-device-bridge.h>
-#include <nm-device-team.h>
-#include <nm-device-ethernet.h>
-#include <nm-device-infiniband.h>
-#include <nm-device-team.h>
-#include <nm-device-vlan.h>
-#include <nm-device-wifi.h>
+#include <NetworkManager.h>
 
 #include "nm-editor-utils.h"
 #if 0
diff --git a/clients/tui/nm-editor-utils.h b/clients/tui/nm-editor-utils.h
index 4b9ad5edbb..8d61d7525a 100644
--- a/clients/tui/nm-editor-utils.h
+++ b/clients/tui/nm-editor-utils.h
@@ -19,8 +19,7 @@
 #ifndef NM_EDITOR_UTILS_H
 #define NM_EDITOR_UTILS_H
 
-#include <glib-object.h>
-#include <nm-remote-settings.h>
+#include <NetworkManager.h>
 
 G_BEGIN_DECLS
 
diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c
index fffdc8ea4e..aadd74b395 100644
--- a/clients/tui/nmt-connect-connection-list.c
+++ b/clients/tui/nmt-connect-connection-list.c
@@ -29,9 +29,7 @@
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 
-#include <nm-access-point.h>
-#include <nm-device-wifi.h>
-#include <nm-utils.h>
+#include <NetworkManager.h>
 
 #include "nmtui.h"
 #include "nmt-connect-connection-list.h"
diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
index de8b630554..47435ead55 100644
--- a/clients/tui/nmt-device-entry.c
+++ b/clients/tui/nmt-device-entry.c
@@ -41,9 +41,7 @@
 #include <linux/if_arp.h>
 
 #include <glib/gi18n-lib.h>
-#include <nm-device.h>
-#include <nm-device-infiniband.h>
-#include <nm-utils.h>
+#include <NetworkManager.h>
 
 #include "nmtui.h"
 #include "nmt-device-entry.h"
diff --git a/clients/tui/nmt-device-entry.h b/clients/tui/nmt-device-entry.h
index 2b959aaa85..d44126a869 100644
--- a/clients/tui/nmt-device-entry.h
+++ b/clients/tui/nmt-device-entry.h
@@ -21,8 +21,7 @@
 
 #include "nmt-page-grid.h"
 
-#include <nm-connection.h>
-#include <nm-device.h>
+#include <NetworkManager.h>
 
 G_BEGIN_DECLS
 
diff --git a/clients/tui/nmt-edit-connection-list.h b/clients/tui/nmt-edit-connection-list.h
index 35157e94dc..a359170a1b 100644
--- a/clients/tui/nmt-edit-connection-list.h
+++ b/clients/tui/nmt-edit-connection-list.h
@@ -21,7 +21,7 @@
 
 #include "nmt-newt.h"
 
-#include <nm-remote-connection.h>
+#include <NetworkManager.h>
 
 G_BEGIN_DECLS
 
diff --git a/clients/tui/nmt-editor-page.h b/clients/tui/nmt-editor-page.h
index d9a97102ee..8addabebd3 100644
--- a/clients/tui/nmt-editor-page.h
+++ b/clients/tui/nmt-editor-page.h
@@ -19,7 +19,7 @@
 #ifndef NMT_EDITOR_PAGE_H
 #define NMT_EDITOR_PAGE_H
 
-#include <nm-connection.h>
+#include <NetworkManager.h>
 
 #include "nmt-page-grid.h"
 
diff --git a/clients/tui/nmt-editor.h b/clients/tui/nmt-editor.h
index a991a7666a..db10b82a18 100644
--- a/clients/tui/nmt-editor.h
+++ b/clients/tui/nmt-editor.h
@@ -19,7 +19,7 @@
 #ifndef NMT_EDITOR_H
 #define NMT_EDITOR_H
 
-#include <nm-connection.h>
+#include <NetworkManager.h>
 
 #include "nmt-newt.h"
 
diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c
index 0dad12363b..b3ca8097fd 100644
--- a/clients/tui/nmt-mac-entry.c
+++ b/clients/tui/nmt-mac-entry.c
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include <dbus/dbus-glib.h>
-#include <nm-utils.h>
+#include <NetworkManager.h>
 
 #include "nmt-mac-entry.h"
 
diff --git a/clients/tui/nmt-page-main.c b/clients/tui/nmt-page-main.c
index d22ec83459..2e1510f375 100644
--- a/clients/tui/nmt-page-main.c
+++ b/clients/tui/nmt-page-main.c
@@ -30,8 +30,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include <nm-device.h>
-#include <nm-utils.h>
+#include <NetworkManager.h>
 
 #include "nmt-page-main.h"
 #include "nmt-device-entry.h"
diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c
index f6de671c85..c3bc7076b1 100644
--- a/clients/tui/nmt-page-vlan.c
+++ b/clients/tui/nmt-page-vlan.c
@@ -26,8 +26,6 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include <nm-device-ethernet.h>
-
 #include "nm-editor-bindings.h"
 
 #include "nmt-page-vlan.h"
diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c
index 153aee7ca5..12b2f4e59d 100644
--- a/clients/tui/nmt-page-wifi.c
+++ b/clients/tui/nmt-page-wifi.c
@@ -31,7 +31,6 @@
 
 #include <glib.h>
 #include <glib/gi18n-lib.h>
-#include <nm-utils.h>
 
 #include "nmt-page-wifi.h"
 #include "nmt-mac-entry.h"
diff --git a/clients/tui/nmt-route-editor.h b/clients/tui/nmt-route-editor.h
index e1040dffd9..9882c71389 100644
--- a/clients/tui/nmt-route-editor.h
+++ b/clients/tui/nmt-route-editor.h
@@ -19,7 +19,7 @@
 #ifndef NMT_ROUTE_EDITOR_H
 #define NMT_ROUTE_EDITOR_H
 
-#include <nm-connection.h>
+#include <NetworkManager.h>
 
 #include "nmt-newt.h"
 
diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c
index 70a9003b43..9b22f389dc 100644
--- a/clients/tui/nmt-route-entry.c
+++ b/clients/tui/nmt-route-entry.c
@@ -33,8 +33,7 @@
 #include <stdlib.h>
 
 #include <glib/gi18n-lib.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
+#include <NetworkManager.h>
 
 #include "nmt-route-entry.h"
 #include "nmt-ip-entry.h"
diff --git a/clients/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c
index c2edf2ac5c..c5a70761d1 100644
--- a/clients/tui/nmt-route-table.c
+++ b/clients/tui/nmt-route-table.c
@@ -32,7 +32,8 @@
 
 #include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
-#include <nm-utils.h>
+#include <NetworkManager.h>
+#include <nm-utils-private.h>
 
 #include "nmt-route-table.h"
 #include "nmt-route-entry.h"
diff --git a/clients/tui/nmt-secret-agent.c b/clients/tui/nmt-secret-agent.c
index 147e11957c..13a0927025 100644
--- a/clients/tui/nmt-secret-agent.c
+++ b/clients/tui/nmt-secret-agent.c
@@ -35,8 +35,6 @@
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n-lib.h>
 
-#include <nm-utils.h>
-
 #include "nmt-secret-agent.h"
 #include "nmt-newt.h"
 
diff --git a/clients/tui/nmt-secret-agent.h b/clients/tui/nmt-secret-agent.h
index 04b1581946..e7f6ef846b 100644
--- a/clients/tui/nmt-secret-agent.h
+++ b/clients/tui/nmt-secret-agent.h
@@ -19,7 +19,7 @@
 #ifndef NMT_SECRET_AGENT_H
 #define NMT_SECRET_AGENT_H
 
-#include <nm-secret-agent.h>
+#include <NetworkManager.h>
 
 G_BEGIN_DECLS
 
diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c
index d6b60be42a..459b944b9b 100644
--- a/clients/tui/nmt-slave-list.c
+++ b/clients/tui/nmt-slave-list.c
@@ -27,8 +27,7 @@
 #include "config.h"
 
 #include <glib/gi18n-lib.h>
-
-#include <nm-remote-connection.h>
+#include <NetworkManager.h>
 
 #include "nmt-slave-list.h"
 
diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c
index a86b8df57d..ca523ebbaf 100644
--- a/clients/tui/nmtui-connect.c
+++ b/clients/tui/nmtui-connect.c
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 
 #include <glib/gi18n-lib.h>
-#include <nm-utils.h>
 
 #include "nmt-newt.h"
 
diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c
index 2e59204b64..a564ff3685 100644
--- a/clients/tui/nmtui-edit.c
+++ b/clients/tui/nmtui-edit.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 
 #include <glib/gi18n-lib.h>
-#include <nm-utils.h>
+#include <NetworkManager.h>
 
 #include "nmtui.h"
 #include "nmtui-edit.h"
diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index 35f8ccb9a9..795f663d93 100644
--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@@ -33,10 +33,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include <nm-client.h>
-#include <nm-connection.h>
-#include <nm-remote-settings.h>
-#include <nm-utils.h>
+#include <NetworkManager.h>
 
 #include "nmt-newt.h"
 #include "nm-editor-bindings.h"
diff --git a/clients/tui/nmtui.h b/clients/tui/nmtui.h
index 3e462b1130..10b9c06ade 100644
--- a/clients/tui/nmtui.h
+++ b/clients/tui/nmtui.h
@@ -19,8 +19,7 @@
 #ifndef NMTUI_H
 #define NMTUI_H
 
-#include <nm-client.h>
-#include <nm-remote-settings.h>
+#include <NetworkManager.h>
 
 G_BEGIN_DECLS