diff --git a/src/main-utils.c b/src/main-utils.c
index 164dc84a9..1c479d8a7 100644
--- a/src/main-utils.c
+++ b/src/main-utils.c
@@ -172,8 +172,8 @@ done:
 
 gboolean
 nm_main_utils_early_setup (const char *progname,
-                           char **argv[],
                            int *argc,
+                           char **argv[],
                            GOptionEntry *options,
                            void (*option_context_hook) (gpointer user_data, GOptionContext *opt_ctx),
                            gpointer option_context_hook_data,
diff --git a/src/main-utils.h b/src/main-utils.h
index 9b29866be..88d217a55 100644
--- a/src/main-utils.h
+++ b/src/main-utils.h
@@ -30,8 +30,8 @@ gboolean nm_main_utils_write_pidfile (const char *pidfile);
 gboolean nm_main_utils_check_pidfile (const char *pidfile, const char *name);
 
 gboolean nm_main_utils_early_setup (const char *progname,
-                                    char **argv[],
                                     int *argc,
+                                    char **argv[],
                                     GOptionEntry *options,
                                     void (*option_context_hook) (gpointer user_data, GOptionContext *opt_ctx),
                                     gpointer option_context_hook_data,
diff --git a/src/main.c b/src/main.c
index 3df3e11eb..d76bbffa3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -242,8 +242,8 @@ main (int argc, char *argv[])
 
 	config_cli = nm_config_cmd_line_options_new ();
 	if (!nm_main_utils_early_setup ("NetworkManager",
-	                                &argv,
 	                                &argc,
+	                                &argv,
 	                                options,
 	                                (void (*)(gpointer, GOptionContext *)) nm_config_cmd_line_options_add_to_entries,
 	                                config_cli,
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index 49eda8771..09054c023 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -311,8 +311,8 @@ main (int argc, char *argv[])
 	setpgid (getpid (), getpid ());
 
 	if (!nm_main_utils_early_setup ("nm-iface-helper",
-	                                &argv,
 	                                &argc,
+	                                &argv,
 	                                options,
 	                                NULL,
 	                                NULL,