diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-02-19 14:57:48 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-02-19 17:53:25 +0100 |
| commit | 8bace23bebcc28396460663203d54aac4ec8ffbf (patch) | |
| tree | 1655434d48980dbb4a547f6d56a231252aa0181d | |
| parent | 89d6fa6aa93cdc982992c137f0b694cd339c315c (diff) | |
| download | NetworkManager-8bace23bebcc28396460663203d54aac4ec8ffbf.tar.gz | |
all: cleanup includes and let "nm-default.h" include "config.h"
- All internal source files (except "examples", which are not internal)
should include "config.h" first. As also all internal source
files should include "nm-default.h", let "config.h" be included
by "nm-default.h" and include "nm-default.h" as first in every
source file.
We already wanted to include "nm-default.h" before other headers
because it might contains some fixes (like "nm-glib.h" compatibility)
that is required first.
- After including "nm-default.h", we optinally allow for including the
corresponding header file for the source file at hand. The idea
is to ensure that each header file is self contained.
- Don't include "config.h" or "nm-default.h" in any header file
(except "nm-sd-adapt.h"). Public headers anyway must not include
these headers, and internal headers are never included after
"nm-default.h", as of the first previous point.
- Include all internal headers with quotes instead of angle brackets.
In practice it doesn't matter, because in our public headers we must
include other headers with angle brackets. As we use our public
headers also to compile our interal source files, effectively the
result must be the same. Still do it for consistency.
- Except for <config.h> itself. Include it with angle brackets as suggested by
https://www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Headers
437 files changed, 801 insertions, 1000 deletions
diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c index 6079d01969..f7f9e96548 100644 --- a/callouts/nm-dispatcher-utils.c +++ b/callouts/nm-dispatcher-utils.c @@ -18,18 +18,16 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> +#include "nm-dbus-interface.h" +#include "nm-connection.h" +#include "nm-setting-ip4-config.h" +#include "nm-setting-ip6-config.h" +#include "nm-setting-connection.h" -#include <nm-dbus-interface.h> -#include <nm-connection.h> -#include <nm-setting-ip4-config.h> -#include <nm-setting-ip6-config.h> -#include <nm-setting-connection.h> - -#include "nm-default.h" #include "nm-dispatcher-api.h" #include "nm-utils.h" diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c index 42c598ed1d..440f01a600 100644 --- a/callouts/nm-dispatcher.c +++ b/callouts/nm-dispatcher.c @@ -18,8 +18,6 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" #include <syslog.h> diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c index 27f088f69a..9cdaa3b5c6 100644 --- a/callouts/tests/test-dispatcher-envp.c +++ b/callouts/tests/test-dispatcher-envp.c @@ -18,13 +18,12 @@ * */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <stdlib.h> #include <string.h> -#include "nm-default.h" #include "nm-core-internal.h" #include "nm-dispatcher-utils.h" #include "nm-dispatcher-api.h" diff --git a/clients/cli/agent.c b/clients/cli/agent.c index c4ff3f9efd..0e39ba9721 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -19,16 +19,14 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdlib.h> #include <errno.h> - #include <readline/readline.h> #include <readline/history.h> -#include "nm-default.h" #include "common.h" #include "utils.h" #include "nm-secret-agent-simple.h" diff --git a/clients/cli/common.c b/clients/cli/common.c index daacce7c63..0aa5efc260 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -19,18 +19,16 @@ * Copyright 2012 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdlib.h> #include <errno.h> #include <termios.h> #include <sys/ioctl.h> - #include <readline/readline.h> #include <readline/history.h> -#include "nm-default.h" #include "nm-vpn-helpers.h" #include "common.h" #include "utils.h" diff --git a/clients/cli/connections.c b/clients/cli/connections.c index d83502d959..566d1d1acb 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -17,7 +17,7 @@ * Copyright 2010 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <string.h> @@ -29,7 +29,6 @@ #include <readline/readline.h> #include <readline/history.h> -#include "nm-default.h" #include "utils.h" #include "common.h" #include "settings.h" diff --git a/clients/cli/devices.c b/clients/cli/devices.c index d2cb9fcba9..449fa7db7d 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -17,7 +17,7 @@ * Copyright 2010 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <string.h> @@ -25,7 +25,6 @@ #include <errno.h> #include <readline/readline.h> -#include "nm-default.h" #include "nm-secret-agent-simple.h" #include "polkit-agent.h" #include "utils.h" diff --git a/clients/cli/general.c b/clients/cli/general.c index 5ed1f80221..15e73e2810 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -17,12 +17,11 @@ * Copyright 2010 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "polkit-agent.h" #include "utils.h" #include "general.h" diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 2da6561bbc..a7f2116175 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -20,7 +20,7 @@ */ /* Generated configuration file */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <string.h> @@ -33,7 +33,6 @@ #include <readline/readline.h> #include <readline/history.h> -#include "nm-default.h" #include "polkit-agent.h" #include "nmcli.h" #include "utils.h" diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index b26f2576c8..1b9a08b800 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -20,8 +20,6 @@ #ifndef NMC_NMCLI_H #define NMC_NMCLI_H -#include "config.h" - #include <NetworkManager.h> #include <nm-secret-agent-old.h> diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index b1fcaad80d..8b56e9534a 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -17,7 +17,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #if WITH_POLKIT_AGENT @@ -26,7 +26,6 @@ #include <sys/types.h> #include <unistd.h> -#include "nm-default.h" #include "polkit-agent.h" #include "nm-polkit-listener.h" #include "common.h" diff --git a/clients/cli/settings.c b/clients/cli/settings.c index c341ce72d2..9e0cf08e0f 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -17,9 +17,8 @@ * Copyright 2010 - 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "settings.h" #include <stdlib.h> diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 287778ba24..d05ea2851a 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -18,18 +18,17 @@ */ /* Generated configuration file */ -#include "config.h" + +#include "nm-default.h" #include <stdio.h> #include <string.h> #include <stdlib.h> #include <errno.h> - #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -#include "nm-default.h" #include "utils.h" int diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c index 9646374e9d..9c67760bfe 100644 --- a/clients/common/nm-polkit-listener.c +++ b/clients/common/nm-polkit-listener.c @@ -31,13 +31,12 @@ * https://github.com/lxde/lxqt-policykit/tree/master/src */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdio.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-polkit-listener.h" G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, POLKIT_AGENT_TYPE_LISTENER) diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 233e1409f2..721f980e65 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -29,14 +29,13 @@ * replace ShellNetworkAgent. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <NetworkManager.h> -#include <nm-vpn-service-plugin.h> +#include "NetworkManager.h" +#include "nm-vpn-service-plugin.h" -#include "nm-default.h" #include "nm-vpn-helpers.h" #include "nm-secret-agent-simple.h" diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index bfb01cd720..1d2a6b0f81 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -23,9 +23,8 @@ * Some functions should probably eventually move into libnm. */ -#include "config.h" - #include "nm-default.h" + #include "nm-vpn-helpers.h" #include <string.h> diff --git a/clients/nm-online.c b/clients/nm-online.c index c02f9cc9e9..e8f0be1a83 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -31,16 +31,14 @@ * Robert Love <rml@novell.com> */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdlib.h> #include <getopt.h> #include <locale.h> -#include <NetworkManager.h> - -#include "nm-default.h" +#include "NetworkManager.h" #define PROGRESS_STEPS 15 #define WAIT_STARTUP_TAG "wait-startup" diff --git a/clients/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c index 4fba1daf92..5341c76a54 100644 --- a/clients/tui/newt/nmt-newt-button-box.c +++ b/clients/tui/newt/nmt-newt-button-box.c @@ -29,7 +29,7 @@ * within each of the two sections. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-button.c b/clients/tui/newt/nmt-newt-button.c index 00dbcd79a4..c797e22221 100644 --- a/clients/tui/newt/nmt-newt-button.c +++ b/clients/tui/newt/nmt-newt-button.c @@ -23,7 +23,7 @@ * #NmtNewtButton implements a button widget. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-button.h" #include "nmt-newt-utils.h" diff --git a/clients/tui/newt/nmt-newt-checkbox.c b/clients/tui/newt/nmt-newt-checkbox.c index 69d9920a46..af7724b248 100644 --- a/clients/tui/newt/nmt-newt-checkbox.c +++ b/clients/tui/newt/nmt-newt-checkbox.c @@ -23,7 +23,7 @@ * #NmtNewtCheckbox implements a checkbox widget. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-checkbox.h" #include "nmt-newt-utils.h" diff --git a/clients/tui/newt/nmt-newt-component.c b/clients/tui/newt/nmt-newt-component.c index 98f6df63f0..034d6d2d34 100644 --- a/clients/tui/newt/nmt-newt-component.c +++ b/clients/tui/newt/nmt-newt-component.c @@ -24,7 +24,7 @@ * wrap a (single) #newtComponent. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-component.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c index 03f677fbdc..927f187e86 100644 --- a/clients/tui/newt/nmt-newt-container.c +++ b/clients/tui/newt/nmt-newt-container.c @@ -26,7 +26,7 @@ * #NmtNewtGrid is the most generic container type. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-entry-numeric.c b/clients/tui/newt/nmt-newt-entry-numeric.c index 416b4b79bb..b79f056a61 100644 --- a/clients/tui/newt/nmt-newt-entry-numeric.c +++ b/clients/tui/newt/nmt-newt-entry-numeric.c @@ -26,7 +26,7 @@ * #NmtNewtEntryValidator functions, so you should not set your own. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> diff --git a/clients/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c index 7c92d00ada..2715a7389f 100644 --- a/clients/tui/newt/nmt-newt-entry.c +++ b/clients/tui/newt/nmt-newt-entry.c @@ -26,7 +26,7 @@ * See also #NmtNewtEntryNumeric, for numeric-only entries. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c index ce401e2550..835c1aba7d 100644 --- a/clients/tui/newt/nmt-newt-form.c +++ b/clients/tui/newt/nmt-newt-form.c @@ -24,7 +24,7 @@ * "form" (aka dialog) to the user. */ -#include "config.h" +#include "nm-default.h" #include <fcntl.h> #include <string.h> diff --git a/clients/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c index ac96733452..4333e0dc6f 100644 --- a/clients/tui/newt/nmt-newt-grid.c +++ b/clients/tui/newt/nmt-newt-grid.c @@ -40,7 +40,7 @@ * must be implemented by the container... */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-hacks.c b/clients/tui/newt/nmt-newt-hacks.c index 2d9b1725ae..5f69643a5f 100644 --- a/clients/tui/newt/nmt-newt-hacks.c +++ b/clients/tui/newt/nmt-newt-hacks.c @@ -24,7 +24,7 @@ * functions that were added after 0.52.15. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-hacks.h" diff --git a/clients/tui/newt/nmt-newt-hacks.h b/clients/tui/newt/nmt-newt-hacks.h index ba8464af0d..d4eb3fd2b0 100644 --- a/clients/tui/newt/nmt-newt-hacks.h +++ b/clients/tui/newt/nmt-newt-hacks.h @@ -19,8 +19,6 @@ #ifndef NMT_NEWT_HACKS_H #define NMT_NEWT_HACKS_H -#include "config.h" - #include <newt.h> #ifndef HAVE_NEWTCOMPONENTGETSIZE diff --git a/clients/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c index 9c4df8ed4e..f9aed8a3dd 100644 --- a/clients/tui/newt/nmt-newt-label.c +++ b/clients/tui/newt/nmt-newt-label.c @@ -25,7 +25,7 @@ * See also #NmtNewtTextbox, for multiline. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-listbox.c b/clients/tui/newt/nmt-newt-listbox.c index e450df9123..15a89b0b94 100644 --- a/clients/tui/newt/nmt-newt-listbox.c +++ b/clients/tui/newt/nmt-newt-listbox.c @@ -31,7 +31,7 @@ * presses Return on a selection. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-listbox.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-popup.c b/clients/tui/newt/nmt-newt-popup.c index f7813063ed..e171e15370 100644 --- a/clients/tui/newt/nmt-newt-popup.c +++ b/clients/tui/newt/nmt-newt-popup.c @@ -26,7 +26,7 @@ * #NmtNewtForm containing an #NmtNewtListbox to select from. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-popup.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c index 1a5035fc09..38152c96db 100644 --- a/clients/tui/newt/nmt-newt-section.c +++ b/clients/tui/newt/nmt-newt-section.c @@ -35,7 +35,7 @@ * extent of the section. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-separator.c b/clients/tui/newt/nmt-newt-separator.c index 07deb1af90..0317069a59 100644 --- a/clients/tui/newt/nmt-newt-separator.c +++ b/clients/tui/newt/nmt-newt-separator.c @@ -25,7 +25,7 @@ * between widgets in containers that don't implement padding. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-separator.h" diff --git a/clients/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c index d94bdebffc..3abf00b199 100644 --- a/clients/tui/newt/nmt-newt-stack.c +++ b/clients/tui/newt/nmt-newt-stack.c @@ -29,7 +29,7 @@ * children. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c index 3d297160d3..73794f5eb3 100644 --- a/clients/tui/newt/nmt-newt-textbox.c +++ b/clients/tui/newt/nmt-newt-textbox.c @@ -24,7 +24,7 @@ * word-wrapping. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/newt/nmt-newt-toggle-button.c b/clients/tui/newt/nmt-newt-toggle-button.c index ec4d9aca51..5397bfec75 100644 --- a/clients/tui/newt/nmt-newt-toggle-button.c +++ b/clients/tui/newt/nmt-newt-toggle-button.c @@ -23,7 +23,7 @@ * #NmtNewtToggleButton implements a two-state toggle button. */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-toggle-button.h" diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c index 841144d8e6..a8541829de 100644 --- a/clients/tui/newt/nmt-newt-utils.c +++ b/clients/tui/newt/nmt-newt-utils.c @@ -21,14 +21,13 @@ * @short_description: Utility functions */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <stdarg.h> #include <unistd.h> #include <sys/wait.h> -#include "nm-default.h" #include "nmt-newt-utils.h" static void diff --git a/clients/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c index 24c94db940..5602c062d3 100644 --- a/clients/tui/newt/nmt-newt-widget.c +++ b/clients/tui/newt/nmt-newt-widget.c @@ -34,7 +34,7 @@ * FIXME: need RTL support */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt-widget.h" #include "nmt-newt-form.h" diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c index a21ed66672..3753aaa9ac 100644 --- a/clients/tui/nm-editor-bindings.c +++ b/clients/tui/nm-editor-bindings.c @@ -25,7 +25,7 @@ * shared between nmtui, nm-connection-editor, and gnome-control-center. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 026ef231fd..e582d41fcc 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -25,11 +25,10 @@ * nm-connection-editor, and gnome-control-center. */ -#include "config.h" +#include "nm-default.h" -#include <NetworkManager.h> +#include "NetworkManager.h" -#include "nm-default.h" #include "nm-editor-utils.h" #if 0 #include "nm-vpn-helpers.h" diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c index 3faf3442ed..53990d6a53 100644 --- a/clients/tui/nmt-address-list.c +++ b/clients/tui/nmt-address-list.c @@ -28,7 +28,7 @@ * functions. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c index c21cc5be7f..0aecd38709 100644 --- a/clients/tui/nmt-connect-connection-list.c +++ b/clients/tui/nmt-connect-connection-list.c @@ -24,11 +24,11 @@ * access points displayed by "nmtui connect". */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include <NetworkManager.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 2760b1491a..86e92ca5ba 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c @@ -34,13 +34,13 @@ * to implement that then we should make it just an #NmtNewtEntry. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <sys/socket.h> #include <linux/if_arp.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmtui.h" #include "nmt-device-entry.h" diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c index 72e8c706cd..a1a59e0149 100644 --- a/clients/tui/nmt-edit-connection-list.c +++ b/clients/tui/nmt-edit-connection-list.c @@ -24,7 +24,7 @@ * "nmtui edit". */ -#include "config.h" +#include "nm-default.h" #include "nmtui.h" #include "nmtui-edit.h" diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c index 118bf01d3a..a57e780b1b 100644 --- a/clients/tui/nmt-editor-grid.c +++ b/clients/tui/nmt-editor-grid.c @@ -37,7 +37,7 @@ * section border into account as well. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/nmt-editor-page-device.c b/clients/tui/nmt-editor-page-device.c index 0a9b18e0bf..d303604a68 100644 --- a/clients/tui/nmt-editor-page-device.c +++ b/clients/tui/nmt-editor-page-device.c @@ -28,7 +28,7 @@ * an actual page type. */ -#include "config.h" +#include "nm-default.h" #include "nmt-editor-page-device.h" diff --git a/clients/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c index f2afc8c702..44abe27317 100644 --- a/clients/tui/nmt-editor-page.c +++ b/clients/tui/nmt-editor-page.c @@ -24,7 +24,7 @@ * A "page" is a set of related #NmtEditorSections. */ -#include "config.h" +#include "nm-default.h" #include "nmt-editor-page.h" diff --git a/clients/tui/nmt-editor-section.c b/clients/tui/nmt-editor-section.c index b9a3ae839b..e7e519138d 100644 --- a/clients/tui/nmt-editor-section.c +++ b/clients/tui/nmt-editor-section.c @@ -23,7 +23,7 @@ * #NmtEditorSection is the abstract base class for #NmtEditor sections. */ -#include "config.h" +#include "nm-default.h" #include "nmt-editor-section.h" #include "nmt-newt-toggle-button.h" diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c index aaa73cbef5..12f35b560b 100644 --- a/clients/tui/nmt-editor.c +++ b/clients/tui/nmt-editor.c @@ -23,13 +23,12 @@ * #NmtEditor is the top-level form for editing a connection. */ -#include "config.h" +#include "nm-default.h" #include "nmt-editor.h" -#include <nm-utils.h> +#include "nm-utils.h" -#include "nm-default.h" #include "nmtui.h" #include "nm-editor-utils.h" diff --git a/clients/tui/nmt-ip-entry.c b/clients/tui/nmt-ip-entry.c index d31a1f46ad..8d8f888f0d 100644 --- a/clients/tui/nmt-ip-entry.c +++ b/clients/tui/nmt-ip-entry.c @@ -27,7 +27,7 @@ * contains a valid IP address. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index 6501f09af8..d0f07e120a 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -26,11 +26,11 @@ * on whether it currently contains a valid hardware address. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmt-mac-entry.h" diff --git a/clients/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c index 9f11af0a08..3909c8364d 100644 --- a/clients/tui/nmt-mtu-entry.c +++ b/clients/tui/nmt-mtu-entry.c @@ -30,7 +30,7 @@ * indicating the units used by the entry. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index ecc9aefcf3..259ecfc163 100644 --- a/clients/tui/nmt-page-bond.c +++ b/clients/tui/nmt-page-bond.c @@ -25,9 +25,8 @@ * can't just use #GBinding. */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-bond.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c index fdf4403921..47e584a152 100644 --- a/clients/tui/nmt-page-bridge-port.c +++ b/clients/tui/nmt-page-bridge-port.c @@ -21,9 +21,8 @@ * @short_description: The editor page for Bridge ports */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-bridge-port.h" G_DEFINE_TYPE (NmtPageBridgePort, nmt_page_bridge_port, NMT_TYPE_EDITOR_PAGE) diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c index e9b0e66dc6..b5eb9ec88e 100644 --- a/clients/tui/nmt-page-bridge.c +++ b/clients/tui/nmt-page-bridge.c @@ -21,9 +21,8 @@ * @short_description: The editor page for Bridge connections */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-bridge.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c index 2346b496be..cd8175b970 100644 --- a/clients/tui/nmt-page-dsl.c +++ b/clients/tui/nmt-page-dsl.c @@ -21,9 +21,8 @@ * @short_description: The editor page for DSL connections */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-dsl.h" #include "nmt-page-ethernet.h" #include "nmt-page-ppp.h" diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c index fed81f1c65..dfe2e44077 100644 --- a/clients/tui/nmt-page-ethernet.c +++ b/clients/tui/nmt-page-ethernet.c @@ -21,9 +21,8 @@ * @short_description: The editor page for Ethernet connections */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-ethernet.h" #include "nmt-mac-entry.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c index e10c5a7ac3..91445f757f 100644 --- a/clients/tui/nmt-page-infiniband.c +++ b/clients/tui/nmt-page-infiniband.c @@ -21,9 +21,8 @@ * @short_description: The editor page for InfiniBand connections */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-infiniband.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c index 2cc4f6af25..deb0f5096c 100644 --- a/clients/tui/nmt-page-ip4.c +++ b/clients/tui/nmt-page-ip4.c @@ -21,11 +21,10 @@ * @short_description: The editor page for IP4 configuration */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include "nm-default.h" #include "nmt-page-ip4.h" #include "nmt-ip-entry.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c index e547122bf3..14802ace2e 100644 --- a/clients/tui/nmt-page-ip6.c +++ b/clients/tui/nmt-page-ip6.c @@ -21,11 +21,10 @@ * @short_description: The editor page for IP6 configuration */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include "nm-default.h" #include "nmt-page-ip6.h" #include "nmt-ip-entry.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c index 662ebd9c4d..64f4b9b8a2 100644 --- a/clients/tui/nmt-page-ppp.c +++ b/clients/tui/nmt-page-ppp.c @@ -21,11 +21,10 @@ * @short_description: The editor page for PPP configuration */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include "nm-default.h" #include "nmt-page-ppp.h" #include "nmt-newt-section.h" #include "nmt-newt-separator.h" diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c index 797c1cf125..af2221adf6 100644 --- a/clients/tui/nmt-page-team-port.c +++ b/clients/tui/nmt-page-team-port.c @@ -21,9 +21,8 @@ * @short_description: The editor page for Team ports. */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-team-port.h" G_DEFINE_TYPE (NmtPageTeamPort, nmt_page_team_port, NMT_TYPE_EDITOR_PAGE) diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c index 572941b663..d7c4c42597 100644 --- a/clients/tui/nmt-page-team.c +++ b/clients/tui/nmt-page-team.c @@ -21,9 +21,8 @@ * @short_description: The editor page for Team connections */ -#include "config.h" - #include "nm-default.h" + #include "nmt-page-team.h" #include "nmt-slave-list.h" diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c index 0c551276a1..c63b190430 100644 --- a/clients/tui/nmt-page-vlan.c +++ b/clients/tui/nmt-page-vlan.c @@ -21,9 +21,8 @@ * @short_description: The editor page for VLAN connections */ -#include "config.h" - #include "nm-default.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 c4b085ea30..cd9b60e109 100644 --- a/clients/tui/nmt-page-wifi.c +++ b/clients/tui/nmt-page-wifi.c @@ -25,11 +25,10 @@ * properties. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include "nm-default.h" #include "nmt-page-wifi.h" #include "nmt-mac-entry.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c index 8eca7dc03e..fb9567e691 100644 --- a/clients/tui/nmt-password-dialog.c +++ b/clients/tui/nmt-password-dialog.c @@ -24,7 +24,7 @@ * secrets when activating a connection. */ -#include "config.h" +#include "nm-default.h" #include "nmt-password-dialog.h" #include "nm-secret-agent-simple.h" diff --git a/clients/tui/nmt-password-fields.c b/clients/tui/nmt-password-fields.c index cba649356e..013d969535 100644 --- a/clients/tui/nmt-password-fields.c +++ b/clients/tui/nmt-password-fields.c @@ -25,7 +25,7 @@ * "Show password" checkbox that toggles whether the password is visible. */ -#include "config.h" +#include "nm-default.h" #include "nmt-password-fields.h" diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c index dc4d118b74..964e3ff4bf 100644 --- a/clients/tui/nmt-route-editor.c +++ b/clients/tui/nmt-route-editor.c @@ -25,9 +25,8 @@ * wide to fit into the main window. */ -#include "config.h" - #include "nm-default.h" + #include "nmt-route-editor.h" #include "nmt-route-table.h" diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c index 1cc99940f8..f7c75e0aaa 100644 --- a/clients/tui/nmt-route-entry.c +++ b/clients/tui/nmt-route-entry.c @@ -26,13 +26,13 @@ * This is used as a building block by #NmtRouteTable. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> #include <stdlib.h> -#include <NetworkManager.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 0731acb6d0..7005e8ad0d 100644 --- a/clients/tui/nmt-route-table.c +++ b/clients/tui/nmt-route-table.c @@ -24,13 +24,13 @@ * and buttons to add and remove entries. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> #include <stdlib.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmt-route-table.h" #include "nmt-route-entry.h" diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c index 5a9b7482eb..a8c31e056b 100644 --- a/clients/tui/nmt-slave-list.c +++ b/clients/tui/nmt-slave-list.c @@ -24,9 +24,9 @@ * slaves of a connection. */ -#include "config.h" +#include "nm-default.h" -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmt-slave-list.h" diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c index f2bf70db82..a8c1c5f09f 100644 --- a/clients/tui/nmt-utils.c +++ b/clients/tui/nmt-utils.c @@ -21,7 +21,7 @@ * @short_description: Miscellaneous nmtui-specific utilities */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c index b314e146a0..2fd5af02c7 100644 --- a/clients/tui/nmt-widget-list.c +++ b/clients/tui/nmt-widget-list.c @@ -30,7 +30,7 @@ * FIXME: The way this works is sort of weird. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index 9d705bf134..46e3361740 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -24,7 +24,7 @@ * including presenting a password dialog if necessary. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c index 258b798a52..c7efd856db 100644 --- a/clients/tui/nmtui-edit.c +++ b/clients/tui/nmtui-edit.c @@ -23,11 +23,11 @@ * nmtui-edit implements editing #NMConnections. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nmtui.h" #include "nmtui-edit.h" diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c index f77a918b33..ada2393fd1 100644 --- a/clients/tui/nmtui-hostname.c +++ b/clients/tui/nmtui-hostname.c @@ -23,7 +23,7 @@ * nmtui-hostname implements the "set hostname" functionality */ -#include "config.h" +#include "nm-default.h" #include "nmt-newt.h" diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index 20e7d02b04..47ba5bf56e 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -24,15 +24,14 @@ * nmtui_edit(), and nmtui_hostname(). */ -#include "config.h" +#include "nm-default.h" #include <locale.h> #include <stdlib.h> #include <string.h> -#include <NetworkManager.h> +#include "NetworkManager.h" -#include "nm-default.h" #include "nmt-newt.h" #include "nm-editor-bindings.h" diff --git a/examples/C/glib/add-connection-gdbus.c b/examples/C/glib/add-connection-gdbus.c index d390327399..7a4d593945 100644 --- a/examples/C/glib/add-connection-gdbus.c +++ b/examples/C/glib/add-connection-gdbus.c @@ -27,8 +27,6 @@ * gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` -luuid add-connection-gdbus.c -o add-connection-gdbus */ -#include "config.h" - #include <gio/gio.h> #include <uuid/uuid.h> #include <NetworkManager.h> diff --git a/examples/C/glib/add-connection-libnm.c b/examples/C/glib/add-connection-libnm.c index 75048bd8f1..f206340e0c 100644 --- a/examples/C/glib/add-connection-libnm.c +++ b/examples/C/glib/add-connection-libnm.c @@ -27,8 +27,6 @@ * gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` add-connection-libnm.c -o add-connection-libnm */ -#include "config.h" - #include <glib.h> #include <NetworkManager.h> diff --git a/examples/C/glib/get-active-connections-gdbus.c b/examples/C/glib/get-active-connections-gdbus.c index 9b34f6b210..6a19bf895e 100644 --- a/examples/C/glib/get-active-connections-gdbus.c +++ b/examples/C/glib/get-active-connections-gdbus.c @@ -26,8 +26,6 @@ * gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` get-active-connections-gdbus.c -o get-active-connections-gdbus */ -#include "config.h" - #include <string.h> #include <gio/gio.h> #include <NetworkManager.h> diff --git a/examples/C/glib/get-ap-info-libnm.c b/examples/C/glib/get-ap-info-libnm.c index 90bc2d5e78..5868c27904 100644 --- a/examples/C/glib/get-ap-info-libnm.c +++ b/examples/C/glib/get-ap-info-libnm.c @@ -25,8 +25,6 @@ * gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` get-ap-info-libnm.c -o get-ap-info-libnm */ -#include "config.h" - #include <glib.h> #include <stdio.h> #include <stdlib.h> diff --git a/examples/C/glib/list-connections-gdbus.c b/examples/C/glib/list-connections-gdbus.c index 634bd90c82..f5922582ea 100644 --- a/examples/C/glib/list-connections-gdbus.c +++ b/examples/C/glib/list-connections-gdbus.c @@ -27,8 +27,6 @@ * gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` list-connections-gdbus.c -o list-connections-gdbus */ -#include "config.h" - #include <gio/gio.h> #include <NetworkManager.h> diff --git a/examples/C/glib/list-connections-libnm.c b/examples/C/glib/list-connections-libnm.c index d5cdf361d7..f09c028b6b 100644 --- a/examples/C/glib/list-connections-libnm.c +++ b/examples/C/glib/list-connections-libnm.c @@ -26,8 +26,6 @@ * gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` list-connections-libnm.c -o list-connections-libnm */ -#include "config.h" - #include <glib.h> #include <stdio.h> #include <stdlib.h> diff --git a/examples/C/glib/monitor-nm-running-gdbus.c b/examples/C/glib/monitor-nm-running-gdbus.c index e4b3bbbfc9..2e1a11c0c8 100644 --- a/examples/C/glib/monitor-nm-running-gdbus.c +++ b/examples/C/glib/monitor-nm-running-gdbus.c @@ -28,8 +28,6 @@ * gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` monitor-nm-running-gdbus.c -o monitor-nm-running-gdbus */ -#include "config.h" - #include <gio/gio.h> static void diff --git a/examples/C/glib/monitor-nm-state-gdbus.c b/examples/C/glib/monitor-nm-state-gdbus.c index aeabcfe16e..05596399d9 100644 --- a/examples/C/glib/monitor-nm-state-gdbus.c +++ b/examples/C/glib/monitor-nm-state-gdbus.c @@ -29,8 +29,6 @@ * gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` `pkg-config --cflags libnm` monitor-nm-state-gdbus.c -o monitor-nm-state-gdbus */ -#include "config.h" - #include <gio/gio.h> #include <string.h> #include <nm-dbus-interface.h> diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c index 559ac52b61..ecbe6c6e15 100644 --- a/libnm-core/crypto.c +++ b/libnm-core/crypto.c @@ -21,14 +21,13 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <strings.h> #include <unistd.h> #include <stdlib.h> -#include "nm-default.h" #include "crypto.h" #include "nm-errors.h" diff --git a/libnm-core/crypto_gnutls.c b/libnm-core/crypto_gnutls.c index 3f90c77dfd..d09c937979 100644 --- a/libnm-core/crypto_gnutls.c +++ b/libnm-core/crypto_gnutls.c @@ -21,14 +21,13 @@ * Copyright 2007 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <gnutls/gnutls.h> #include <gnutls/crypto.h> #include <gnutls/x509.h> #include <gnutls/pkcs12.h> -#include "nm-default.h" #include "crypto.h" #include "nm-errors.h" diff --git a/libnm-core/crypto_nss.c b/libnm-core/crypto_nss.c index 7f61ad7c67..b5d7e63023 100644 --- a/libnm-core/crypto_nss.c +++ b/libnm-core/crypto_nss.c @@ -21,7 +21,7 @@ * Copyright 2007 - 2009 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <prinit.h> #include <nss.h> @@ -33,7 +33,6 @@ #include <ciferfam.h> #include <p12plcy.h> -#include "nm-default.h" #include "crypto.h" #include "nm-errors.h" diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 5a491b4068..04e601ce8c 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -20,10 +20,10 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" + #include "nm-connection.h" #include "nm-connection-private.h" #include "nm-utils.h" diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c index 8627278623..79020b2d49 100644 --- a/libnm-core/nm-dbus-utils.c +++ b/libnm-core/nm-dbus-utils.c @@ -18,11 +18,10 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-core-internal.h" typedef struct { diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c index 4c950f698d..e9da8d3fae 100644 --- a/libnm-core/nm-errors.c +++ b/libnm-core/nm-errors.c @@ -18,11 +18,10 @@ * Copyright 2004 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-errors.h" #include "nm-vpn-dbus-interface.h" #include "nm-core-internal.h" diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c index edd02b57f6..3936a4a7a6 100644 --- a/libnm-core/nm-keyfile-reader.c +++ b/libnm-core/nm-keyfile-reader.c @@ -19,9 +19,8 @@ * Copyright (C) 2008 - 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-keyfile-internal.h" #include <errno.h> diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c index 15b14a3e07..bdd18bab4c 100644 --- a/libnm-core/nm-keyfile-utils.c +++ b/libnm-core/nm-keyfile-utils.c @@ -18,12 +18,11 @@ * (C) Copyright 2010 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> -#include "nm-default.h" #include "nm-keyfile-utils.h" #include "nm-keyfile-internal.h" #include "nm-setting-wired.h" diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c index b794079ff3..0ce7641c1d 100644 --- a/libnm-core/nm-keyfile-writer.c +++ b/libnm-core/nm-keyfile-writer.c @@ -19,9 +19,8 @@ * Copyright (C) 2008 - 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-keyfile-internal.h" #include <stdlib.h> diff --git a/libnm-core/nm-property-compare.c b/libnm-core/nm-property-compare.c index d244f74533..ab19cd71a4 100644 --- a/libnm-core/nm-property-compare.c +++ b/libnm-core/nm-property-compare.c @@ -20,14 +20,13 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <math.h> #include <netinet/in.h> #include "nm-property-compare.h" -#include "nm-default.h" static gint _nm_property_compare_collection (GVariant *value1, GVariant *value2) diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index ac7109d1d7..0ecb988af2 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -20,9 +20,8 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-setting-8021x.h" #include <string.h> diff --git a/libnm-core/nm-setting-adsl.c b/libnm-core/nm-setting-adsl.c index 0cf386d894..8198a72a1d 100644 --- a/libnm-core/nm-setting-adsl.c +++ b/libnm-core/nm-setting-adsl.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-core/nm-setting-bluetooth.c b/libnm-core/nm-setting-bluetooth.c index 864a91ccf1..837b06c04d 100644 --- a/libnm-core/nm-setting-bluetooth.c +++ b/libnm-core/nm-setting-bluetooth.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c index 1c37758422..4d40de0090 100644 --- a/libnm-core/nm-setting-bond.c +++ b/libnm-core/nm-setting-bond.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c index a02b8de12a..df2e7bd334 100644 --- a/libnm-core/nm-setting-bridge-port.c +++ b/libnm-core/nm-setting-bridge-port.c @@ -19,7 +19,7 @@ * Copyright 2012 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <ctype.h> diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 7915e73072..fa934c4618 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <ctype.h> diff --git a/libnm-core/nm-setting-cdma.c b/libnm-core/nm-setting-cdma.c index 3c01b43f9a..31b02d7f96 100644 --- a/libnm-core/nm-setting-cdma.c +++ b/libnm-core/nm-setting-cdma.c @@ -19,7 +19,7 @@ * Copyright 2007 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 169e27cead..44237d9801 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -20,9 +20,8 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-setting-connection.h" #include <string.h> diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c index 89675810ff..751904b510 100644 --- a/libnm-core/nm-setting-dcb.c +++ b/libnm-core/nm-setting-dcb.c @@ -19,7 +19,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-core/nm-setting-generic.c b/libnm-core/nm-setting-generic.c index 35deb2de02..a44f83cbb0 100644 --- a/libnm-core/nm-setting-generic.c +++ b/libnm-core/nm-setting-generic.c @@ -19,7 +19,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-setting-generic.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c index 4bb5ba9fc9..86166df2d3 100644 --- a/libnm-core/nm-setting-gsm.c +++ b/libnm-core/nm-setting-gsm.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c index 1cffdd79c7..3a71879df9 100644 --- a/libnm-core/nm-setting-infiniband.c +++ b/libnm-core/nm-setting-infiniband.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index 5454b4dbb7..bbdb19ff73 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -20,12 +20,11 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> -#include "nm-default.h" #include "nm-setting-ip-config.h" #include "nm-setting-ip4-config.h" #include "nm-setting-ip6-config.h" diff --git a/libnm-core/nm-setting-ip-tunnel.c b/libnm-core/nm-setting-ip-tunnel.c index 24aaa68711..fa193d7590 100644 --- a/libnm-core/nm-setting-ip-tunnel.c +++ b/libnm-core/nm-setting-ip-tunnel.c @@ -18,9 +18,8 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-setting-ip-tunnel.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index fec38eb7ff..b0308e7162 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -19,7 +19,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index 611652361e..f2d85084f3 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -19,9 +19,8 @@ * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-setting-ip6-config.h" #include <string.h> diff --git a/libnm-core/nm-setting-macvlan.c b/libnm-core/nm-setting-macvlan.c index 7bedf5143d..00341accc2 100644 --- a/libnm-core/nm-setting-macvlan.c +++ b/libnm-core/nm-setting-macvlan.c @@ -19,7 +19,7 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> diff --git a/libnm-core/nm-setting-olpc-mesh.c b/libnm-core/nm-setting-olpc-mesh.c index e61e31684f..eba29c9242 100644 --- a/libnm-core/nm-setting-olpc-mesh.c +++ b/libnm-core/nm-setting-olpc-mesh.c @@ -20,7 +20,7 @@ * Copyright 2009 One Laptop per Child */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-core/nm-setting-ppp.c b/libnm-core/nm-setting-ppp.c index 2cc5a20941..3519117cc1 100644 --- a/libnm-core/nm-setting-ppp.c +++ b/libnm-core/nm-setting-ppp.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-setting-ppp.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-pppoe.c b/libnm-core/nm-setting-pppoe.c index e2466eb32e..c7fbd56d21 100644 --- a/libnm-core/nm-setting-pppoe.c +++ b/libnm-core/nm-setting-pppoe.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-core/nm-setting-serial.c b/libnm-core/nm-setting-serial.c index b8589cd28c..fd251b7d24 100644 --- a/libnm-core/nm-setting-serial.c +++ b/libnm-core/nm-setting-serial.c @@ -20,11 +20,10 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-setting-serial.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c index 78cb3cb759..9671f1d915 100644 --- a/libnm-core/nm-setting-team-port.c +++ b/libnm-core/nm-setting-team-port.c @@ -18,7 +18,7 @@ * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <ctype.h> diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c index 2dfffaacc5..d47b1e72ca 100644 --- a/libnm-core/nm-setting-team.c +++ b/libnm-core/nm-setting-team.c @@ -18,7 +18,7 @@ * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> diff --git a/libnm-core/nm-setting-tun.c b/libnm-core/nm-setting-tun.c index b3c118601b..fe14eec286 100644 --- a/libnm-core/nm-setting-tun.c +++ b/libnm-core/nm-setting-tun.c @@ -19,7 +19,7 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index 9d393240f3..90798c40d3 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -19,15 +19,13 @@ * Copyright 2011 - 2014 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-setting-vlan.h" #include <stdlib.h> #include <string.h> -#include "nm-default.h" #include "nm-utils.h" #include "nm-core-types-internal.h" #include "nm-setting-connection.h" diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c index aae8ae13b9..c9a1e20b61 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/libnm-core/nm-setting-vpn.c @@ -19,7 +19,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> diff --git a/libnm-core/nm-setting-vxlan.c b/libnm-core/nm-setting-vxlan.c index d071532fed..57fbfd795f 100644 --- a/libnm-core/nm-setting-vxlan.c +++ b/libnm-core/nm-setting-vxlan.c @@ -19,7 +19,7 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> diff --git a/libnm-core/nm-setting-wimax.c b/libnm-core/nm-setting-wimax.c index 95a099522b..f893cbdcfe 100644 --- a/libnm-core/nm-setting-wimax.c +++ b/libnm-core/nm-setting-wimax.c @@ -20,7 +20,7 @@ * Copyright 2009 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 1f0e0a7a6e..149ddb916c 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -20,9 +20,8 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-setting-wired.h" #include <string.h> diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c index 7c5e393243..64e2aa4502 100644 --- a/libnm-core/nm-setting-wireless-security.c +++ b/libnm-core/nm-setting-wireless-security.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index 6b9ad0ba13..72fd77e412 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index 1fe0a636b1..fec645b263 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -20,9 +20,8 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-setting.h" #include <string.h> diff --git a/libnm-core/nm-simple-connection.c b/libnm-core/nm-simple-connection.c index c67f624454..1036c8ecce 100644 --- a/libnm-core/nm-simple-connection.c +++ b/libnm-core/nm-simple-connection.c @@ -19,7 +19,7 @@ * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-simple-connection.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 610c773796..52d4e8b871 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -19,9 +19,8 @@ * Copyright 2005 - 2014 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-utils.h" #include <string.h> diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c index 8d5acd36ff..5a1eed88dd 100644 --- a/libnm-core/nm-vpn-editor-plugin.c +++ b/libnm-core/nm-vpn-editor-plugin.c @@ -20,9 +20,8 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-vpn-editor-plugin.h" #include "nm-core-internal.h" diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c index 44c54c4ce9..53278fcac8 100644 --- a/libnm-core/nm-vpn-plugin-info.c +++ b/libnm-core/nm-vpn-plugin-info.c @@ -18,9 +18,8 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-vpn-plugin-info.h" #include <string.h> diff --git a/libnm-core/tests/test-compare.c b/libnm-core/tests/test-compare.c index 914330fe41..dca5c7d3d1 100644 --- a/libnm-core/tests/test-compare.c +++ b/libnm-core/tests/test-compare.c @@ -19,12 +19,11 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> -#include "nm-default.h" #include "nm-property-compare.h" #include "nm-test-utils.h" diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c index 87937b6a20..bd87c710ca 100644 --- a/libnm-core/tests/test-crypto.c +++ b/libnm-core/tests/test-crypto.c @@ -21,14 +21,13 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <stdlib.h> #include <stdio.h> #include <string.h> -#include "nm-default.h" #include "crypto.h" #include "nm-utils.h" #include "nm-errors.h" diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index 80e2d001f3..82af4140f1 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -21,13 +21,11 @@ #define NM_GLIB_COMPAT_H_TEST -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> -#include "nm-default.h" - +#include "nm-utils.h" #include "nm-setting-private.h" #include "nm-utils.h" #include "nm-utils-private.h" @@ -62,9 +60,10 @@ #include "nm-simple-connection.h" #include "nm-keyfile-internal.h" -#include "nm-test-utils.h" #include "test-general-enums.h" +#include "nm-test-utils.h" + /* When passing a "bool" typed argument to a variadic function that * expects a gboolean, the compiler will promote the integer type * to have at least size (int). That way: diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c index afc28844bd..92b6c1f56c 100644 --- a/libnm-core/tests/test-keyfile.c +++ b/libnm-core/tests/test-keyfile.c @@ -19,8 +19,6 @@ * */ -#include "config.h" - #include "nm-default.h" #include "nm-keyfile-utils.h" diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c index 465c3036c2..a32ed4f189 100644 --- a/libnm-core/tests/test-secrets.c +++ b/libnm-core/tests/test-secrets.c @@ -19,11 +19,10 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-setting-8021x.h" #include "nm-setting-cdma.h" #include "nm-setting-connection.h" diff --git a/libnm-core/tests/test-setting-8021x.c b/libnm-core/tests/test-setting-8021x.c index 687353c316..56563a6fb6 100644 --- a/libnm-core/tests/test-setting-8021x.c +++ b/libnm-core/tests/test-setting-8021x.c @@ -19,13 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> - -#include "nm-default.h" +#include "nm-utils.h" #include "nm-setting-connection.h" #include "nm-setting-8021x.h" diff --git a/libnm-core/tests/test-setting-dcb.c b/libnm-core/tests/test-setting-dcb.c index f8b789c182..09cf8d9837 100644 --- a/libnm-core/tests/test-setting-dcb.c +++ b/libnm-core/tests/test-setting-dcb.c @@ -19,11 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> -#include "nm-default.h" + +#include "nm-utils.h" #include "nm-setting-dcb.h" #include "nm-connection.h" #include "nm-errors.h" diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c index 9513d74481..366910ac2a 100644 --- a/libnm-core/tests/test-settings-defaults.c +++ b/libnm-core/tests/test-settings-defaults.c @@ -19,13 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> - -#include "nm-default.h" +#include "nm-utils.h" #include "nm-setting-8021x.h" #include "nm-setting-cdma.h" #include "nm-setting-connection.h" diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c index 9c8085d371..c3c0ff19c3 100644 --- a/libnm-glib/libnm-glib-test.c +++ b/libnm-glib/libnm-glib-test.c @@ -20,18 +20,15 @@ * Copyright (C) 2007 - 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <signal.h> #include <string.h> - #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> - -#include "nm-default.h" #include "nm-client.h" #include "nm-device.h" #include "nm-device-ethernet.h" diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c index 09d9bea9b1..ec25a2d974 100644 --- a/libnm-glib/libnm_glib.c +++ b/libnm-glib/libnm_glib.c @@ -21,14 +21,14 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <dbus/dbus.h> #include <dbus/dbus-glib-lowlevel.h> -#include "nm-default.h" + #include "NetworkManager.h" #include "libnm_glib.h" diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index 3a420ea14a..5f34cb292c 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -19,7 +19,7 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> @@ -30,7 +30,6 @@ #include <nm-setting-wireless-security.h> #include <nm-utils.h> -#include "nm-default.h" #include "nm-access-point.h" #include "NetworkManager.h" #include "nm-types-private.h" diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c index 539eb75f8e..db6e7ab732 100644 --- a/libnm-glib/nm-active-connection.c +++ b/libnm-glib/nm-active-connection.c @@ -19,11 +19,10 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "NetworkManager.h" #include "nm-active-connection.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index 61223e2a4a..fc105e53e7 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -19,14 +19,14 @@ * Copyright 2007 - 2013 Red Hat, Inc. */ -#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-utils.h" #include "nm-device-ethernet.h" #include "nm-device-wifi.h" diff --git a/libnm-glib/nm-dbus-helpers.c b/libnm-glib/nm-dbus-helpers.c index db75eb24ea..539dabb970 100644 --- a/libnm-glib/nm-dbus-helpers.c +++ b/libnm-glib/nm-dbus-helpers.c @@ -18,12 +18,12 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus.h> #include <dbus/dbus-glib-lowlevel.h> -#include "nm-default.h" + #include "nm-dbus-helpers-private.h" #include "NetworkManager.h" diff --git a/libnm-glib/nm-device-adsl.c b/libnm-glib/nm-device-adsl.c index 6812168370..b8d341f452 100644 --- a/libnm-glib/nm-device-adsl.c +++ b/libnm-glib/nm-device-adsl.c @@ -19,16 +19,17 @@ * Copyright 2009 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-device-adsl.h" + +#include <string.h> + #include "nm-device-private.h" #include "nm-object-private.h" #include "nm-setting-adsl.h" -#include <string.h> - G_DEFINE_TYPE (NMDeviceAdsl, nm_device_adsl, NM_TYPE_DEVICE) #define NM_DEVICE_ADSL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_ADSL, NMDeviceAdslPrivate)) diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c index 12df490f0e..2ba34162bd 100644 --- a/libnm-glib/nm-device-bond.c +++ b/libnm-glib/nm-device-bond.c @@ -18,16 +18,15 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-bond.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-bond.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-bond.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c index d08104d10b..d95a21194d 100644 --- a/libnm-glib/nm-device-bridge.c +++ b/libnm-glib/nm-device-bridge.c @@ -18,16 +18,15 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-bridge.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-bridge.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-bridge.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c index 3d7d183b08..5f6a12f5fe 100644 --- a/libnm-glib/nm-device-bt.c +++ b/libnm-glib/nm-device-bt.c @@ -19,15 +19,14 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-bluetooth.h> +#include "nm-setting-connection.h" +#include "nm-setting-bluetooth.h" -#include "nm-default.h" #include "nm-device-bt.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c index b591461636..46056a2c7b 100644 --- a/libnm-glib/nm-device-ethernet.c +++ b/libnm-glib/nm-device-ethernet.c @@ -19,16 +19,15 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-wired.h> -#include <nm-setting-pppoe.h> +#include "nm-setting-connection.h" +#include "nm-setting-wired.h" +#include "nm-setting-pppoe.h" -#include "nm-default.h" #include "nm-device-ethernet.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-generic.c b/libnm-glib/nm-device-generic.c index a7b2fa04dd..dd9c24b5c9 100644 --- a/libnm-glib/nm-device-generic.c +++ b/libnm-glib/nm-device-generic.c @@ -18,7 +18,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c index b9af88794a..c256c4a1ca 100644 --- a/libnm-glib/nm-device-infiniband.c +++ b/libnm-glib/nm-device-infiniband.c @@ -18,17 +18,16 @@ * Copyright 2011 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <linux/if_infiniband.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-infiniband.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-infiniband.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-infiniband.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c index 88c15dd798..96ce6ca098 100644 --- a/libnm-glib/nm-device-modem.c +++ b/libnm-glib/nm-device-modem.c @@ -19,15 +19,14 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-gsm.h> -#include <nm-setting-cdma.h> +#include "nm-setting-connection.h" +#include "nm-setting-gsm.h" +#include "nm-setting-cdma.h" -#include "nm-default.h" #include "nm-device-modem.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c index 69acce4578..846b4c51be 100644 --- a/libnm-glib/nm-device-olpc-mesh.c +++ b/libnm-glib/nm-device-olpc-mesh.c @@ -18,14 +18,13 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-olpc-mesh.h> +#include "nm-setting-connection.h" +#include "nm-setting-olpc-mesh.h" -#include "nm-default.h" #include "nm-device-olpc-mesh.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-team.c b/libnm-glib/nm-device-team.c index e7622962e4..7b50e1852a 100644 --- a/libnm-glib/nm-device-team.c +++ b/libnm-glib/nm-device-team.c @@ -18,16 +18,15 @@ * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-team.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-team.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-team.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c index fe3db03a22..28d8ce5761 100644 --- a/libnm-glib/nm-device-vlan.c +++ b/libnm-glib/nm-device-vlan.c @@ -18,16 +18,15 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-vlan.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-vlan.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-vlan.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c index 05b47b4da6..2c12628a9d 100644 --- a/libnm-glib/nm-device-wifi.c +++ b/libnm-glib/nm-device-wifi.c @@ -19,16 +19,15 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-wireless.h> -#include <nm-setting-wireless-security.h> +#include "nm-setting-connection.h" +#include "nm-setting-wireless.h" +#include "nm-setting-wireless-security.h" -#include "nm-default.h" #include "nm-device-wifi.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c index 70c8b14e3c..9bd733e7fd 100644 --- a/libnm-glib/nm-device-wimax.c +++ b/libnm-glib/nm-device-wimax.c @@ -19,15 +19,14 @@ * Copyright 2009 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-wimax.h> +#include "nm-setting-connection.h" +#include "nm-setting-wimax.h" -#include "nm-default.h" #include "nm-device-wimax.h" #include "nm-object-private.h" #include "nm-object-cache.h" diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index b1f8cfb203..377784b82d 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -19,13 +19,11 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> - #include <gudev/gudev.h> -#include "nm-default.h" #include "NetworkManager.h" #include "nm-device-ethernet.h" #include "nm-device-adsl.h" diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c index 5847937426..fc3491c890 100644 --- a/libnm-glib/nm-dhcp4-config.c +++ b/libnm-glib/nm-dhcp4-config.c @@ -19,7 +19,7 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c index e55c14166e..43aee15c7c 100644 --- a/libnm-glib/nm-dhcp6-config.c +++ b/libnm-glib/nm-dhcp6-config.c @@ -19,7 +19,7 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c index ffaef74163..ae7448f9fd 100644 --- a/libnm-glib/nm-ip4-config.c +++ b/libnm-glib/nm-ip4-config.c @@ -19,11 +19,11 @@ * Copyright 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-ip4-config.h> +#include "nm-setting-ip4-config.h" #include "nm-ip4-config.h" #include "NetworkManager.h" #include "nm-types-private.h" diff --git a/libnm-glib/nm-ip6-config.c b/libnm-glib/nm-ip6-config.c index d44056a1cf..320f00f2d0 100644 --- a/libnm-glib/nm-ip6-config.c +++ b/libnm-glib/nm-ip6-config.c @@ -19,11 +19,11 @@ * Copyright 2008 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-ip6-config.h> +#include "nm-setting-ip6-config.h" #include "nm-ip6-config.h" #include "NetworkManager.h" #include "nm-types-private.h" diff --git a/libnm-glib/nm-object-cache.c b/libnm-glib/nm-object-cache.c index 82af1140f1..fa56ace53b 100644 --- a/libnm-glib/nm-object-cache.c +++ b/libnm-glib/nm-object-cache.c @@ -18,10 +18,10 @@ * Copyright 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" + #include "nm-object-cache.h" #include "nm-object.h" diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c index f2f46e0118..b252dc7a6d 100644 --- a/libnm-glib/nm-object.c +++ b/libnm-glib/nm-object.c @@ -19,13 +19,13 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> #include <stdio.h> -#include <nm-utils.h> -#include "nm-default.h" + +#include "nm-utils.h" #include "NetworkManager.h" #include "nm-object.h" #include "nm-object-cache.h" diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index 4298129bc0..2031b27f11 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -19,14 +19,13 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <NetworkManager.h> -#include <nm-utils.h> -#include <nm-setting-connection.h> -#include "nm-default.h" +#include "NetworkManager.h" +#include "nm-utils.h" +#include "nm-setting-connection.h" #include "nm-remote-connection.h" #include "nm-remote-connection-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c index 421f70305a..fa2b325f05 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -19,13 +19,12 @@ * Copyright 2009 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <NetworkManager.h> -#include <nm-connection.h> -#include "nm-default.h" +#include "NetworkManager.h" +#include "nm-connection.h" #include "nm-dbus-glib-types.h" #include "nm-remote-settings.h" #include "nm-remote-connection-private.h" diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index 99871ad2d9..a0966f9f6c 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -18,12 +18,11 @@ * Copyright 2010 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus-glib-lowlevel.h> -#include "nm-default.h" #include "NetworkManager.h" #include "nm-secret-agent.h" #include "nm-glib-enum-types.h" diff --git a/libnm-glib/nm-types.c b/libnm-glib/nm-types.c index 30936f4ee6..19f19e368d 100644 --- a/libnm-glib/nm-types.c +++ b/libnm-glib/nm-types.c @@ -18,11 +18,11 @@ * Copyright 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus-glib.h> #include <string.h> -#include "nm-default.h" + #include "nm-types.h" #include "nm-types-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c index 16e8db5e94..7670d2efd0 100644 --- a/libnm-glib/nm-vpn-connection.c +++ b/libnm-glib/nm-vpn-connection.c @@ -19,9 +19,10 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> + #include "nm-vpn-connection.h" #include "NetworkManager.h" #include "nm-utils.h" diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.c b/libnm-glib/nm-vpn-plugin-ui-interface.c index b94084e2b6..fee6fc9f28 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.c +++ b/libnm-glib/nm-vpn-plugin-ui-interface.c @@ -19,7 +19,7 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-vpn-plugin-ui-interface.h" diff --git a/libnm-glib/nm-vpn-plugin-utils.c b/libnm-glib/nm-vpn-plugin-utils.c index 9aafb19f07..d53c98345f 100644 --- a/libnm-glib/nm-vpn-plugin-utils.c +++ b/libnm-glib/nm-vpn-plugin-utils.c @@ -18,7 +18,7 @@ * Copyright 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <stdlib.h> diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index aa4fabf407..67ddd83b32 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -19,9 +19,8 @@ * Copyright 2007 - 2008 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-vpn-plugin.h" #include <signal.h> diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c index 1c40a2174f..6a3b8effab 100644 --- a/libnm-glib/nm-wimax-nsp.c +++ b/libnm-glib/nm-wimax-nsp.c @@ -18,15 +18,13 @@ * Copyright 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-connection.h> -#include <nm-setting-connection.h> -#include <nm-setting-wimax.h> - -#include "nm-default.h" +#include "nm-connection.h" +#include "nm-setting-connection.h" +#include "nm-setting-wimax.h" #include "nm-wimax-nsp.h" #include "NetworkManager.h" #include "nm-types-private.h" diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c index f528bc26fb..da2e39e04f 100644 --- a/libnm-glib/tests/test-nm-client.c +++ b/libnm-glib/tests/test-nm-client.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus.h> #include <dbus/dbus-glib.h> @@ -27,7 +27,6 @@ #include <sys/types.h> #include <signal.h> -#include "nm-default.h" #include "nm-client.h" #include "nm-device-wifi.h" #include "nm-device-ethernet.h" diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c index 83227d4bbc..9213aa720e 100644 --- a/libnm-glib/tests/test-remote-settings-client.c +++ b/libnm-glib/tests/test-remote-settings-client.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus.h> #include <dbus/dbus-glib.h> @@ -28,12 +28,10 @@ #include <signal.h> #include "NetworkManager.h" - #include "nm-setting-connection.h" #include "nm-setting-wired.h" #include "nm-utils.h" -#include "nm-default.h" #include "nm-remote-settings.h" #include "nm-test-libnm-utils.h" diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index 757fdbe014..7fdf0f7215 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -21,14 +21,13 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <strings.h> #include <unistd.h> #include <stdlib.h> -#include "nm-default.h" #include "crypto.h" GQuark diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c index 4e3e4e7cd7..8604c5c3bc 100644 --- a/libnm-util/crypto_gnutls.c +++ b/libnm-util/crypto_gnutls.c @@ -21,14 +21,13 @@ * Copyright 2007 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <gnutls/gnutls.h> #include <gnutls/crypto.h> #include <gnutls/x509.h> #include <gnutls/pkcs12.h> -#include "nm-default.h" #include "crypto.h" #define SALT_LEN 8 diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c index b71806dd2d..4e60d2e954 100644 --- a/libnm-util/crypto_nss.c +++ b/libnm-util/crypto_nss.c @@ -21,7 +21,7 @@ * Copyright 2007 - 2009 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <prinit.h> #include <nss.h> @@ -33,7 +33,6 @@ #include <ciferfam.h> #include <p12plcy.h> -#include "nm-default.h" #include "crypto.h" static gboolean initialized = FALSE; diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index ea1492b743..ea791c51a8 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -20,11 +20,11 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus-glib.h> #include <string.h> -#include "nm-default.h" + #include "nm-connection.h" #include "nm-utils.h" #include "nm-dbus-glib-types.h" diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c index 7f242acfca..0bb32b7fed 100644 --- a/libnm-util/nm-param-spec-specialized.c +++ b/libnm-util/nm-param-spec-specialized.c @@ -20,9 +20,8 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-gvaluearray-compat.h" #include "nm-param-spec-specialized.h" diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index 2e14a08ebd..f476b2489b 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -20,9 +20,8 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-setting-8021x.h" #include <string.h> diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c index 55d04ce185..5c1775709a 100644 --- a/libnm-util/nm-setting-adsl.c +++ b/libnm-util/nm-setting-adsl.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c index 76bf283145..db0b3e9278 100644 --- a/libnm-util/nm-setting-bluetooth.c +++ b/libnm-util/nm-setting-bluetooth.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c index c6e860bdc5..29bf6404be 100644 --- a/libnm-util/nm-setting-bond.c +++ b/libnm-util/nm-setting-bond.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c index 9da2192582..3d11e73cfa 100644 --- a/libnm-util/nm-setting-bridge-port.c +++ b/libnm-util/nm-setting-bridge-port.c @@ -19,7 +19,7 @@ * Copyright 2012 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <ctype.h> diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c index 1e475d305e..833728b90a 100644 --- a/libnm-util/nm-setting-bridge.c +++ b/libnm-util/nm-setting-bridge.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <ctype.h> diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c index 1098165217..794945f1c4 100644 --- a/libnm-util/nm-setting-cdma.c +++ b/libnm-util/nm-setting-cdma.c @@ -19,7 +19,7 @@ * Copyright 2007 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index abbe99ba3d..16c858dc5c 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c index da3febaabe..7888a71100 100644 --- a/libnm-util/nm-setting-dcb.c +++ b/libnm-util/nm-setting-dcb.c @@ -19,7 +19,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus-glib.h> diff --git a/libnm-util/nm-setting-generic.c b/libnm-util/nm-setting-generic.c index e32ae4971f..39134e8bd2 100644 --- a/libnm-util/nm-setting-generic.c +++ b/libnm-util/nm-setting-generic.c @@ -19,7 +19,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-setting-generic.h" #include "nm-setting-private.h" diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c index bc9f31bcfb..fd11ce67f3 100644 --- a/libnm-util/nm-setting-gsm.c +++ b/libnm-util/nm-setting-gsm.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c index 95fa0c6920..c9fa8ec9eb 100644 --- a/libnm-util/nm-setting-infiniband.c +++ b/libnm-util/nm-setting-infiniband.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <dbus/dbus-glib.h> diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index efc226b3bf..6018af06c0 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -20,12 +20,11 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus-glib.h> -#include "nm-default.h" #include "nm-setting-ip4-config.h" #include "nm-param-spec-specialized.h" #include "nm-utils.h" diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 2ddce6c19a..ac1645883f 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -19,12 +19,11 @@ * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus-glib.h> -#include "nm-default.h" #include "nm-setting-ip6-config.h" #include "nm-param-spec-specialized.h" #include "nm-utils.h" diff --git a/libnm-util/nm-setting-olpc-mesh.c b/libnm-util/nm-setting-olpc-mesh.c index 8d812869c7..7785d860a4 100644 --- a/libnm-util/nm-setting-olpc-mesh.c +++ b/libnm-util/nm-setting-olpc-mesh.c @@ -20,7 +20,7 @@ * Copyright 2009 One Laptop per Child */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c index 06f220fe35..d574bceaa4 100644 --- a/libnm-util/nm-setting-ppp.c +++ b/libnm-util/nm-setting-ppp.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-setting-ppp.h" #include "nm-setting-private.h" diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c index 5747d30654..5b729c8552 100644 --- a/libnm-util/nm-setting-pppoe.c +++ b/libnm-util/nm-setting-pppoe.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c index c60cffb25e..8a4b079d81 100644 --- a/libnm-util/nm-setting-serial.c +++ b/libnm-util/nm-setting-serial.c @@ -20,11 +20,10 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-setting-serial.h" #include "nm-setting-private.h" diff --git a/libnm-util/nm-setting-team-port.c b/libnm-util/nm-setting-team-port.c index 7e17d5e3b5..5fa511d988 100644 --- a/libnm-util/nm-setting-team-port.c +++ b/libnm-util/nm-setting-team-port.c @@ -18,7 +18,7 @@ * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <ctype.h> diff --git a/libnm-util/nm-setting-team.c b/libnm-util/nm-setting-team.c index 0753150351..f5dcdc9442 100644 --- a/libnm-util/nm-setting-team.c +++ b/libnm-util/nm-setting-team.c @@ -18,7 +18,7 @@ * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> diff --git a/libnm-util/nm-setting-template.c b/libnm-util/nm-setting-template.c index 3c90a49eca..8ddc565ef5 100644 --- a/libnm-util/nm-setting-template.c +++ b/libnm-util/nm-setting-template.c @@ -27,7 +27,7 @@ remove this comment, and you're almost done. */ -#include "config.h" +#include "nm-default.h" #include "nm-setting-template.h" diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index d101f45f29..32ad9394f1 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index 95f08adffe..f0d7ecf511 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -19,7 +19,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c index 7581f2f295..60beb91279 100644 --- a/libnm-util/nm-setting-wimax.c +++ b/libnm-util/nm-setting-wimax.c @@ -20,7 +20,7 @@ * Copyright 2009 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index 5233fc5360..0c3371e7b9 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 719dfaa6ef..8749cdfaa6 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus-glib.h> diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index 2720f4af80..acb1d457cd 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 372b06b526..add3ad9795 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 693ed6908c..7c9def1da2 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -19,9 +19,8 @@ * Copyright 2005 - 2013 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-utils.h" #include <string.h> diff --git a/libnm-util/nm-value-transforms.c b/libnm-util/nm-value-transforms.c index fd4aaf6069..2d31f12967 100644 --- a/libnm-util/nm-value-transforms.c +++ b/libnm-util/nm-value-transforms.c @@ -19,11 +19,10 @@ * Copyright 2005 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-gvaluearray-compat.h" #include "nm-utils.h" #include "nm-utils-private.h" diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c index cdee6702cc..a1c7648fce 100644 --- a/libnm-util/tests/test-crypto.c +++ b/libnm-util/tests/test-crypto.c @@ -21,14 +21,13 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <stdlib.h> #include <stdio.h> #include <string.h> -#include "nm-default.h" #include "crypto.h" #include "nm-utils.h" diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index 1c7f7f4420..9299bd5b11 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.c @@ -19,7 +19,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus-glib.h> #include <string.h> @@ -28,8 +28,7 @@ #include <sys/wait.h> #include <sys/resource.h> -#include <nm-utils.h> -#include "nm-default.h" +#include "nm-utils.h" #include "nm-gvaluearray-compat.h" #include "nm-setting-private.h" diff --git a/libnm-util/tests/test-libnm-linking.c b/libnm-util/tests/test-libnm-linking.c index a24498f823..0e143e739d 100644 --- a/libnm-util/tests/test-libnm-linking.c +++ b/libnm-util/tests/test-libnm-linking.c @@ -19,12 +19,10 @@ * */ -#include "config.h" - -#include <nm-utils.h> - #include "nm-default.h" +#include "nm-utils.h" + extern GType nm_state_get_type (void); int diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c index 30e58b6f2f..0d451788e5 100644 --- a/libnm-util/tests/test-secrets.c +++ b/libnm-util/tests/test-secrets.c @@ -19,13 +19,12 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> +#include "nm-utils.h" -#include "nm-default.h" #include "nm-setting-connection.h" #include "nm-setting-wired.h" #include "nm-setting-8021x.h" diff --git a/libnm-util/tests/test-setting-8021x.c b/libnm-util/tests/test-setting-8021x.c index b02a0ee972..e5bddf4cd9 100644 --- a/libnm-util/tests/test-setting-8021x.c +++ b/libnm-util/tests/test-setting-8021x.c @@ -19,13 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> - -#include "nm-default.h" +#include "nm-utils.h" #include "nm-setting-connection.h" #include "nm-setting-8021x.h" diff --git a/libnm-util/tests/test-setting-dcb.c b/libnm-util/tests/test-setting-dcb.c index 59eac3c5b1..fb44278b6c 100644 --- a/libnm-util/tests/test-setting-dcb.c +++ b/libnm-util/tests/test-setting-dcb.c @@ -19,10 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> + +#include "nm-utils.h" #include "nm-default.h" #include "nm-setting-dcb.h" diff --git a/libnm-util/tests/test-settings-defaults.c b/libnm-util/tests/test-settings-defaults.c index 76cc2856a6..95ff070955 100644 --- a/libnm-util/tests/test-settings-defaults.c +++ b/libnm-util/tests/test-settings-defaults.c @@ -19,13 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> - -#include "nm-default.h" +#include "nm-utils.h" #include "nm-setting-8021x.h" #include "nm-setting-cdma.h" #include "nm-setting-connection.h" diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c index a15190c7da..d1dd1c3fdd 100644 --- a/libnm/nm-access-point.c +++ b/libnm/nm-access-point.c @@ -19,9 +19,8 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-access-point.h" #include <string.h> diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c index b16080278a..a1636598ac 100644 --- a/libnm/nm-active-connection.c +++ b/libnm/nm-active-connection.c @@ -19,11 +19,10 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-active-connection.h" #include "nm-object-private.h" diff --git a/libnm/nm-client.c b/libnm/nm-client.c index dc6db0aad9..57a43ca8dc 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -19,12 +19,11 @@ * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> -#include "nm-default.h" +#include "nm-utils.h" #include "nm-client.h" #include "nm-manager.h" #include "nm-remote-settings.h" diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c index 6242bb2717..3076674a4f 100644 --- a/libnm/nm-dbus-helpers.c +++ b/libnm/nm-dbus-helpers.c @@ -18,9 +18,8 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-dbus-helpers.h" #include <string.h> diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c index b9d609dab5..7608ff3916 100644 --- a/libnm/nm-device-adsl.c +++ b/libnm/nm-device-adsl.c @@ -19,16 +19,18 @@ * Copyright 2009 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-device-adsl.h" + +#include <string.h> + #include "nm-device-private.h" #include "nm-object-private.h" #include "nm-setting-adsl.h" #include "nm-setting-connection.h" -#include <string.h> G_DEFINE_TYPE (NMDeviceAdsl, nm_device_adsl, NM_TYPE_DEVICE) diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c index 3bfcb94cea..483d9d009b 100644 --- a/libnm/nm-device-bond.c +++ b/libnm/nm-device-bond.c @@ -18,15 +18,14 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-bond.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-bond.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-bond.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c index 5afc46e3ed..c6bf135997 100644 --- a/libnm/nm-device-bridge.c +++ b/libnm/nm-device-bridge.c @@ -18,15 +18,14 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-bridge.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-bridge.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-bridge.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c index f89be17221..dc28ad89f4 100644 --- a/libnm/nm-device-bt.c +++ b/libnm/nm-device-bt.c @@ -19,15 +19,14 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-bluetooth.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-bluetooth.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-bt.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c index 537a6f4cac..88a7c43248 100644 --- a/libnm/nm-device-ethernet.c +++ b/libnm/nm-device-ethernet.c @@ -19,16 +19,15 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-wired.h> -#include <nm-setting-pppoe.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-wired.h" +#include "nm-setting-pppoe.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-ethernet.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-generic.c b/libnm/nm-device-generic.c index 9aeb9bfafb..069ca0eafa 100644 --- a/libnm/nm-device-generic.c +++ b/libnm/nm-device-generic.c @@ -18,7 +18,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c index ab3a0bb75d..6770b1c53e 100644 --- a/libnm/nm-device-infiniband.c +++ b/libnm/nm-device-infiniband.c @@ -18,15 +18,14 @@ * Copyright 2011 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-infiniband.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-infiniband.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-infiniband.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-ip-tunnel.c b/libnm/nm-device-ip-tunnel.c index b43b041290..f5b3cad6a3 100644 --- a/libnm/nm-device-ip-tunnel.c +++ b/libnm/nm-device-ip-tunnel.c @@ -18,15 +18,14 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-ip-tunnel.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-ip-tunnel.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-ip-tunnel.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c index 3b4bfd35c8..825c9197c1 100644 --- a/libnm/nm-device-macvlan.c +++ b/libnm/nm-device-macvlan.c @@ -18,16 +18,15 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-macvlan.h> -#include <nm-setting-wired.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-macvlan.h" +#include "nm-setting-wired.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-macvlan.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c index 9fe5acb650..d442dc0342 100644 --- a/libnm/nm-device-modem.c +++ b/libnm/nm-device-modem.c @@ -19,15 +19,14 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-gsm.h> -#include <nm-setting-cdma.h> +#include "nm-setting-connection.h" +#include "nm-setting-gsm.h" +#include "nm-setting-cdma.h" -#include "nm-default.h" #include "nm-device-modem.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c index 8e6cb1ab24..984ea4e42d 100644 --- a/libnm/nm-device-olpc-mesh.c +++ b/libnm/nm-device-olpc-mesh.c @@ -18,14 +18,13 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-olpc-mesh.h> +#include "nm-setting-connection.h" +#include "nm-setting-olpc-mesh.h" -#include "nm-default.h" #include "nm-device-olpc-mesh.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c index c38c58c1fd..b855d5ec38 100644 --- a/libnm/nm-device-team.c +++ b/libnm/nm-device-team.c @@ -18,15 +18,14 @@ * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-team.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-team.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-team.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-tun.c b/libnm/nm-device-tun.c index ce2558f0a9..b227f5b13e 100644 --- a/libnm/nm-device-tun.c +++ b/libnm/nm-device-tun.c @@ -18,16 +18,15 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> -#include <nm-setting-connection.h> -#include <nm-setting-tun.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-tun.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-tun.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c index b285eea9c6..843dda02df 100644 --- a/libnm/nm-device-vlan.c +++ b/libnm/nm-device-vlan.c @@ -18,16 +18,15 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-vlan.h> -#include <nm-setting-wired.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-vlan.h" +#include "nm-setting-wired.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-vlan.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-vxlan.c b/libnm/nm-device-vxlan.c index 4718080e4a..335498ee4a 100644 --- a/libnm/nm-device-vxlan.c +++ b/libnm/nm-device-vxlan.c @@ -18,15 +18,14 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-vxlan.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-vxlan.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-vxlan.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c index 4d3545c8bd..3fde324c05 100644 --- a/libnm/nm-device-wifi.c +++ b/libnm/nm-device-wifi.c @@ -19,9 +19,8 @@ * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-device-wifi.h" #include <string.h> diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c index 55658a590e..e26efedbae 100644 --- a/libnm/nm-device-wimax.c +++ b/libnm/nm-device-wimax.c @@ -19,15 +19,14 @@ * Copyright 2009 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-wimax.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-wimax.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-wimax.h" #include "nm-wimax-nsp.h" #include "nm-object-private.h" diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 3e887f79ea..5545e8be31 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -19,9 +19,8 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-device.h" #include <string.h> diff --git a/libnm/nm-dhcp-config.c b/libnm/nm-dhcp-config.c index 7227abac33..3161e2960f 100644 --- a/libnm/nm-dhcp-config.c +++ b/libnm/nm-dhcp-config.c @@ -19,7 +19,7 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm/nm-dhcp4-config.c b/libnm/nm-dhcp4-config.c index 808edaa647..26e89c2766 100644 --- a/libnm/nm-dhcp4-config.c +++ b/libnm/nm-dhcp4-config.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-dhcp4-config.h" #include "nm-object-private.h" diff --git a/libnm/nm-dhcp6-config.c b/libnm/nm-dhcp6-config.c index 3b2e81f84c..f1556b208b 100644 --- a/libnm/nm-dhcp6-config.c +++ b/libnm/nm-dhcp6-config.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-dhcp6-config.h" #include "nm-object-private.h" diff --git a/libnm/nm-ip-config.c b/libnm/nm-ip-config.c index fc4567c420..97fb0aa926 100644 --- a/libnm/nm-ip-config.c +++ b/libnm/nm-ip-config.c @@ -19,7 +19,7 @@ * Copyright 2008 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm/nm-ip4-config.c b/libnm/nm-ip4-config.c index 26797dd7ca..a57fc30f5c 100644 --- a/libnm/nm-ip4-config.c +++ b/libnm/nm-ip4-config.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-ip4-config.h" #include "nm-object-private.h" diff --git a/libnm/nm-ip6-config.c b/libnm/nm-ip6-config.c index 8a6c966c39..983c0465fa 100644 --- a/libnm/nm-ip6-config.c +++ b/libnm/nm-ip6-config.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-ip6-config.h" #include "nm-object-private.h" diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index 775f7d71c3..17a51f249b 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -19,9 +19,8 @@ * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-manager.h" #include <string.h> diff --git a/libnm/nm-object-cache.c b/libnm/nm-object-cache.c index 82af1140f1..fa56ace53b 100644 --- a/libnm/nm-object-cache.c +++ b/libnm/nm-object-cache.c @@ -18,10 +18,10 @@ * Copyright 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" + #include "nm-object-cache.h" #include "nm-object.h" diff --git a/libnm/nm-object.c b/libnm/nm-object.c index 42c6476e94..b35f6822a5 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -19,9 +19,8 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-object.h" #include <string.h> diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index e2073784ca..d2b55bd84f 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -19,14 +19,14 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-dbus-interface.h> -#include <nm-utils.h> -#include <nm-setting-connection.h> -#include "nm-default.h" +#include "nm-dbus-interface.h" +#include "nm-utils.h" +#include "nm-setting-connection.h" + #include "nm-remote-connection.h" #include "nm-remote-connection-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index 305985b175..b04f4f2ac8 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -19,9 +19,8 @@ * Copyright 2009 - 2012 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-remote-settings.h" #include <string.h> diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 97bb287e8c..8edb224cb1 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -18,11 +18,10 @@ * Copyright 2010 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-secret-agent-old.h" #include "nm-enum-types.h" diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c index f46dc0ca08..4b96210b46 100644 --- a/libnm/nm-vpn-connection.c +++ b/libnm/nm-vpn-connection.c @@ -19,9 +19,10 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> + #include "nm-vpn-connection.h" #include "nm-dbus-interface.h" #include "nm-utils.h" diff --git a/libnm/nm-vpn-editor.c b/libnm/nm-vpn-editor.c index da81d605ea..86bd694736 100644 --- a/libnm/nm-vpn-editor.c +++ b/libnm/nm-vpn-editor.c @@ -19,7 +19,7 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-vpn-editor.h" diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index c14f3a7aae..9bbac414c1 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -19,9 +19,8 @@ * Copyright 2007 - 2008 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-vpn-plugin-old.h" #include <errno.h> diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index c9e3a0c4c7..4e301e91c9 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -19,9 +19,8 @@ * Copyright 2007 - 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-vpn-service-plugin.h" #include <errno.h> diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c index 9fbc6ea1d3..d544b0d47f 100644 --- a/libnm/nm-wimax-nsp.c +++ b/libnm/nm-wimax-nsp.c @@ -18,15 +18,14 @@ * Copyright 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-connection.h> -#include <nm-setting-connection.h> -#include <nm-setting-wimax.h> +#include "nm-connection.h" +#include "nm-setting-connection.h" +#include "nm-setting-wimax.h" -#include "nm-default.h" #include "nm-wimax-nsp.h" #include "nm-dbus-interface.h" #include "nm-object-private.h" diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c index 70e93acc23..9e9d480eaf 100644 --- a/libnm/tests/test-nm-client.c +++ b/libnm/tests/test-nm-client.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <sys/types.h> diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c index 1a3c7988a2..8f59656d75 100644 --- a/libnm/tests/test-remote-settings-client.c +++ b/libnm/tests/test-remote-settings-client.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <sys/types.h> diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c index f8aedd2368..9756186681 100644 --- a/libnm/tests/test-secret-agent.c +++ b/libnm/tests/test-secret-agent.c @@ -18,13 +18,13 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <sys/types.h> #include <signal.h> -#include <nm-secret-agent-old.h> +#include "nm-secret-agent-old.h" #include "nm-test-libnm-utils.h" diff --git a/shared/nm-default.h b/shared/nm-default.h index a528e56295..365277724d 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -41,6 +41,11 @@ /* always include these headers for our internal source files. */ +#ifndef ___CONFIG_H__ +#define ___CONFIG_H__ +#include <config.h> +#endif + #include <stdlib.h> #include "nm-glib.h" diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c index 5cdfda3d79..613a6dfea8 100644 --- a/shared/nm-test-utils-impl.c +++ b/shared/nm-test-utils-impl.c @@ -18,11 +18,10 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "NetworkManager.h" #include "nm-dbus-compat.h" diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 088811b5f2..9e3928f724 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -19,7 +19,7 @@ * Copyright 2005 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <fcntl.h> @@ -33,7 +33,6 @@ #include <linux/if.h> #include <linux/if_infiniband.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-platform.h" #include "nm-utils.h" diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c index d3f1423f6d..a3fa4901f0 100644 --- a/src/devices/adsl/nm-atm-manager.c +++ b/src/devices/adsl/nm-atm-manager.c @@ -18,13 +18,12 @@ * Copyright (C) 2009 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <gudev/gudev.h> #include <gmodule.h> -#include "nm-default.h" #include "nm-atm-manager.h" #include "nm-setting-adsl.h" #include "nm-device-adsl.h" diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index 57afcf463d..e7a91e0ae4 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -18,7 +18,7 @@ * Pantelis Koukousoulas <pktoss@gmail.com> */ -#include "config.h" +#include "nm-default.h" #include <sys/socket.h> #include <linux/atmdev.h> @@ -32,7 +32,6 @@ #include <stdlib.h> #include <string.h> -#include "nm-default.h" #include "nm-device-adsl.h" #include "nm-device-private.h" #include "nm-enum-types.h" diff --git a/src/devices/bluetooth/nm-bluez-common.h b/src/devices/bluetooth/nm-bluez-common.h index 4262fa766c..67810b94ce 100644 --- a/src/devices/bluetooth/nm-bluez-common.h +++ b/src/devices/bluetooth/nm-bluez-common.h @@ -21,8 +21,6 @@ #ifndef __NETWORKMANAGER_BLUEZ_COMMON_H__ #define __NETWORKMANAGER_BLUEZ_COMMON_H__ -#include "config.h" - #define BLUETOOTH_CONNECT_DUN "dun" #define BLUETOOTH_CONNECT_NAP "nap" diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c index 2d18c17b59..71226813de 100644 --- a/src/devices/bluetooth/nm-bluez-device.c +++ b/src/devices/bluetooth/nm-bluez-device.c @@ -19,11 +19,10 @@ * Copyright (C) 2013 Intel Corporation. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-core-internal.h" #include "nm-bt-error.h" diff --git a/src/devices/bluetooth/nm-bluez-device.h b/src/devices/bluetooth/nm-bluez-device.h index 0e54fcb067..c956054074 100644 --- a/src/devices/bluetooth/nm-bluez-device.h +++ b/src/devices/bluetooth/nm-bluez-device.h @@ -21,9 +21,6 @@ #ifndef __NETWORKMANAGER_BLUEZ_DEVICE_H__ #define __NETWORKMANAGER_BLUEZ_DEVICE_H__ - -#include "config.h" -#include "nm-default.h" #include "nm-connection.h" #include "nm-connection-provider.h" diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c index b093d4a2df..f66b5abe58 100644 --- a/src/devices/bluetooth/nm-bluez-manager.c +++ b/src/devices/bluetooth/nm-bluez-manager.c @@ -18,14 +18,13 @@ * Copyright (C) 2013 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <signal.h> #include <string.h> #include <stdlib.h> #include <gmodule.h> -#include "nm-default.h" #include "nm-bluez-manager.h" #include "nm-device-factory.h" #include "nm-setting-bluetooth.h" diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c index 04ae833ae9..deeebcb667 100644 --- a/src/devices/bluetooth/nm-bluez4-adapter.c +++ b/src/devices/bluetooth/nm-bluez4-adapter.c @@ -18,11 +18,10 @@ * Copyright (C) 2009 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-bluez4-adapter.h" #include "nm-bluez-device.h" diff --git a/src/devices/bluetooth/nm-bluez4-manager.c b/src/devices/bluetooth/nm-bluez4-manager.c index c5ba120c6c..146612a890 100644 --- a/src/devices/bluetooth/nm-bluez4-manager.c +++ b/src/devices/bluetooth/nm-bluez4-manager.c @@ -19,13 +19,12 @@ * Copyright (C) 2007 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <signal.h> #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-bluez-manager.h" #include "nm-bluez4-manager.h" #include "nm-bluez4-adapter.h" diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/devices/bluetooth/nm-bluez5-dun.c index 875a662fac..4c93feba60 100644 --- a/src/devices/bluetooth/nm-bluez5-dun.c +++ b/src/devices/bluetooth/nm-bluez5-dun.c @@ -18,7 +18,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/socket.h> #include <bluetooth/sdp.h> @@ -32,7 +32,6 @@ #include "nm-bluez5-dun.h" #include "nm-bt-error.h" -#include "nm-default.h" #include "NetworkManagerUtils.h" struct _NMBluez5DunContext { diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c index c9f5828dfb..e44e87d8a9 100644 --- a/src/devices/bluetooth/nm-bluez5-manager.c +++ b/src/devices/bluetooth/nm-bluez5-manager.c @@ -20,13 +20,12 @@ * Copyright (C) 2013 Intel Corporation. */ -#include "config.h" +#include "nm-default.h" #include <signal.h> #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-bluez-manager.h" #include "nm-bluez5-manager.h" #include "nm-bluez-device.h" diff --git a/src/devices/bluetooth/nm-bt-error.c b/src/devices/bluetooth/nm-bt-error.c index 9c35d8b63b..1839118730 100644 --- a/src/devices/bluetooth/nm-bt-error.c +++ b/src/devices/bluetooth/nm-bt-error.c @@ -18,9 +18,8 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-bt-error.h" GQuark diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index 1e3f9cdc87..e151b79559 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -18,12 +18,11 @@ * Copyright (C) 2009 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <string.h> -#include "nm-default.h" #include "nm-bluez-common.h" #include "nm-bluez-device.h" #include "nm-device-bt.h" diff --git a/src/devices/nm-arping-manager.c b/src/devices/nm-arping-manager.c index d8791c4866..ea10609f21 100644 --- a/src/devices/nm-arping-manager.c +++ b/src/devices/nm-arping-manager.c @@ -14,13 +14,12 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <sys/types.h> #include <sys/wait.h> -#include "nm-default.h" #include "nm-arping-manager.h" #include "nm-platform.h" #include "nm-utils.h" diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c index cef3f9b3b0..cef104e672 100644 --- a/src/devices/nm-device-bond.c +++ b/src/devices/nm-device-bond.c @@ -18,12 +18,11 @@ * Copyright 2011 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-device-bond.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c index e008213906..cc72b003ab 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -18,11 +18,10 @@ * Copyright 2011 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include "nm-default.h" #include "nm-device-bridge.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" diff --git a/src/devices/nm-device-ethernet-utils.c b/src/devices/nm-device-ethernet-utils.c index 9165de31ff..d034ddfc77 100644 --- a/src/devices/nm-device-ethernet-utils.c +++ b/src/devices/nm-device-ethernet-utils.c @@ -16,12 +16,12 @@ * (C) Copyright 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-connection.h> -#include "nm-default.h" +#include "nm-connection.h" + #include "nm-device-ethernet-utils.h" char * diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 6f8718a555..5333aba4f7 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <string.h> @@ -29,7 +29,6 @@ #include <gudev/gudev.h> -#include "nm-default.h" #include "nm-device-ethernet.h" #include "nm-device-private.h" #include "nm-activation-request.h" diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c index 1af07d406d..bd0ec002ec 100644 --- a/src/devices/nm-device-factory.c +++ b/src/devices/nm-device-factory.c @@ -18,16 +18,14 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/types.h> #include <sys/stat.h> #include <errno.h> #include <string.h> - #include <gmodule.h> #include "nm-device-factory.h" -#include "nm-default.h" #include "nm-platform.h" #include "nm-utils.h" diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c index 9f3fa90dc0..d90840d272 100644 --- a/src/devices/nm-device-generic.c +++ b/src/devices/nm-device-generic.c @@ -18,7 +18,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-device-generic.h" #include "nm-device-private.h" diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index a2a686e334..79bcb57c9b 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -18,11 +18,10 @@ * Copyright 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <linux/if_infiniband.h> -#include "nm-default.h" #include "nm-device-infiniband.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c index 47e5ab6151..0ba813eb51 100644 --- a/src/devices/nm-device-ip-tunnel.c +++ b/src/devices/nm-device-ip-tunnel.c @@ -18,7 +18,7 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/in.h> @@ -28,7 +28,6 @@ #include "nm-device-ip-tunnel.h" #include "nm-device-private.h" -#include "nm-default.h" #include "nm-manager.h" #include "nm-platform.h" #include "nm-device-factory.h" diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index 4560dd9259..dfb0431b01 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -18,11 +18,10 @@ * Copyright 2013 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-device-macvlan.h" #include "nm-device-private.h" #include "nm-connection-provider.h" diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c index 863ee2eff8..fdb72e453e 100644 --- a/src/devices/nm-device-tun.c +++ b/src/devices/nm-device-tun.c @@ -18,13 +18,12 @@ * Copyright 2013 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> #include <sys/types.h> -#include "nm-default.h" #include "nm-activation-request.h" #include "nm-device-tun.h" #include "nm-device-private.h" diff --git a/src/devices/nm-device-veth.c b/src/devices/nm-device-veth.c index a1bf0d219d..3b845642b2 100644 --- a/src/devices/nm-device-veth.c +++ b/src/devices/nm-device-veth.c @@ -18,7 +18,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <stdlib.h> @@ -29,7 +29,6 @@ #include "nm-device-veth.h" #include "nm-device-private.h" -#include "nm-default.h" #include "nm-manager.h" #include "nm-platform.h" #include "nm-device-factory.h" diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index fab48d7367..5685b24e7b 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -18,11 +18,10 @@ * Copyright 2011 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/socket.h> -#include "nm-default.h" #include "nm-device-vlan.h" #include "nm-manager.h" #include "nm-utils.h" diff --git a/src/devices/nm-device-vxlan.c b/src/devices/nm-device-vxlan.c index 9317ef5be0..ff0f234364 100644 --- a/src/devices/nm-device-vxlan.c +++ b/src/devices/nm-device-vxlan.c @@ -18,11 +18,10 @@ * Copyright 2013 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-device-vxlan.h" #include "nm-device-private.h" #include "nm-manager.h" diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 9b0cdfe9d4..c9451e0231 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <string.h> @@ -34,7 +34,6 @@ #include <netlink/route/addr.h> #include <linux/if_addr.h> -#include "nm-default.h" #include "nm-device.h" #include "nm-device-private.h" #include "NetworkManagerUtils.h" diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c index 9118129255..767851bdde 100644 --- a/src/devices/nm-lldp-listener.c +++ b/src/devices/nm-lldp-listener.c @@ -18,7 +18,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <net/ethernet.h> diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index 2258d99d32..c3d48b41e1 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include "nm-default.h" #include <sys/types.h> #include <unistd.h> @@ -27,7 +27,6 @@ #include <teamdctl.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-device-team.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" diff --git a/src/devices/team/nm-team-factory.c b/src/devices/team/nm-team-factory.c index 5f9e142adb..971efe8722 100644 --- a/src/devices/team/nm-team-factory.c +++ b/src/devices/team/nm-team-factory.c @@ -18,7 +18,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <gmodule.h> @@ -26,7 +26,6 @@ #include "nm-device-factory.h" #include "nm-team-factory.h" #include "nm-device-team.h" -#include "nm-default.h" #include "nm-platform.h" #include "nm-core-internal.h" diff --git a/src/devices/tests/test-arping.c b/src/devices/tests/test-arping.c index cf70b14800..36e176310a 100644 --- a/src/devices/tests/test-arping.c +++ b/src/devices/tests/test-arping.c @@ -18,9 +18,8 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-arping-manager.h" #include "test-common.h" diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c index c339d9ca46..7ec0d34e19 100644 --- a/src/devices/tests/test-lldp.c +++ b/src/devices/tests/test-lldp.c @@ -18,7 +18,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <fcntl.h> #include <linux/if_tun.h> @@ -26,7 +26,6 @@ #include <sys/stat.h> #include <sys/types.h> -#include "nm-default.h" #include "nm-lldp-listener.h" #include "test-common.h" diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index 23ebd9c822..11da011ee9 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -24,7 +24,7 @@ * (C) Copyright 2009 One Laptop per Child */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <string.h> @@ -35,7 +35,6 @@ #include <sys/ioctl.h> #include <errno.h> -#include "nm-default.h" #include "nm-device.h" #include "nm-device-wifi.h" #include "nm-device-olpc-mesh.h" diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index e4640786b6..18bbfcbf75 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -19,14 +19,13 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <string.h> #include <unistd.h> #include <errno.h> -#include "nm-default.h" #include "nm-device.h" #include "nm-device-wifi.h" #include "nm-device-private.h" diff --git a/src/devices/wifi/nm-wifi-ap-utils.c b/src/devices/wifi/nm-wifi-ap-utils.c index fe4b60ac8e..bcf439daa7 100644 --- a/src/devices/wifi/nm-wifi-ap-utils.c +++ b/src/devices/wifi/nm-wifi-ap-utils.c @@ -18,12 +18,11 @@ * (C) Copyright 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-wifi-ap-utils.h" #include "nm-utils.h" diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c index 771d670415..307825c6f9 100644 --- a/src/devices/wifi/nm-wifi-ap.c +++ b/src/devices/wifi/nm-wifi-ap.c @@ -19,12 +19,11 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-wifi-ap.h" #include "nm-wifi-ap-utils.h" #include "NetworkManagerUtils.h" diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/devices/wifi/nm-wifi-factory.c index 7f56dc744c..1c8ca47b52 100644 --- a/src/devices/wifi/nm-wifi-factory.c +++ b/src/devices/wifi/nm-wifi-factory.c @@ -18,7 +18,7 @@ * Copyright (C) 2011 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <gmodule.h> diff --git a/src/devices/wifi/tests/test-wifi-ap-utils.c b/src/devices/wifi/tests/test-wifi-ap-utils.c index b5642fe2c1..70e80ae9b0 100644 --- a/src/devices/wifi/tests/test-wifi-ap-utils.c +++ b/src/devices/wifi/tests/test-wifi-ap-utils.c @@ -18,11 +18,10 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-wifi-ap-utils.h" #include "nm-core-internal.h" diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c index edecd24d8b..e9c4f02e20 100644 --- a/src/devices/wwan/nm-device-modem.c +++ b/src/devices/wwan/nm-device-modem.c @@ -18,11 +18,10 @@ * Copyright (C) 2009 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-device-modem.h" #include "nm-modem.h" #include "nm-device-private.h" diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index 44ac102154..6343416cbd 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -18,7 +18,7 @@ * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -26,7 +26,6 @@ #include "nm-modem-broadband.h" #include "nm-core-internal.h" -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-platform.h" diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c index c28d86adc4..79082c410c 100644 --- a/src/devices/wwan/nm-modem-manager.c +++ b/src/devices/wwan/nm-modem-manager.c @@ -20,14 +20,13 @@ * Copyright (C) 2009 Canonical Ltd. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <libmm-glib.h> #include "nm-modem-manager.h" -#include "nm-default.h" #include "nm-dbus-compat.h" #include "nm-modem.h" #include "nm-modem-broadband.h" diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 709a54f82e..c1736ecf84 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -19,9 +19,8 @@ * Copyright (C) 2009 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-modem.h" #include <string.h> @@ -29,7 +28,6 @@ #include "nm-core-internal.h" #include "nm-platform.h" #include "nm-setting-connection.h" -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-modem-enum-types.h" diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/devices/wwan/nm-wwan-factory.c index 2fd9e0bd97..805aea69cf 100644 --- a/src/devices/wwan/nm-wwan-factory.c +++ b/src/devices/wwan/nm-wwan-factory.c @@ -18,7 +18,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <gmodule.h> @@ -29,7 +29,6 @@ #include "nm-setting-cdma.h" #include "nm-modem-manager.h" #include "nm-device-modem.h" -#include "nm-default.h" #include "nm-platform.h" static GType nm_wwan_factory_get_type (void); diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index 34d7132a58..0aeb6118a5 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -17,9 +17,8 @@ * */ -#include "config.h" - #include "nm-default.h" + #include "nm-dhcp-client.h" #include <string.h> diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c index 6520f7b1d9..bf2df1e034 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c +++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c @@ -17,9 +17,8 @@ * Copyright (C) 2011 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-dhcp-dhclient-utils.h" #include <string.h> diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index 972fb506f4..bc4345fe6c 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -24,6 +24,8 @@ #include <time.h> #undef _XOPEN_SOURCE +#include "nm-default.h" + #include <string.h> #include <stdlib.h> #include <errno.h> @@ -33,7 +35,6 @@ #include <arpa/inet.h> #include <ctype.h> -#include "nm-default.h" #include "nm-dhcp-dhclient.h" #include "nm-utils.h" #include "nm-dhcp-dhclient-utils.h" diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index ebbbb0812a..8060cc6a75 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -21,7 +21,7 @@ */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> @@ -31,7 +31,6 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include "nm-default.h" #include "nm-dhcp-dhcpcd.h" #include "nm-dhcp-manager.h" #include "nm-utils.h" diff --git a/src/dhcp-manager/nm-dhcp-helper.c b/src/dhcp-manager/nm-dhcp-helper.c index 15b63d94d0..7667084d74 100644 --- a/src/dhcp-manager/nm-dhcp-helper.c +++ b/src/dhcp-manager/nm-dhcp-helper.c @@ -18,15 +18,13 @@ * Copyright (C) 2007 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <stdlib.h> #include <string.h> #include <signal.h> -#include "nm-default.h" - #define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client" static const char * ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL}; diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c index f6fafb8082..595b209748 100644 --- a/src/dhcp-manager/nm-dhcp-listener.c +++ b/src/dhcp-manager/nm-dhcp-listener.c @@ -17,7 +17,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <sys/socket.h> #include <sys/wait.h> @@ -27,7 +27,6 @@ #include <errno.h> #include <unistd.h> -#include "nm-default.h" #include "nm-dhcp-listener.h" #include "nm-core-internal.h" #include "nm-bus-manager.h" diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index cb74a5bcca..44c3365d2a 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -20,7 +20,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <sys/socket.h> #include <sys/wait.h> @@ -32,7 +32,6 @@ #include <fcntl.h> #include <stdio.h> -#include "nm-default.h" #include "nm-dhcp-manager.h" #include "nm-dhcp-dhclient.h" #include "nm-dhcp-dhcpcd.h" diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c index 3a6de91b2d..7c2bc78f59 100644 --- a/src/dhcp-manager/nm-dhcp-systemd.c +++ b/src/dhcp-manager/nm-dhcp-systemd.c @@ -16,7 +16,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> @@ -28,7 +28,6 @@ #include <ctype.h> #include <net/if_arp.h> -#include "nm-default.h" #include "nm-dhcp-systemd.h" #include "nm-utils.h" #include "nm-dhcp-utils.h" diff --git a/src/dhcp-manager/nm-dhcp-utils.c b/src/dhcp-manager/nm-dhcp-utils.c index 591a0d1f98..be563a6971 100644 --- a/src/dhcp-manager/nm-dhcp-utils.c +++ b/src/dhcp-manager/nm-dhcp-utils.c @@ -17,14 +17,13 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> #include <unistd.h> #include <arpa/inet.h> -#include "nm-default.h" #include "nm-dhcp-utils.h" #include "nm-utils.h" #include "NetworkManagerUtils.h" diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c index 04a15af48e..0561d43c14 100644 --- a/src/dhcp-manager/tests/test-dhcp-dhclient.c +++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c @@ -18,8 +18,6 @@ * */ -#include "config.h" - #include "nm-default.h" #include <string.h> diff --git a/src/dhcp-manager/tests/test-dhcp-utils.c b/src/dhcp-manager/tests/test-dhcp-utils.c index 49987c40ca..3805132683 100644 --- a/src/dhcp-manager/tests/test-dhcp-utils.c +++ b/src/dhcp-manager/tests/test-dhcp-utils.c @@ -17,15 +17,14 @@ * */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <arpa/inet.h> #include <string.h> -#include <nm-utils.h> +#include "nm-utils.h" -#include "nm-default.h" #include "nm-dhcp-utils.h" #include "nm-platform.h" diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 75076ff029..8663dfd81c 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <unistd.h> @@ -27,7 +27,6 @@ #include <arpa/inet.h> #include <sys/stat.h> -#include "nm-default.h" #include "nm-dns-dnsmasq.h" #include "nm-utils.h" #include "nm-ip4-config.h" diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index b785e14507..79d345bed3 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -21,7 +21,7 @@ * and others */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <fcntl.h> @@ -35,7 +35,6 @@ #include <linux/fs.h> -#include "nm-default.h" #include "nm-utils.h" #include "nm-core-internal.h" #include "nm-dns-manager.h" diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c index d473b9debb..8313ed13cd 100644 --- a/src/dns-manager/nm-dns-plugin.c +++ b/src/dns-manager/nm-dns-plugin.c @@ -17,7 +17,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> @@ -25,7 +25,6 @@ #include <sys/types.h> #include <sys/wait.h> -#include "nm-default.h" #include "nm-dns-plugin.h" #include "NetworkManagerUtils.h" diff --git a/src/dns-manager/nm-dns-unbound.c b/src/dns-manager/nm-dns-unbound.c index d36e3f8576..4c1af1039f 100644 --- a/src/dns-manager/nm-dns-unbound.c +++ b/src/dns-manager/nm-dns-unbound.c @@ -17,7 +17,7 @@ * Copyright (C) 2014 Red Hat, Inc. * Author: Pavel Šimerda <psimerda@redhat.com> */ -#include "config.h" +#include "nm-default.h" #include "nm-dns-unbound.h" #include "NetworkManagerUtils.h" diff --git a/src/dns-manager/nm-dns-utils.c b/src/dns-manager/nm-dns-utils.c index 4a5255a421..e920611acc 100644 --- a/src/dns-manager/nm-dns-utils.c +++ b/src/dns-manager/nm-dns-utils.c @@ -17,7 +17,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <string.h> diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c index 41184910db..9e388acfb9 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c @@ -18,7 +18,7 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/types.h> #include <sys/wait.h> @@ -28,7 +28,6 @@ #include <arpa/inet.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-dnsmasq-manager.h" #include "nm-dnsmasq-utils.h" #include "nm-utils.h" diff --git a/src/dnsmasq-manager/nm-dnsmasq-utils.c b/src/dnsmasq-manager/nm-dnsmasq-utils.c index 4394ae7b55..bf8faecd52 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-utils.c +++ b/src/dnsmasq-manager/nm-dnsmasq-utils.c @@ -18,7 +18,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> diff --git a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c index 04bf1b4d74..850ae4f6fb 100644 --- a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c +++ b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c @@ -18,11 +18,10 @@ * */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> -#include "nm-default.h" #include "nm-dnsmasq-utils.h" #include "nm-test-utils.h" diff --git a/src/main-utils.c b/src/main-utils.c index 7425d0bc91..e0f254b752 100644 --- a/src/main-utils.c +++ b/src/main-utils.c @@ -19,7 +19,7 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <errno.h> @@ -32,7 +32,6 @@ #include <glib-unix.h> #include <gmodule.h> -#include "nm-default.h" #include "main-utils.h" #include "NetworkManagerUtils.h" diff --git a/src/main.c b/src/main.c index ee8e0f2d49..12baed1fd9 100644 --- a/src/main.c +++ b/src/main.c @@ -19,7 +19,7 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <getopt.h> #include <locale.h> @@ -35,7 +35,6 @@ #include <string.h> #include <sys/resource.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "NetworkManagerUtils.h" #include "main-utils.h" diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 04a39dba8b..17b1d75dca 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -19,16 +19,14 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> #include <sys/wait.h> #include <unistd.h> - #include "nm-activation-request.h" -#include "nm-default.h" #include "nm-setting-wireless-security.h" #include "nm-setting-8021x.h" #include "nm-device.h" diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index f7506022a1..f275b3ef70 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -18,9 +18,8 @@ * Copyright (C) 2008 - 2014 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-active-connection.h" #include "nm-dbus-interface.h" #include "nm-device.h" diff --git a/src/nm-audit-manager.c b/src/nm-audit-manager.c index c1bbc2732c..b4cfb20b60 100644 --- a/src/nm-audit-manager.c +++ b/src/nm-audit-manager.c @@ -18,9 +18,8 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-audit-manager.h" #include <errno.h> diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c index bc519eb199..e2e22aca24 100644 --- a/src/nm-auth-manager.c +++ b/src/nm-auth-manager.c @@ -18,11 +18,10 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-auth-manager.h" -#include "nm-default.h" #include "nm-errors.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c index c4b6e579ac..494d52d3e8 100644 --- a/src/nm-auth-subject.c +++ b/src/nm-auth-subject.c @@ -26,14 +26,13 @@ * makes requests, like process identifier and user UID. */ -#include "config.h" +#include "nm-default.h" #include "nm-auth-subject.h" #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-bus-manager.h" #include "nm-enum-types.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-auth-subject.h b/src/nm-auth-subject.h index 1682ba7f1a..5f50705810 100644 --- a/src/nm-auth-subject.h +++ b/src/nm-auth-subject.h @@ -21,10 +21,6 @@ #ifndef __NETWORKMANAGER_AUTH_SUBJECT_H__ #define __NETWORKMANAGER_AUTH_SUBJECT_H__ -#include "config.h" - -#include "nm-default.h" - #define NM_TYPE_AUTH_SUBJECT (nm_auth_subject_get_type ()) #define NM_AUTH_SUBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AUTH_SUBJECT, NMAuthSubject)) #define NM_AUTH_SUBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_AUTH_SUBJECT, NMAuthSubjectClass)) diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c index 8c1c4dac4a..e741546bbc 100644 --- a/src/nm-auth-utils.c +++ b/src/nm-auth-utils.c @@ -18,11 +18,10 @@ * Copyright (C) 2010 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-setting-connection.h" #include "nm-auth-utils.h" #include "nm-auth-subject.h" diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c index a82b38836b..b6245b246b 100644 --- a/src/nm-bus-manager.c +++ b/src/nm-bus-manager.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <sys/stat.h> @@ -27,7 +27,6 @@ #include <errno.h> #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-bus-manager.h" #include "nm-core-internal.h" diff --git a/src/nm-bus-manager.h b/src/nm-bus-manager.h index 8e72a3ce99..49579d462a 100644 --- a/src/nm-bus-manager.h +++ b/src/nm-bus-manager.h @@ -22,10 +22,6 @@ #ifndef __NM_BUS_MANAGER_H__ #define __NM_BUS_MANAGER_H__ -#include "config.h" - -#include "nm-default.h" - G_BEGIN_DECLS #define NM_TYPE_BUS_MANAGER (nm_bus_manager_get_type ()) @@ -33,7 +29,7 @@ G_BEGIN_DECLS #define NM_BUS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NM_TYPE_BUS_MANAGER, NMBusManagerClass)) #define NM_IS_BUS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_BUS_MANAGER)) #define NM_IS_BUS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_BUS_MANAGER)) -#define NM_BUS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_BUS_MANAGER, NMBusManagerClass)) +#define NM_BUS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_BUS_MANAGER, NMBusManagerClass)) #define NM_BUS_MANAGER_DBUS_CONNECTION_CHANGED "dbus-connection-changed" #define NM_BUS_MANAGER_PRIVATE_CONNECTION_NEW "private-connection-new" diff --git a/src/nm-config-data.c b/src/nm-config-data.c index 1bbb5c96c8..21f8f3ad32 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -19,9 +19,8 @@ * Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de> */ -#include "config.h" - #include "nm-default.h" + #include "nm-config-data.h" #include <string.h> diff --git a/src/nm-config.c b/src/nm-config.c index 2eb27a9885..58fd96cbf4 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -19,12 +19,11 @@ * Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdio.h> -#include "nm-default.h" #include "nm-config.h" #include "nm-utils.h" #include "nm-device.h" diff --git a/src/nm-connection-provider.c b/src/nm-connection-provider.c index 8185b8c60f..2e258bd5b1 100644 --- a/src/nm-connection-provider.c +++ b/src/nm-connection-provider.c @@ -13,7 +13,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-connection-provider.h" #include "nm-utils.h" diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index a2216ee9a8..934727fa9e 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -19,14 +19,13 @@ * Copyright (C) 2011 Dan Williams <dcbw@redhat.com> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #if WITH_CONCHECK #include <libsoup/soup.h> #endif -#include "nm-default.h" #include "nm-connectivity.h" #include "nm-config.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-dcb.c b/src/nm-dcb.c index 109e56e549..d8f3d3e7ec 100644 --- a/src/nm-dcb.c +++ b/src/nm-dcb.c @@ -18,12 +18,11 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/wait.h> #include <string.h> -#include "nm-default.h" #include "nm-dcb.h" #include "nm-platform.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c index a27cb287a9..e2c4eefe45 100644 --- a/src/nm-default-route-manager.c +++ b/src/nm-default-route-manager.c @@ -19,11 +19,10 @@ */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-default-route-manager.h" #include "nm-device.h" #include "nm-vpn-connection.h" diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp4-config.c index 00b9949b36..26c6ab0b43 100644 --- a/src/nm-dhcp4-config.c +++ b/src/nm-dhcp4-config.c @@ -18,11 +18,10 @@ * Copyright (C) 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-dhcp4-config.h" #include "nm-utils.h" diff --git a/src/nm-dhcp6-config.c b/src/nm-dhcp6-config.c index 8aa8c2e07a..4311ee985e 100644 --- a/src/nm-dhcp6-config.c +++ b/src/nm-dhcp6-config.c @@ -18,11 +18,10 @@ * Copyright (C) 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-dhcp6-config.h" #include "nm-utils.h" diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c index c226ce7190..c0238fc59a 100644 --- a/src/nm-dispatcher.c +++ b/src/nm-dispatcher.c @@ -19,12 +19,11 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> -#include "nm-default.h" #include "nm-dispatcher.h" #include "nm-dispatcher-api.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-exported-object.c b/src/nm-exported-object.c index 8155bab0da..b6d30aaba5 100644 --- a/src/nm-exported-object.c +++ b/src/nm-exported-object.c @@ -18,14 +18,13 @@ * Copyright 2014-2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdarg.h> #include <string.h> #include "nm-exported-object.h" #include "nm-bus-manager.h" -#include "nm-default.h" static GHashTable *prefix_counters; static gboolean quitting = FALSE; diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 56b52c95e8..7babff3ce0 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -18,9 +18,8 @@ * Copyright (C) 2011 - 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-firewall-manager.h" #include <string.h> diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 069a68f825..fc3292ae8a 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -18,7 +18,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <glib-unix.h> #include <getopt.h> @@ -36,7 +36,6 @@ * Forward declare if_nametoindex. */ extern unsigned int if_nametoindex (const char *__ifname); -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-linux-platform.h" #include "nm-dhcp-manager.h" diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 3973011eca..9c2557f939 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -19,9 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-ip4-config.h" #include <string.h> diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index a7fc1155c8..fa3541a3d8 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -19,9 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-ip6-config.h" #include <string.h> diff --git a/src/nm-logging.c b/src/nm-logging.c index 9d156db6a1..c9006eb7a1 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <dlfcn.h> #include <syslog.h> @@ -37,7 +37,6 @@ #include <systemd/sd-journal.h> #endif -#include "nm-default.h" #include "nm-errors.h" #include "NetworkManagerUtils.h" #include "nm-linux-platform.h" diff --git a/src/nm-manager.c b/src/nm-manager.c index 648faf4df0..7f414e8faf 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -19,7 +19,7 @@ * Copyright (C) 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <fcntl.h> @@ -27,7 +27,6 @@ #include <string.h> #include <unistd.h> -#include "nm-default.h" #include "nm-manager.h" #include "nm-bus-manager.h" #include "nm-vpn-manager.h" diff --git a/src/nm-multi-index.c b/src/nm-multi-index.c index fe0c225580..6a22875336 100644 --- a/src/nm-multi-index.c +++ b/src/nm-multi-index.c @@ -18,9 +18,8 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-multi-index.h" #include <string.h> diff --git a/src/nm-policy.c b/src/nm-policy.c index 05f7edf4db..68e50a1c1a 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -19,15 +19,13 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <unistd.h> #include <errno.h> #include <netdb.h> - -#include "nm-default.h" #include "nm-policy.h" #include "NetworkManagerUtils.h" #include "nm-activation-request.h" diff --git a/src/nm-rfkill-manager.c b/src/nm-rfkill-manager.c index 76703b20c7..1674265631 100644 --- a/src/nm-rfkill-manager.c +++ b/src/nm-rfkill-manager.c @@ -18,13 +18,12 @@ * Copyright (C) 2009 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <gudev/gudev.h> #include "nm-rfkill-manager.h" -#include "nm-default.h" typedef struct { GUdevClient *client; diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c index 3f43ceb650..84811d5ac7 100644 --- a/src/nm-route-manager.c +++ b/src/nm-route-manager.c @@ -18,7 +18,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> @@ -26,7 +26,6 @@ #include "nm-platform.h" #include "nmp-object.h" #include "nm-core-internal.h" -#include "nm-default.h" #include "NetworkManagerUtils.h" /* if within half a second after adding an IP address a matching device-route shows diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c index 461195b005..d8b046e653 100644 --- a/src/nm-session-monitor.c +++ b/src/nm-session-monitor.c @@ -19,14 +19,13 @@ * Author: Matthias Clasen * Author: Pavel Šimerda <psimerda@redhat.com> */ -#include "config.h" +#include "nm-default.h" #include <pwd.h> #include <errno.h> #include <string.h> #include <sys/stat.h> -#include "nm-default.h" #include "nm-session-monitor.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c index 12db56b296..064a7035dc 100644 --- a/src/nm-sleep-monitor-systemd.c +++ b/src/nm-sleep-monitor-systemd.c @@ -17,14 +17,13 @@ * Author: Matthias Clasen <mclasen@redhat.com> */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <string.h> #include <sys/stat.h> #include <gio/gunixfdlist.h> -#include "nm-default.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c index c65609cf40..5f0ff24552 100644 --- a/src/nm-sleep-monitor-upower.c +++ b/src/nm-sleep-monitor-upower.c @@ -17,12 +17,12 @@ * Author: Matthias Clasen <mclasen@redhat.com> */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <string.h> #include <sys/stat.h> -#include "nm-default.h" + #include "nm-core-internal.h" #include "nm-sleep-monitor.h" diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index 7fef696580..99ba6acabb 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -18,7 +18,7 @@ * Copyright (C) 2012–2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <unistd.h> @@ -30,7 +30,6 @@ #include "nmp-object.h" #include "NetworkManagerUtils.h" #include "nm-fake-platform.h" -#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index f2d87fc587..1ebffd0007 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -17,7 +17,7 @@ * * Copyright (C) 2012-2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <unistd.h> @@ -48,7 +48,6 @@ #include "nm-platform-utils.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" -#include "nm-default.h" #include "wifi/wifi-utils.h" #include "wifi/wifi-utils-wext.h" #include "nmp-object.h" diff --git a/src/platform/nm-platform-utils.h b/src/platform/nm-platform-utils.h index 9265ff242a..a9d29c0478 100644 --- a/src/platform/nm-platform-utils.h +++ b/src/platform/nm-platform-utils.h @@ -21,8 +21,6 @@ #ifndef __NM_PLATFORM_UTILS_H__ #define __NM_PLATFORM_UTILS_H__ -#include "config.h" - #include <gudev/gudev.h> #include "nm-platform.h" diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 24492af86e..d4ba6ee4e5 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -18,7 +18,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <errno.h> @@ -38,7 +38,6 @@ #include "nm-platform-utils.h" #include "nmp-object.h" #include "NetworkManagerUtils.h" -#include "nm-default.h" #include "nm-enum-types.h" #include "nm-core-internal.h" diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index 892fd9dde1..aa5d918c98 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -18,11 +18,10 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> -#include "nm-default.h" #include "nmp-object.h" #include "nm-platform-utils.h" #include "NetworkManagerUtils.h" diff --git a/src/platform/tests/monitor.c b/src/platform/tests/monitor.c index 5cc3114cd9..3af34be42c 100644 --- a/src/platform/tests/monitor.c +++ b/src/platform/tests/monitor.c @@ -1,9 +1,28 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2015 Red Hat, Inc. + */ + +#include "nm-default.h" #include <stdlib.h> #include <syslog.h> -#include "nm-default.h" #include "nm-linux-platform.h" #include "nm-test-utils.h" diff --git a/src/platform/tests/test-address.c b/src/platform/tests/test-address.c index 681343377c..3b52a7be7c 100644 --- a/src/platform/tests/test-address.c +++ b/src/platform/tests/test-address.c @@ -1,4 +1,24 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2015 Red Hat, Inc. + */ + +#include "nm-default.h" #include "test-common.h" diff --git a/src/platform/tests/test-cleanup.c b/src/platform/tests/test-cleanup.c index 9e624a028a..4025467337 100644 --- a/src/platform/tests/test-cleanup.c +++ b/src/platform/tests/test-cleanup.c @@ -1,4 +1,24 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2016 Red Hat, Inc. + */ + +#include "nm-default.h" #include "test-common.h" diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index 67468539f1..23ad7feae3 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -1,4 +1,24 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2016 Red Hat, Inc. + */ + +#include "nm-default.h" #include <sys/mount.h> #include <sched.h> diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index 6e6e4418ad..3fa5ad5001 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -1,4 +1,24 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2016 Red Hat, Inc. + */ + +#include "nm-default.h" #include <sched.h> diff --git a/src/platform/tests/test-nmp-object.c b/src/platform/tests/test-nmp-object.c index f65ffc2ddb..3b44abb8d6 100644 --- a/src/platform/tests/test-nmp-object.c +++ b/src/platform/tests/test-nmp-object.c @@ -18,9 +18,8 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nmp-object.h" #include "nm-test-utils.h" diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c index 60a0c15c3d..4e95773db1 100644 --- a/src/platform/tests/test-route.c +++ b/src/platform/tests/test-route.c @@ -1,11 +1,32 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2016 Red Hat, Inc. + */ + +#include "nm-default.h" #include <linux/rtnetlink.h> #include "test-common.h" -#include "nm-test-utils.h" #include "NetworkManagerUtils.h" +#include "nm-test-utils.h" + #define DEVICE_NAME "nm-test-device" static void diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c index e05104f374..79f217a8d5 100644 --- a/src/platform/wifi/wifi-utils-nl80211.c +++ b/src/platform/wifi/wifi-utils-nl80211.c @@ -20,7 +20,7 @@ * Copyright (C) 2011 Intel Corporation. All rights reserved. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <string.h> @@ -32,7 +32,6 @@ #include <netlink/msg.h> #include <linux/nl80211.h> -#include "nm-default.h" #include "wifi-utils-private.h" #include "wifi-utils-nl80211.h" #include "nm-platform.h" diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c index 85a387fae2..029601e4b2 100644 --- a/src/platform/wifi/wifi-utils-wext.c +++ b/src/platform/wifi/wifi-utils-wext.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <string.h> @@ -28,8 +28,6 @@ #include <unistd.h> #include <math.h> - -#include "nm-default.h" #include "wifi-utils-private.h" #include "wifi-utils-wext.h" #include "nm-utils.h" diff --git a/src/platform/wifi/wifi-utils.c b/src/platform/wifi/wifi-utils.c index 5f2f61b0d0..38e5a0545e 100644 --- a/src/platform/wifi/wifi-utils.c +++ b/src/platform/wifi/wifi-utils.c @@ -19,13 +19,12 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/stat.h> #include <stdio.h> #include <string.h> -#include "nm-default.h" #include "wifi-utils.h" #include "wifi-utils-private.h" #include "wifi-utils-nl80211.h" diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 94e5f8c924..1578e595fc 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -19,7 +19,7 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/types.h> #include <sys/wait.h> @@ -42,7 +42,6 @@ #include <linux/if.h> #include <linux/if_ppp.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-ppp-manager.h" #include "nm-platform.h" diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c index 1f1016ae8a..be4dd1855b 100644 --- a/src/ppp-manager/nm-pppd-plugin.c +++ b/src/ppp-manager/nm-pppd-plugin.c @@ -20,6 +20,7 @@ */ #include "config.h" +#define ___CONFIG_H__ #include <string.h> #include <pppd/pppd.h> diff --git a/src/rdisc/nm-fake-rdisc.c b/src/rdisc/nm-fake-rdisc.c index 001fd9388e..6a1585b31f 100644 --- a/src/rdisc/nm-fake-rdisc.c +++ b/src/rdisc/nm-fake-rdisc.c @@ -18,7 +18,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -26,8 +26,6 @@ #include "nm-fake-rdisc.h" #include "nm-rdisc-private.h" -#include "nm-default.h" - #define _NMLOG_PREFIX_NAME "rdisc-fake" typedef struct { diff --git a/src/rdisc/nm-lndp-rdisc.c b/src/rdisc/nm-lndp-rdisc.c index 46000994ba..0686346215 100644 --- a/src/rdisc/nm-lndp-rdisc.c +++ b/src/rdisc/nm-lndp-rdisc.c @@ -18,7 +18,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -30,7 +30,6 @@ #include "nm-rdisc-private.h" #include "NetworkManagerUtils.h" -#include "nm-default.h" #include "nm-platform.h" #define _NMLOG_PREFIX_NAME "rdisc-lndp" diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c index 6133ae2826..82aece3095 100644 --- a/src/rdisc/nm-rdisc.c +++ b/src/rdisc/nm-rdisc.c @@ -18,7 +18,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <arpa/inet.h> @@ -27,7 +27,6 @@ #include "nm-rdisc.h" #include "nm-rdisc-private.h" -#include "nm-default.h" #include "nm-utils.h" #include <nm-setting-ip6-config.h> diff --git a/src/rdisc/tests/test-rdisc-fake.c b/src/rdisc/tests/test-rdisc-fake.c index ad045cff01..00a98dcadf 100644 --- a/src/rdisc/tests/test-rdisc-fake.c +++ b/src/rdisc/tests/test-rdisc-fake.c @@ -18,14 +18,13 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <syslog.h> #include "nm-rdisc.h" #include "nm-fake-rdisc.h" -#include "nm-default.h" #include "nm-fake-platform.h" diff --git a/src/rdisc/tests/test-rdisc-linux.c b/src/rdisc/tests/test-rdisc-linux.c index b93c50a77c..bbdb5fb842 100644 --- a/src/rdisc/tests/test-rdisc-linux.c +++ b/src/rdisc/tests/test-rdisc-linux.c @@ -18,14 +18,13 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <syslog.h> #include "nm-rdisc.h" #include "nm-lndp-rdisc.h" -#include "nm-default.h" #include "nm-linux-platform.h" diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index ee1c6202bc..bc09e03167 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -18,12 +18,11 @@ * Copyright (C) 2010 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <pwd.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-agent-manager.h" #include "nm-secret-agent.h" diff --git a/src/settings/nm-inotify-helper.c b/src/settings/nm-inotify-helper.c index 681933cd29..ce15246c5a 100644 --- a/src/settings/nm-inotify-helper.c +++ b/src/settings/nm-inotify-helper.c @@ -18,14 +18,13 @@ * (C) Copyright 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <string.h> #include <sys/inotify.h> #include <errno.h> -#include "nm-default.h" #include "nm-inotify-helper.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c index 89e84c2690..bfa7b50626 100644 --- a/src/settings/nm-secret-agent.c +++ b/src/settings/nm-secret-agent.c @@ -18,12 +18,11 @@ * Copyright (C) 2010 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/types.h> #include <pwd.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-secret-agent.h" #include "nm-bus-manager.h" diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 287cb69a7c..a1695b3461 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -19,11 +19,10 @@ * Copyright 2008 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-settings-connection.h" #include "nm-session-monitor.h" diff --git a/src/settings/nm-settings-plugin.c b/src/settings/nm-settings-plugin.c index 0bce8957d0..2023bc17d5 100644 --- a/src/settings/nm-settings-plugin.c +++ b/src/settings/nm-settings-plugin.c @@ -19,7 +19,7 @@ * Copyright (C) 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-settings-plugin.h" #include "nm-settings-connection.h" diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 377d52793c..ee48e7119f 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -23,7 +23,7 @@ * (C) Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <sys/stat.h> @@ -36,33 +36,32 @@ #include <selinux/selinux.h> #endif -#include <nm-dbus-interface.h> -#include <nm-connection.h> -#include <nm-setting-8021x.h> -#include <nm-setting-bluetooth.h> -#include <nm-setting-cdma.h> -#include <nm-setting-connection.h> -#include <nm-setting-gsm.h> -#include <nm-setting-ip4-config.h> -#include <nm-setting-ip6-config.h> -#include <nm-setting-olpc-mesh.h> -#include <nm-setting-ppp.h> -#include <nm-setting-pppoe.h> -#include <nm-setting-serial.h> -#include <nm-setting-vpn.h> -#include <nm-setting-wired.h> -#include <nm-setting-adsl.h> -#include <nm-setting-wireless.h> -#include <nm-setting-wireless-security.h> -#include <nm-setting-bond.h> -#include <nm-utils.h> +#include "nm-dbus-interface.h" +#include "nm-connection.h" +#include "nm-setting-8021x.h" +#include "nm-setting-bluetooth.h" +#include "nm-setting-cdma.h" +#include "nm-setting-connection.h" +#include "nm-setting-gsm.h" +#include "nm-setting-ip4-config.h" +#include "nm-setting-ip6-config.h" +#include "nm-setting-olpc-mesh.h" +#include "nm-setting-ppp.h" +#include "nm-setting-pppoe.h" +#include "nm-setting-serial.h" +#include "nm-setting-vpn.h" +#include "nm-setting-wired.h" +#include "nm-setting-adsl.h" +#include "nm-setting-wireless.h" +#include "nm-setting-wireless-security.h" +#include "nm-setting-bond.h" +#include "nm-utils.h" #include "nm-core-internal.h" #include "nm-device-ethernet.h" #include "nm-settings.h" #include "nm-settings-connection.h" #include "nm-settings-plugin.h" -#include "nm-default.h" #include "nm-bus-manager.h" #include "nm-auth-utils.h" #include "nm-auth-subject.h" diff --git a/src/settings/plugins/ibft/nm-ibft-connection.c b/src/settings/plugins/ibft/nm-ibft-connection.c index c6a9054e47..95495b5cab 100644 --- a/src/settings/plugins/ibft/nm-ibft-connection.c +++ b/src/settings/plugins/ibft/nm-ibft-connection.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/plugin.c index 555725d1a3..6f9b8c82c9 100644 --- a/src/settings/plugins/ibft/plugin.c +++ b/src/settings/plugins/ibft/plugin.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <unistd.h> @@ -26,9 +26,8 @@ #include <gmodule.h> -#include <nm-setting-connection.h> +#include "nm-setting-connection.h" -#include "nm-default.h" #include "nm-settings-plugin.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/ibft/reader.c b/src/settings/plugins/ibft/reader.c index bd21a571bb..c39d875cf9 100644 --- a/src/settings/plugins/ibft/reader.c +++ b/src/settings/plugins/ibft/reader.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> @@ -31,7 +31,6 @@ #include <sys/ioctl.h> #include <unistd.h> -#include "nm-default.h" #include "nm-core-internal.h" #include "nm-platform.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/ibft/tests/test-ibft.c b/src/settings/plugins/ibft/tests/test-ibft.c index c7aef050db..a9085478cd 100644 --- a/src/settings/plugins/ibft/tests/test-ibft.c +++ b/src/settings/plugins/ibft/tests/test-ibft.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdarg.h> @@ -33,7 +33,6 @@ #include "NetworkManagerUtils.h" #include "reader.h" -#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c index 336d9d662f..c524e0f9c8 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c @@ -18,25 +18,23 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <glib/gstdio.h> -#include <nm-dbus-interface.h> -#include <nm-setting-connection.h> -#include <nm-setting-wired.h> -#include <nm-setting-wireless.h> -#include <nm-setting-gsm.h> -#include <nm-setting-cdma.h> -#include <nm-setting-pppoe.h> -#include <nm-setting-wireless-security.h> -#include <nm-setting-8021x.h> +#include "nm-dbus-interface.h" +#include "nm-setting-connection.h" +#include "nm-setting-wired.h" +#include "nm-setting-wireless.h" +#include "nm-setting-gsm.h" +#include "nm-setting-cdma.h" +#include "nm-setting-pppoe.h" +#include "nm-setting-wireless-security.h" +#include "nm-setting-8021x.h" #include "nm-platform.h" -#include "nm-default.h" - #include "common.h" #include "nm-config.h" #include "nm-ifcfg-connection.h" diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c index 5afc46d609..d28e3bf6c4 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.c +++ b/src/settings/plugins/ifcfg-rh/plugin.c @@ -21,7 +21,7 @@ * Copyright (C) 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <unistd.h> @@ -33,7 +33,6 @@ #include "nm-setting-connection.h" -#include "nm-default.h" #include "common.h" #include "plugin.h" #include "nm-settings-plugin.h" diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 0f79ca07aa..5d4375cc09 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -18,7 +18,7 @@ * Copyright 2008 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> @@ -31,25 +31,24 @@ #include <sys/ioctl.h> #include <unistd.h> -#include <nm-connection.h> -#include <nm-dbus-interface.h> -#include <nm-setting-connection.h> -#include <nm-setting-ip4-config.h> -#include <nm-setting-vlan.h> -#include <nm-setting-ip6-config.h> -#include <nm-setting-wired.h> -#include <nm-setting-wireless.h> -#include <nm-setting-8021x.h> -#include <nm-setting-bond.h> -#include <nm-setting-team.h> -#include <nm-setting-team-port.h> -#include <nm-setting-bridge.h> -#include <nm-setting-bridge-port.h> -#include <nm-setting-dcb.h> -#include <nm-setting-generic.h> -#include "nm-default.h" +#include "nm-connection.h" +#include "nm-dbus-interface.h" +#include "nm-setting-connection.h" +#include "nm-setting-ip4-config.h" +#include "nm-setting-vlan.h" +#include "nm-setting-ip6-config.h" +#include "nm-setting-wired.h" +#include "nm-setting-wireless.h" +#include "nm-setting-8021x.h" +#include "nm-setting-bond.h" +#include "nm-setting-team.h" +#include "nm-setting-team-port.h" +#include "nm-setting-bridge.h" +#include "nm-setting-bridge-port.h" +#include "nm-setting-dcb.h" +#include "nm-setting-generic.h" #include "nm-core-internal.h" -#include <nm-utils.h> +#include "nm-utils.h" #include "nm-platform.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c index 43068c6703..4e756349ca 100644 --- a/src/settings/plugins/ifcfg-rh/shvar.c +++ b/src/settings/plugins/ifcfg-rh/shvar.c @@ -23,7 +23,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <fcntl.h> @@ -37,7 +37,6 @@ #include "shvar.h" #include "nm-core-internal.h" -#include "nm-default.h" #define PARSE_WARNING(msg...) nm_log_warn (LOGD_SETTINGS, " " msg) diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c index 1ce7e8fa0c..5a0f6451a4 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c @@ -18,7 +18,7 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdarg.h> diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 30bffa733a..658281f795 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -18,7 +18,7 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdarg.h> @@ -30,22 +30,22 @@ #include <sys/types.h> #include <sys/stat.h> -#include <nm-utils.h> -#include <nm-setting-connection.h> -#include <nm-setting-wired.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-8021x.h> -#include <nm-setting-pppoe.h> -#include <nm-setting-ppp.h> -#include <nm-setting-vpn.h> -#include <nm-setting-gsm.h> -#include <nm-setting-cdma.h> -#include <nm-setting-serial.h> -#include <nm-setting-vlan.h> -#include <nm-setting-dcb.h> +#include "nm-utils.h" +#include "nm-setting-connection.h" +#include "nm-setting-wired.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-8021x.h" +#include "nm-setting-pppoe.h" +#include "nm-setting-ppp.h" +#include "nm-setting-vpn.h" +#include "nm-setting-gsm.h" +#include "nm-setting-cdma.h" +#include "nm-setting-serial.h" +#include "nm-setting-vlan.h" +#include "nm-setting-dcb.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" @@ -54,7 +54,6 @@ #include "reader.h" #include "writer.h" #include "utils.h" -#include "nm-default.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 40270104b6..fda900b20e 100644 --- a/src/settings/plugins/ifcfg-rh/utils.c +++ b/src/settings/plugins/ifcfg-rh/utils.c @@ -18,9 +18,8 @@ * (C) Copyright 2008 - 2012 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "utils.h" #include <stdlib.h> diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index 73d1dc546c..53e2f56b22 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -18,9 +18,8 @@ * Copyright 2009 - 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "writer.h" #include <string.h> diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c index 51ff9da6a9..bf8b9a4295 100644 --- a/src/settings/plugins/ifnet/connection_parser.c +++ b/src/settings/plugins/ifnet/connection_parser.c @@ -19,7 +19,7 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -27,7 +27,6 @@ #include <errno.h> #include "nm-settings-plugin.h" -#include "nm-default.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/ifnet/net_parser.c b/src/settings/plugins/ifnet/net_parser.c index ee66ff53d9..cad34f0688 100644 --- a/src/settings/plugins/ifnet/net_parser.c +++ b/src/settings/plugins/ifnet/net_parser.c @@ -19,15 +19,14 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdio.h> #include <sys/ioctl.h> #include <unistd.h> -#include <nm-settings-plugin.h> -#include "nm-default.h" +#include "nm-settings-plugin.h" #include "plugin.h" #include "nm-platform.h" diff --git a/src/settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/net_utils.c index e61c65210e..1944e47824 100644 --- a/src/settings/plugins/ifnet/net_utils.c +++ b/src/settings/plugins/ifnet/net_utils.c @@ -19,17 +19,17 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <stdio.h> #include <string.h> #include <errno.h> -#include <nm-utils.h> + +#include "nm-utils.h" #include "NetworkManagerUtils.h" -#include <nm-settings-plugin.h> +#include "nm-settings-plugin.h" #include "nm-config.h" -#include "nm-default.h" #include "net_utils.h" #include "wpa_parser.h" #include "net_parser.h" diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nm-ifnet-connection.c index 450fe93179..845155194e 100644 --- a/src/settings/plugins/ifnet/nm-ifnet-connection.c +++ b/src/settings/plugins/ifnet/nm-ifnet-connection.c @@ -19,16 +19,16 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <glib/gstdio.h> -#include <nm-dbus-interface.h> -#include <nm-utils.h> -#include <nm-setting-wireless-security.h> -#include <nm-settings-connection.h> -#include <nm-settings-plugin.h> -#include "nm-default.h" + +#include "nm-dbus-interface.h" +#include "nm-utils.h" +#include "nm-setting-wireless-security.h" +#include "nm-settings-connection.h" +#include "nm-settings-plugin.h" #include "nm-ifnet-connection.h" #include "connection_parser.h" #include "net_parser.h" diff --git a/src/settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/plugin.c index b670cdac72..a0676cf894 100644 --- a/src/settings/plugins/ifnet/plugin.c +++ b/src/settings/plugins/ifnet/plugin.c @@ -20,14 +20,14 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <gmodule.h> -#include <nm-utils.h> -#include <nm-setting-connection.h> +#include "nm-utils.h" +#include "nm-setting-connection.h" #include "nm-default.h" #include "nm-dbus-interface.h" diff --git a/src/settings/plugins/ifnet/tests/test-ifnet.c b/src/settings/plugins/ifnet/tests/test-ifnet.c index 96fb5dd378..c870152b42 100644 --- a/src/settings/plugins/ifnet/tests/test-ifnet.c +++ b/src/settings/plugins/ifnet/tests/test-ifnet.c @@ -20,16 +20,16 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <string.h> #include <arpa/inet.h> #include <stdlib.h> #include <unistd.h> -#include <nm-utils.h> -#include "nm-default.h" +#include "nm-utils.h" + #include "nm-linux-platform.h" #include "net_parser.h" diff --git a/src/settings/plugins/ifnet/wpa_parser.c b/src/settings/plugins/ifnet/wpa_parser.c index 9f228d0b70..501bca7aaa 100644 --- a/src/settings/plugins/ifnet/wpa_parser.c +++ b/src/settings/plugins/ifnet/wpa_parser.c @@ -19,12 +19,12 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> -#include <nm-settings-plugin.h> -#include "nm-default.h" + +#include "nm-settings-plugin.h" #include "wpa_parser.h" #include "net_parser.h" #include "net_utils.h" diff --git a/src/settings/plugins/ifupdown/interface_parser.c b/src/settings/plugins/ifupdown/interface_parser.c index 4606f5ab63..be7d387dc7 100644 --- a/src/settings/plugins/ifupdown/interface_parser.c +++ b/src/settings/plugins/ifupdown/interface_parser.c @@ -20,16 +20,17 @@ * (C) Copyright 2004 Tom Parker */ -#include "config.h" +#include "nm-default.h" #include "interface_parser.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <wordexp.h> #include <libgen.h> + #include "nm-utils.h" -#include "nm-default.h" if_block* first; if_block* last; diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c index 2c8504b00c..19de1db625 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c @@ -21,16 +21,16 @@ * (C) Copyright 2007,2008 Canonical Ltd. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <glib/gstdio.h> -#include <nm-dbus-interface.h> -#include <nm-utils.h> -#include <nm-setting-wireless-security.h> -#include <nm-settings-connection.h> -#include <nm-settings-plugin.h> -#include "nm-default.h" + +#include "nm-dbus-interface.h" +#include "nm-utils.h" +#include "nm-setting-wireless-security.h" +#include "nm-settings-connection.h" +#include "nm-settings-plugin.h" #include "nm-ifupdown-connection.h" #include "parser.h" diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c index 8a3d4551da..bd200cd580 100644 --- a/src/settings/plugins/ifupdown/parser.c +++ b/src/settings/plugins/ifupdown/parser.c @@ -21,7 +21,7 @@ * (C) Copyright 2008 Canonical Ltd. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -31,7 +31,6 @@ #include "nm-core-internal.h" #include "nm-settings-plugin.h" -#include "nm-default.h" #include "parser.h" #include "plugin.h" diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c index fc361de5c1..dbc96eacc2 100644 --- a/src/settings/plugins/ifupdown/plugin.c +++ b/src/settings/plugins/ifupdown/plugin.c @@ -22,14 +22,15 @@ * (C) Copyright 2009 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> - +#include <arpa/inet.h> +#include <gudev/gudev.h> #include <gmodule.h> -#include <nm-setting-connection.h> -#include "nm-default.h" +#include "nm-setting-connection.h" + #include "interface_parser.h" #include "nm-dbus-interface.h" @@ -48,10 +49,6 @@ #include "nm-config.h" -#include <arpa/inet.h> - -#include <gudev/gudev.h> - #define ENI_INTERFACES_FILE "/etc/network/interfaces" #define IFUPDOWN_PLUGIN_NAME "ifupdown" diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c index 54f30d38be..f383821c39 100644 --- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c +++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c @@ -18,11 +18,10 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-core-internal.h" #include "interface_parser.h" #include "parser.h" diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.c b/src/settings/plugins/keyfile/nm-keyfile-connection.c index c217de68ed..97a5ee4c52 100644 --- a/src/settings/plugins/keyfile/nm-keyfile-connection.c +++ b/src/settings/plugins/keyfile/nm-keyfile-connection.c @@ -19,21 +19,20 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <glib/gstdio.h> -#include <nm-dbus-interface.h> -#include <nm-setting-connection.h> -#include <nm-utils.h> -#include "nm-default.h" +#include "nm-dbus-interface.h" +#include "nm-setting-connection.h" +#include "nm-utils.h" + #include "nm-settings-plugin.h" #include "nm-keyfile-connection.h" #include "reader.h" #include "writer.h" #include "utils.h" -#include "nm-logging.h" G_DEFINE_TYPE (NMKeyfileConnection, nm_keyfile_connection, NM_TYPE_SETTINGS_CONNECTION) diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index e352e5235b..29a1141b8e 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -19,7 +19,7 @@ * Copyright (C) 2008 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/stat.h> #include <unistd.h> @@ -29,12 +29,11 @@ #include <gmodule.h> #include <glib/gstdio.h> -#include <nm-connection.h> -#include <nm-setting.h> -#include <nm-setting-connection.h> -#include <nm-utils.h> +#include "nm-connection.h" +#include "nm-setting.h" +#include "nm-setting-connection.h" +#include "nm-utils.h" #include "nm-config.h" -#include "nm-default.h" #include "nm-core-internal.h" #include "plugin.h" diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c index 1c984a16d4..264b26a430 100644 --- a/src/settings/plugins/keyfile/reader.c +++ b/src/settings/plugins/keyfile/reader.c @@ -18,14 +18,13 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/stat.h> #include <string.h> #include "reader.h" -#include "nm-default.h" #include "nm-keyfile-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index d7b0ecce9f..7758724246 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -18,7 +18,7 @@ * Copyright (C) 2008 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdarg.h> @@ -29,7 +29,6 @@ #include <sys/socket.h> #include "nm-core-internal.h" -#include "nm-default.h" #include "reader.h" #include "writer.h" diff --git a/src/settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/utils.c index 48795ffb11..b5c306e4c1 100644 --- a/src/settings/plugins/keyfile/utils.c +++ b/src/settings/plugins/keyfile/utils.c @@ -18,15 +18,15 @@ * (C) Copyright 2010 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> -#include "nm-default.h" + #include "utils.h" -#include <nm-setting-wired.h> -#include <nm-setting-wireless.h> -#include <nm-setting-wireless-security.h> +#include "nm-setting-wired.h" +#include "nm-setting-wireless.h" +#include "nm-setting-wireless-security.h" #include "nm-config.h" #define NM_CONFIG_KEYFILE_PATH_DEFAULT NMCONFDIR "/system-connections" diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c index d03aba8ae6..c8eb880090 100644 --- a/src/settings/plugins/keyfile/writer.c +++ b/src/settings/plugins/keyfile/writer.c @@ -19,7 +19,7 @@ * Copyright (C) 2008 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <sys/stat.h> @@ -27,7 +27,6 @@ #include <errno.h> #include <string.h> -#include "nm-default.h" #include "writer.h" #include "utils.h" #include "nm-keyfile-internal.h" diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c index 190ee0a7f0..091742e586 100644 --- a/src/supplicant-manager/nm-supplicant-config.c +++ b/src/supplicant-manager/nm-supplicant-config.c @@ -19,12 +19,11 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-supplicant-config.h" #include "nm-supplicant-settings-verify.h" #include "nm-setting.h" diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 10081b5976..ce7a2a2c98 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -19,12 +19,11 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <string.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-supplicant-interface.h" #include "nm-supplicant-config.h" diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c index 14254266a3..9614c8ddd5 100644 --- a/src/supplicant-manager/nm-supplicant-manager.c +++ b/src/supplicant-manager/nm-supplicant-manager.c @@ -19,11 +19,10 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-supplicant-manager.h" #include "nm-supplicant-interface.h" #include "nm-supplicant-types.h" diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c index f2d5654053..ec660d189f 100644 --- a/src/supplicant-manager/nm-supplicant-settings-verify.c +++ b/src/supplicant-manager/nm-supplicant-settings-verify.c @@ -18,14 +18,13 @@ * Copyright (C) 2006 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <errno.h> -#include "nm-default.h" #include "nm-supplicant-settings-verify.h" struct Opt { diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c index bd532b2429..0c3e9a47d0 100644 --- a/src/supplicant-manager/tests/test-supplicant-config.c +++ b/src/supplicant-manager/tests/test-supplicant-config.c @@ -18,7 +18,7 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdarg.h> @@ -34,7 +34,6 @@ #include "nm-supplicant-config.h" #include "nm-supplicant-settings-verify.h" -#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/systemd/nm-sd-adapt.c b/src/systemd/nm-sd-adapt.c index 8b29aed51d..e10df9c746 100644 --- a/src/systemd/nm-sd-adapt.c +++ b/src/systemd/nm-sd-adapt.c @@ -16,7 +16,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <glib.h> #include <unistd.h> diff --git a/src/systemd/nm-sd-adapt.h b/src/systemd/nm-sd-adapt.h index 84a497caf3..f48c86f1cc 100644 --- a/src/systemd/nm-sd-adapt.h +++ b/src/systemd/nm-sd-adapt.h @@ -19,15 +19,13 @@ #ifndef NM_SD_ADAPT_H #define NM_SD_ADAPT_H -#include "config.h" +#include "nm-default.h" #include <stdbool.h> #include <syslog.h> #include <sys/resource.h> #include <time.h> -#include "nm-default.h" - #define noreturn G_GNUC_NORETURN #ifndef CLOCK_BOOTTIME diff --git a/src/tests/config/nm-test-device.c b/src/tests/config/nm-test-device.c index 681f496603..04ccaec214 100644 --- a/src/tests/config/nm-test-device.c +++ b/src/tests/config/nm-test-device.c @@ -18,7 +18,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index e8de86c8a8..19306df723 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -18,13 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> - #include "nm-config.h" -#include "nm-default.h" #include "nm-test-device.h" #include "nm-fake-platform.h" #include "nm-bus-manager.h" diff --git a/src/tests/test-dcb.c b/src/tests/test-dcb.c index 35f1ed0fad..e8e1ec860b 100644 --- a/src/tests/test-dcb.c +++ b/src/tests/test-dcb.c @@ -18,11 +18,10 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dcb.h" #include "nm-test-utils.h" diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c index 0796f7caac..43595c8de3 100644 --- a/src/tests/test-general-with-expect.c +++ b/src/tests/test-general-with-expect.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> @@ -27,7 +27,6 @@ #include <sys/types.h> #include <sys/wait.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-multi-index.h" diff --git a/src/tests/test-general.c b/src/tests/test-general.c index ffbeae14e3..b8a51f2aaa 100644 --- a/src/tests/test-general.c +++ b/src/tests/test-general.c @@ -18,12 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-core-internal.h" diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c index 16cd3d1ef1..2b743c8c3c 100644 --- a/src/tests/test-ip4-config.c +++ b/src/tests/test-ip4-config.c @@ -18,12 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> -#include "nm-default.h" #include "nm-ip4-config.h" #include "nm-platform.h" diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c index 2639a1f0d2..5a2bb58905 100644 --- a/src/tests/test-ip6-config.c +++ b/src/tests/test-ip6-config.c @@ -18,12 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> -#include "nm-default.h" #include "nm-ip6-config.h" #include "nm-platform.h" diff --git a/src/tests/test-resolvconf-capture.c b/src/tests/test-resolvconf-capture.c index db7006ba66..31b6e1777f 100644 --- a/src/tests/test-resolvconf-capture.c +++ b/src/tests/test-resolvconf-capture.c @@ -18,12 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" diff --git a/src/tests/test-route-manager.c b/src/tests/test-route-manager.c index 347c122c36..742f4ee5cd 100644 --- a/src/tests/test-route-manager.c +++ b/src/tests/test-route-manager.c @@ -18,12 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <linux/rtnetlink.h> -#include "nm-default.h" #include "test-common.h" #include "nm-platform.h" diff --git a/src/tests/test-utils.c b/src/tests/test-utils.c index 79a7e68030..58eca5f3f5 100644 --- a/src/tests/test-utils.c +++ b/src/tests/test-utils.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> diff --git a/src/tests/test-wired-defname.c b/src/tests/test-wired-defname.c index 989345d805..6edd5ff246 100644 --- a/src/tests/test-wired-defname.c +++ b/src/tests/test-wired-defname.c @@ -18,12 +18,10 @@ * */ -#include "config.h" - - -#include <nm-simple-connection.h> -#include <nm-setting-connection.h> #include "nm-default.h" + +#include "nm-simple-connection.h" +#include "nm-setting-connection.h" #include "nm-device-ethernet-utils.h" #include "nm-test-utils.h" diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 23598afec6..653b997231 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <sys/socket.h> @@ -28,7 +28,6 @@ #include <errno.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-vpn-connection.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 45d22998b9..6dcd546383 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -19,11 +19,10 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-vpn-manager.h" #include "nm-vpn-plugin-info.h" #include "nm-vpn-connection.h" |