diff options
48 files changed, 142 insertions, 165 deletions
diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c index ece5ff2d75..42c598ed1d 100644 --- a/callouts/nm-dispatcher.c +++ b/callouts/nm-dispatcher.c @@ -20,6 +20,8 @@ #include "config.h" +#include "nm-default.h" + #include <syslog.h> #include <stdio.h> #include <unistd.h> @@ -31,14 +33,10 @@ #include <sys/wait.h> #include <errno.h> #include <arpa/inet.h> - #include <glib-unix.h> -#include "nm-default.h" #include "nm-dispatcher-api.h" #include "nm-dispatcher-utils.h" -#include "nm-macros-internal.h" -#include "gsystem-local-alloc.h" #include "nmdbus-dispatcher.h" diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 5809a0fc88..e9c2670cca 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -19,15 +19,14 @@ #include "config.h" +#include "nm-default.h" +#include "settings.h" + #include <stdlib.h> #include <arpa/inet.h> -#include "nm-default.h" #include "utils.h" #include "common.h" -#include "settings.h" -#include "nm-macros-internal.h" -#include "gsystem-local-alloc.h" /* Forward declarations */ static char *wep_key_type_to_string (NMWepKeyType type); diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index 36e8e6b25c..bfb01cd720 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -25,14 +25,13 @@ #include "config.h" +#include "nm-default.h" +#include "nm-vpn-helpers.h" + #include <string.h> #include <gmodule.h> -#include "nm-default.h" #include "nm-utils.h" -#include "nm-vpn-helpers.h" - -#include "nm-macros-internal.h" static gboolean plugins_loaded; static GSList *plugins = NULL; diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c index 6a0584a539..5f3d1ee43c 100644 --- a/libnm-core/nm-keyfile-reader.c +++ b/libnm-core/nm-keyfile-reader.c @@ -21,6 +21,9 @@ #include "config.h" +#include "nm-default.h" +#include "nm-keyfile-internal.h" + #include <errno.h> #include <stdlib.h> #include <sys/stat.h> @@ -29,10 +32,7 @@ #include <arpa/inet.h> #include <string.h> -#include "nm-default.h" #include "nm-core-internal.h" -#include "nm-macros-internal.h" -#include "nm-keyfile-internal.h" #include "nm-keyfile-utils.h" typedef struct { diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c index ba1736b996..466eddc8ee 100644 --- a/libnm-core/nm-keyfile-writer.c +++ b/libnm-core/nm-keyfile-writer.c @@ -21,6 +21,9 @@ #include "config.h" +#include "nm-default.h" +#include "nm-keyfile-internal.h" + #include <stdlib.h> #include <sys/stat.h> #include <unistd.h> @@ -30,7 +33,6 @@ #include <string.h> #include "nm-core-internal.h" -#include "nm-keyfile-internal.h" #include "nm-keyfile-utils.h" typedef struct { diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index cd0d4e664b..d3ffac5597 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -22,16 +22,16 @@ #include "config.h" -#include <string.h> - #include "nm-default.h" #include "nm-setting-8021x.h" + +#include <string.h> + #include "nm-utils.h" #include "crypto.h" #include "nm-utils-private.h" #include "nm-setting-private.h" #include "nm-core-enum-types.h" -#include "nm-macros-internal.h" /** * SECTION:nm-setting-8021x diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index f341a3987d..169e27cead 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -22,18 +22,19 @@ #include "config.h" +#include "nm-default.h" +#include "nm-setting-connection.h" + #include <string.h> #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-core-enum-types.h" -#include "nm-setting-connection.h" #include "nm-connection-private.h" #include "nm-setting-bond.h" #include "nm-setting-bridge.h" #include "nm-setting-team.h" #include "nm-setting-vlan.h" -#include "nm-macros-internal.h" /** * SECTION:nm-setting-connection diff --git a/libnm-core/nm-setting-ip-tunnel.c b/libnm-core/nm-setting-ip-tunnel.c index cd63aa119b..24aaa68711 100644 --- a/libnm-core/nm-setting-ip-tunnel.c +++ b/libnm-core/nm-setting-ip-tunnel.c @@ -18,12 +18,12 @@ * Copyright 2015 Red Hat, Inc. */ -#include "nm-setting-ip-tunnel.h" - #include "config.h" +#include "nm-default.h" +#include "nm-setting-ip-tunnel.h" + #include "nm-setting-private.h" -#include "nm-macros-internal.h" #include "nm-utils.h" /** diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index bc516d6e70..611652361e 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -21,12 +21,13 @@ #include "config.h" +#include "nm-default.h" +#include "nm-setting-ip6-config.h" + #include <string.h> -#include "nm-setting-ip6-config.h" #include "nm-setting-private.h" #include "nm-core-enum-types.h" -#include "nm-macros-internal.h" /** * SECTION:nm-setting-ip6-config diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index 92a052ebc0..9d393240f3 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -21,12 +21,13 @@ #include "config.h" +#include "nm-default.h" +#include "nm-setting-vlan.h" + #include <stdlib.h> #include <string.h> -#include "nm-setting-vlan.h" #include "nm-default.h" -#include "nm-macros-internal.h" #include "nm-utils.h" #include "nm-core-types-internal.h" #include "nm-setting-connection.h" diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 64b6697119..1f0e0a7a6e 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -22,14 +22,15 @@ #include "config.h" +#include "nm-default.h" +#include "nm-setting-wired.h" + #include <string.h> #include <net/ethernet.h> -#include "nm-setting-wired.h" #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-setting-private.h" -#include "nm-macros-internal.h" /** * SECTION:nm-setting-wired diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index b08eea108a..1fe0a636b1 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -22,16 +22,16 @@ #include "config.h" -#include <string.h> - #include "nm-default.h" #include "nm-setting.h" + +#include <string.h> + #include "nm-setting-private.h" #include "nm-utils.h" #include "nm-core-internal.h" #include "nm-utils-private.h" #include "nm-property-compare.h" -#include "nm-macros-internal.h" #include "nm-setting-connection.h" #include "nm-setting-bond.h" diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 930f528e0c..631c099ac9 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -21,6 +21,9 @@ #include "config.h" +#include "nm-default.h" +#include "nm-utils.h" + #include <string.h> #include <errno.h> #include <stdlib.h> @@ -31,13 +34,9 @@ #include <gmodule.h> #include <sys/stat.h> -#include "nm-default.h" -#include "nm-utils.h" #include "nm-utils-private.h" #include "nm-setting-private.h" #include "crypto.h" -#include "nm-macros-internal.h" - #include "nm-setting-bond.h" #include "nm-setting-bridge.h" #include "nm-setting-infiniband.h" diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c index e97c4beba1..8d5acd36ff 100644 --- a/libnm-core/nm-vpn-editor-plugin.c +++ b/libnm-core/nm-vpn-editor-plugin.c @@ -22,12 +22,9 @@ #include "config.h" +#include "nm-default.h" #include "nm-vpn-editor-plugin.h" -#include <gio/gio.h> - -#include "nm-macros-internal.h" -#include "gsystem-local-alloc.h" #include "nm-core-internal.h" static void nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface); diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c index 6ef99e916f..44c54c4ce9 100644 --- a/libnm-core/nm-vpn-plugin-info.c +++ b/libnm-core/nm-vpn-plugin-info.c @@ -20,16 +20,14 @@ #include "config.h" +#include "nm-default.h" #include "nm-vpn-plugin-info.h" -#include <gio/gio.h> #include <string.h> #include <errno.h> #include <sys/stat.h> -#include "gsystem-local-alloc.h" #include "nm-errors.h" -#include "nm-macros-internal.h" #include "nm-core-internal.h" #define DEFAULT_DIR_ETC NMCONFDIR"/VPN" diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c index 99f88ac543..d6ba8d4bc8 100644 --- a/libnm-core/tests/test-keyfile.c +++ b/libnm-core/tests/test-keyfile.c @@ -21,10 +21,10 @@ #include "config.h" -#include "nm-macros-internal.h" +#include "nm-default.h" + #include "nm-keyfile-utils.h" #include "nm-keyfile-internal.h" - #include "nm-simple-connection.h" #include "nm-setting-connection.h" #include "nm-setting-wired.h" diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index 34c8bb3773..61223e2a4a 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -21,12 +21,13 @@ #include "config.h" +#include "nm-default.h" +#include "nm-client.h" + #include <dbus/dbus-glib.h> #include <string.h> #include <nm-utils.h> -#include "nm-default.h" -#include "nm-client.h" #include "nm-device-ethernet.h" #include "nm-device-wifi.h" #include "nm-device-private.h" @@ -36,7 +37,6 @@ #include "nm-vpn-connection.h" #include "nm-object-cache.h" #include "nm-dbus-glib-types.h" -#include "gsystem-local-alloc.h" void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled); diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index 29d88d1c6c..aa4fabf407 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -21,14 +21,15 @@ #include "config.h" -#include <signal.h> #include "nm-default.h" #include "nm-vpn-plugin.h" + +#include <signal.h> + #include "nm-vpn-enum-types.h" #include "nm-utils.h" #include "nm-connection.h" #include "nm-dbus-glib-types.h" -#include "nm-macros-internal.h" static gboolean impl_vpn_plugin_connect (NMVPNPlugin *plugin, GHashTable *connection, diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index 30febf9ce1..00138ace9c 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -22,17 +22,18 @@ #include "config.h" +#include "nm-default.h" +#include "nm-setting-8021x.h" + #include <string.h> #include <dbus/dbus-glib.h> -#include "nm-setting-8021x.h" #include "nm-param-spec-specialized.h" #include "nm-utils.h" #include "nm-dbus-glib-types.h" #include "crypto.h" #include "nm-utils-private.h" #include "nm-setting-private.h" -#include "nm-macros-internal.h" /** * SECTION:nm-setting-8021x diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 1659a1a3c9..5f5dc1f663 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -21,6 +21,9 @@ #include "config.h" +#include "nm-default.h" +#include "nm-utils.h" + #include <string.h> #include <stdlib.h> #include <netinet/ether.h> @@ -29,14 +32,11 @@ #include <libintl.h> #include <gmodule.h> -#include "nm-default.h" #include "nm-gvaluearray-compat.h" -#include "nm-utils.h" #include "nm-utils-private.h" #include "nm-dbus-glib-types.h" #include "nm-setting-private.h" #include "crypto.h" -#include "nm-macros-internal.h" /* Embed the commit id in the build binary */ static const char *const __nm_git_sha = STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : ""; diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c index 852b280856..a15190c7da 100644 --- a/libnm/nm-access-point.c +++ b/libnm/nm-access-point.c @@ -21,19 +21,19 @@ #include "config.h" +#include "nm-default.h" +#include "nm-access-point.h" + #include <string.h> -#include <nm-connection.h> -#include <nm-setting-connection.h> -#include <nm-setting-wireless.h> -#include <nm-setting-wireless-security.h> -#include <nm-utils.h> +#include "nm-connection.h" +#include "nm-setting-connection.h" +#include "nm-setting-wireless.h" +#include "nm-setting-wireless-security.h" +#include "nm-utils.h" -#include "nm-default.h" -#include "nm-access-point.h" #include "nm-dbus-interface.h" #include "nm-object-private.h" -#include "nm-macros-internal.h" G_DEFINE_TYPE (NMAccessPoint, nm_access_point, NM_TYPE_OBJECT) diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c index 3c0393752d..6242bb2717 100644 --- a/libnm/nm-dbus-helpers.c +++ b/libnm/nm-dbus-helpers.c @@ -20,12 +20,12 @@ #include "config.h" -#include <string.h> - #include "nm-default.h" #include "nm-dbus-helpers.h" + +#include <string.h> + #include "nm-dbus-interface.h" -#include "nm-macros-internal.h" static GBusType nm_bus = G_BUS_TYPE_SYSTEM; diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c index 9019e0384d..4d3545c8bd 100644 --- a/libnm/nm-device-wifi.c +++ b/libnm/nm-device-wifi.c @@ -21,22 +21,22 @@ #include "config.h" +#include "nm-default.h" +#include "nm-device-wifi.h" + #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-wireless.h> -#include <nm-setting-wireless-security.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-wireless.h" +#include "nm-setting-wireless-security.h" +#include "nm-utils.h" -#include "nm-default.h" -#include "nm-device-wifi.h" #include "nm-access-point.h" #include "nm-device-private.h" #include "nm-object-private.h" #include "nm-object-cache.h" #include "nm-core-internal.h" #include "nm-dbus-helpers.h" -#include "nm-macros-internal.h" #include "nmdbus-device-wifi.h" diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 7d57b52699..49e1e5f7e9 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -21,11 +21,12 @@ #include "config.h" -#include <string.h> +#include "nm-default.h" +#include "nm-device.h" +#include <string.h> #include <gudev/gudev.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-active-connection.h" #include "nm-device-ethernet.h" @@ -44,7 +45,6 @@ #include "nm-device-generic.h" #include "nm-device-ip-tunnel.h" #include "nm-device-macvlan.h" -#include "nm-device.h" #include "nm-device-private.h" #include "nm-dhcp4-config.h" #include "nm-dhcp6-config.h" @@ -58,7 +58,6 @@ #include "nm-dbus-helpers.h" #include "nm-device-tun.h" #include "nm-setting-connection.h" -#include "nm-macros-internal.h" #include "nmdbus-device.h" diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index b4b7e0c7f2..775f7d71c3 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -21,11 +21,12 @@ #include "config.h" -#include <string.h> -#include <nm-utils.h> - #include "nm-default.h" #include "nm-manager.h" + +#include <string.h> + +#include "nm-utils.h" #include "nm-device-ethernet.h" #include "nm-device-wifi.h" #include "nm-device-private.h" @@ -35,7 +36,6 @@ #include "nm-vpn-connection.h" #include "nm-object-cache.h" #include "nm-dbus-helpers.h" -#include "nm-macros-internal.h" #include "nmdbus-manager.h" diff --git a/libnm/nm-object.c b/libnm/nm-object.c index 143931f1b1..42c6476e94 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -21,19 +21,20 @@ #include "config.h" +#include "nm-default.h" +#include "nm-object.h" + #include <string.h> #include <stdlib.h> #include <stdio.h> -#include <nm-utils.h> -#include "nm-default.h" + +#include "nm-utils.h" #include "nm-dbus-interface.h" -#include "nm-object.h" #include "nm-object-cache.h" #include "nm-object-private.h" #include "nm-dbus-helpers.h" #include "nm-client.h" #include "nm-core-internal.h" -#include "nm-macros-internal.h" static gboolean debug = FALSE; #define dbgmsg(f,...) if (G_UNLIKELY (debug)) { g_message (f, ## __VA_ARGS__ ); } diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index 480d7c19f5..305985b175 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -21,12 +21,14 @@ #include "config.h" -#include <string.h> -#include <nm-dbus-interface.h> -#include <nm-connection.h> - #include "nm-default.h" #include "nm-remote-settings.h" + +#include <string.h> + +#include "nm-dbus-interface.h" +#include "nm-connection.h" + #include "nm-client.h" #include "nm-remote-connection.h" #include "nm-remote-connection-private.h" @@ -34,7 +36,6 @@ #include "nm-dbus-helpers.h" #include "nm-object-private.h" #include "nm-core-internal.h" -#include "nm-macros-internal.h" #include "nmdbus-settings.h" diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index 4854b66afa..c14f3a7aae 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -21,19 +21,19 @@ #include "config.h" +#include "nm-default.h" +#include "nm-vpn-plugin-old.h" + #include <errno.h> #include <signal.h> #include <stdlib.h> -#include "nm-default.h" -#include "nm-vpn-plugin-old.h" #include "nm-enum-types.h" #include "nm-utils.h" #include "nm-connection.h" #include "nm-dbus-helpers.h" #include "nm-core-internal.h" #include "nm-simple-connection.h" -#include "nm-macros-internal.h" #include "nmdbus-vpn-plugin.h" diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 0de3805174..c9e3a0c4c7 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -21,20 +21,19 @@ #include "config.h" +#include "nm-default.h" #include "nm-vpn-service-plugin.h" #include <errno.h> #include <signal.h> #include <stdlib.h> -#include "nm-glib.h" #include "nm-enum-types.h" #include "nm-utils.h" #include "nm-connection.h" #include "nm-dbus-helpers.h" #include "nm-core-internal.h" #include "nm-simple-connection.h" -#include "nm-macros-internal.h" #include "nmdbus-vpn-plugin.h" diff --git a/shared/nm-default.h b/shared/nm-default.h index 045ad8db88..f1fcb845e4 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -44,6 +44,7 @@ #include "nm-glib.h" #include "nm-version.h" #include "gsystem-local-alloc.h" +#include "nm-macros-internal.h" /*****************************************************************************/ diff --git a/shared/nm-test-utils.h b/shared/nm-test-utils.h index 66cacb7859..b49e49f461 100644 --- a/shared/nm-test-utils.h +++ b/shared/nm-test-utils.h @@ -88,6 +88,8 @@ * *******************************************************************************/ +#include "nm-default.h" + #include <arpa/inet.h> #include <stdio.h> #include <unistd.h> @@ -95,9 +97,7 @@ #include <string.h> #include <errno.h> -#include "nm-default.h" #include "nm-utils.h" -#include "nm-macros-internal.h" #ifdef __NETWORKMANAGER_LOGGING_H__ /* We are running tests under src/. Let's include some files by default. diff --git a/src/devices/nm-arping-manager.h b/src/devices/nm-arping-manager.h index 731de6622d..4a4f8d4b01 100644 --- a/src/devices/nm-arping-manager.h +++ b/src/devices/nm-arping-manager.h @@ -19,9 +19,6 @@ #include <netinet/in.h> -#include "nm-glib.h" -#include "nm-types.h" - G_BEGIN_DECLS #define NM_TYPE_ARPING_MANAGER (nm_arping_manager_get_type ()) diff --git a/src/devices/nm-lldp-listener.h b/src/devices/nm-lldp-listener.h index 492752c147..10c43e7cf5 100644 --- a/src/devices/nm-lldp-listener.h +++ b/src/devices/nm-lldp-listener.h @@ -21,9 +21,6 @@ #ifndef __NM_LLDP_LISTENER__ #define __NM_LLDP_LISTENER__ -#include "nm-glib.h" -#include "nm-types.h" - G_BEGIN_DECLS #define NM_TYPE_LLDP_LISTENER (nm_lldp_listener_get_type ()) diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 1510430756..709a54f82e 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -21,9 +21,11 @@ #include "config.h" +#include "nm-default.h" +#include "nm-modem.h" + #include <string.h> -#include "nm-modem.h" #include "nm-core-internal.h" #include "nm-platform.h" #include "nm-setting-connection.h" @@ -32,7 +34,6 @@ #include "nm-device-private.h" #include "nm-modem-enum-types.h" #include "nm-route-manager.h" -#include "gsystem-local-alloc.h" G_DEFINE_TYPE (NMModem, nm_modem, G_TYPE_OBJECT) diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index 2c210becdb..72e4e74cc8 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -19,6 +19,9 @@ #include "config.h" +#include "nm-default.h" +#include "nm-dhcp-client.h" + #include <string.h> #include <sys/types.h> #include <sys/wait.h> @@ -28,13 +31,10 @@ #include <stdlib.h> #include <uuid/uuid.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" -#include "nm-dhcp-client.h" #include "nm-dhcp-utils.h" #include "nm-platform.h" -#include "gsystem-local-alloc.h" typedef struct { char * iface; diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c index 5340d21af6..82b8724aa3 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c +++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c @@ -19,18 +19,18 @@ #include "config.h" +#include "nm-default.h" +#include "nm-dhcp-dhclient-utils.h" + #include <string.h> #include <ctype.h> #include <arpa/inet.h> -#include "nm-default.h" -#include "nm-dhcp-dhclient-utils.h" #include "nm-dhcp-utils.h" #include "nm-ip4-config.h" #include "nm-utils.h" #include "nm-platform.h" #include "NetworkManagerUtils.h" -#include "nm-macros-internal.h" #define CLIENTID_TAG "send dhcp-client-identifier" diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c index f9e1e1ebd5..4fe7c4d775 100644 --- a/src/dhcp-manager/tests/test-dhcp-dhclient.c +++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c @@ -20,18 +20,18 @@ #include "config.h" +#include "nm-default.h" + #include <string.h> #include <unistd.h> #include <arpa/inet.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-dhcp-dhclient-utils.h" #include "nm-dhcp-utils.h" #include "nm-utils.h" #include "nm-ip4-config.h" #include "nm-platform.h" -#include "nm-macros-internal.h" #include "nm-test-utils.h" diff --git a/src/nm-audit-manager.c b/src/nm-audit-manager.c index 007e4321e7..c1bbc2732c 100644 --- a/src/nm-audit-manager.c +++ b/src/nm-audit-manager.c @@ -20,19 +20,17 @@ #include "config.h" +#include "nm-default.h" +#include "nm-audit-manager.h" + #include <errno.h> #include <string.h> #if HAVE_LIBAUDIT #include <libaudit.h> #endif -#include "gsystem-local-alloc.h" -#include "nm-audit-manager.h" -#include "nm-glib.h" #include "nm-auth-subject.h" #include "nm-config.h" -#include "nm-logging.h" -#include "nm-macros-internal.h" #include "nm-settings-connection.h" #define AUDIT_LOG_LEVEL LOGL_INFO diff --git a/src/nm-config-data.c b/src/nm-config-data.c index e2b6c3a6e6..9cf83e8462 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -21,6 +21,7 @@ #include "config.h" +#include "nm-default.h" #include "nm-config-data.h" #include <string.h> @@ -29,8 +30,6 @@ #include "nm-device.h" #include "nm-core-internal.h" #include "nm-keyfile-internal.h" -#include "nm-macros-internal.h" -#include "nm-default.h" typedef struct { char *group_name; diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 5e5248a937..56b52c95e8 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -20,11 +20,11 @@ #include "config.h" -#include <string.h> - #include "nm-default.h" #include "nm-firewall-manager.h" -#include "gsystem-local-alloc.h" + +#include <string.h> + #include "NetworkManagerUtils.h" #define NM_FIREWALL_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index e5c8b7a1bf..afa5615cfe 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -21,19 +21,17 @@ #include "config.h" +#include "nm-default.h" +#include "nm-ip4-config.h" + #include <string.h> #include <arpa/inet.h> -#include "nm-ip4-config.h" - -#include "nm-default.h" #include "nm-utils.h" #include "nm-platform.h" #include "NetworkManagerUtils.h" -#include "nm-core-internal.h" #include "nm-route-manager.h" #include "nm-core-internal.h" -#include "nm-macros-internal.h" #include "nmdbus-ip4-config.h" diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index b6f534c36e..a7fc1155c8 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -21,18 +21,17 @@ #include "config.h" -#include <string.h> -#include <arpa/inet.h> - #include "nm-default.h" #include "nm-ip6-config.h" +#include <string.h> +#include <arpa/inet.h> + #include "nm-utils.h" #include "nm-platform.h" #include "nm-route-manager.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" -#include "nm-macros-internal.h" #include "nmdbus-ip6-config.h" diff --git a/src/nm-logging.h b/src/nm-logging.h index b9ffdfc007..333f4f5a95 100644 --- a/src/nm-logging.h +++ b/src/nm-logging.h @@ -26,11 +26,6 @@ #error nm-test-utils.h must be included as last header #endif -#include "nm-logging.h" - -#include "nm-default.h" -#include "nm-macros-internal.h" - /* Log domains */ typedef enum { /*< skip >*/ LOGD_NONE = 0LL, diff --git a/src/nm-multi-index.c b/src/nm-multi-index.c index 47cd981055..fe0c225580 100644 --- a/src/nm-multi-index.c +++ b/src/nm-multi-index.c @@ -25,8 +25,6 @@ #include <string.h> -#include "nm-macros-internal.h" - struct NMMultiIndex { NMMultiIndexFuncEqual equal_fcn; NMMultiIndexFuncClone clone_fcn; diff --git a/src/platform/nmp-object.h b/src/platform/nmp-object.h index ab1cc2fe8e..7758798f33 100644 --- a/src/platform/nmp-object.h +++ b/src/platform/nmp-object.h @@ -21,15 +21,11 @@ #ifndef __NMP_OBJECT_H__ #define __NMP_OBJECT_H__ -#include "config.h" - -#include "nm-platform.h" -#include "nm-multi-index.h" -#include "nm-macros-internal.h" - #include <netlink/netlink.h> #include <gudev/gudev.h> +#include "nm-platform.h" +#include "nm-multi-index.h" typedef enum { /*< skip >*/ NMP_OBJECT_TO_STRING_ID, diff --git a/src/platform/tests/test-nmp-object.c b/src/platform/tests/test-nmp-object.c index eba2383b3b..f65ffc2ddb 100644 --- a/src/platform/tests/test-nmp-object.c +++ b/src/platform/tests/test-nmp-object.c @@ -18,9 +18,10 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "nmp-object.h" +#include "config.h" #include "nm-default.h" +#include "nmp-object.h" #include "nm-test-utils.h" diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c index 599e3a49f0..987a3443b5 100644 --- a/src/settings/plugins/ifcfg-rh/utils.c +++ b/src/settings/plugins/ifcfg-rh/utils.c @@ -20,15 +20,14 @@ #include "config.h" +#include "nm-default.h" +#include "utils.h" + #include <stdlib.h> #include <string.h> -#include "nm-default.h" #include "nm-core-internal.h" -#include "nm-macros-internal.h" #include "NetworkManagerUtils.h" - -#include "utils.h" #include "shvar.h" /* diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index c16d7ab291..242af0c93a 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -20,6 +20,9 @@ #include "config.h" +#include "nm-default.h" +#include "writer.h" + #include <string.h> #include <sys/types.h> #include <sys/socket.h> @@ -30,26 +33,23 @@ #include <unistd.h> #include <stdio.h> -#include <nm-setting-connection.h> -#include <nm-setting-wired.h> -#include <nm-setting-wireless.h> -#include <nm-setting-8021x.h> -#include <nm-setting-ip4-config.h> -#include <nm-setting-ip6-config.h> -#include <nm-setting-pppoe.h> -#include <nm-setting-vlan.h> -#include <nm-setting-team.h> -#include <nm-setting-team-port.h> +#include "nm-setting-connection.h" +#include "nm-setting-wired.h" +#include "nm-setting-wireless.h" +#include "nm-setting-8021x.h" +#include "nm-setting-ip4-config.h" +#include "nm-setting-ip6-config.h" +#include "nm-setting-pppoe.h" +#include "nm-setting-vlan.h" +#include "nm-setting-team.h" +#include "nm-setting-team-port.h" #include "nm-core-internal.h" -#include <nm-utils.h> +#include "nm-utils.h" #include "nm-core-internal.h" -#include "nm-macros-internal.h" -#include "nm-default.h" #include "common.h" #include "shvar.h" #include "reader.h" -#include "writer.h" #include "utils.h" #include "crypto.h" |