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.)

9 files changed, 1 insertions, 96 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 === */