diff --git a/clients/cli/common.c b/clients/cli/common.c
index a85d47687b..6209b15d8f 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -36,8 +36,6 @@
 
 #include "utils.h"
 
-extern GMainLoop *loop;
-
 const NmcMetaGenericInfo *const nmc_fields_ip4_config[] = {
 	NMC_META_GENERIC ("GROUP"),     /* 0 */
 	NMC_META_GENERIC ("ADDRESS"),   /* 1 */
@@ -1170,8 +1168,6 @@ nmc_parse_lldp_capabilities (guint value)
 	return g_string_free (str, FALSE);
 }
 
-extern GMainLoop *loop;
-
 static void
 command_done (GObject *object, GAsyncResult *res, gpointer user_data)
 {
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 72eb0f8fd3..c0661c9c41 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -227,9 +227,6 @@ const NmcMetaGenericInfo *const nmc_fields_con_active_details_groups[] = {
 #define CON_SHOW_DETAIL_GROUP_PROFILE "profile"
 #define CON_SHOW_DETAIL_GROUP_ACTIVE  "active"
 
-/* glib main loop variable - defined in nmcli.c */
-extern GMainLoop *loop;
-
 static guint progress_id = 0;  /* ID of event source for displaying progress */
 
 /* for readline TAB completion in editor */
@@ -571,7 +568,6 @@ nmc_setting_new_for_name (const char *name)
 	return setting;
 }
 
-/* quit main loop */
 static void
 quit (void)
 {
@@ -581,7 +577,7 @@ quit (void)
 		nmc_terminal_erase_line ();
 	}
 
-	g_main_loop_quit (loop);  /* quit main loop */
+	g_main_loop_quit (loop);
 }
 
 static char *
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index aa0ff083f4..8d8457520a 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -245,9 +245,6 @@ const NmcMetaGenericInfo *const nmc_fields_dev_lldp_list[] = {
 #define NMC_FIELDS_DEV_LLDP_LIST_COMMON  "DEVICE,CHASSIS-ID,PORT-ID,PORT-DESCRIPTION,SYSTEM-NAME,SYSTEM-DESCRIPTION," \
                                          "SYSTEM-CAPABILITIES"
 
-/* glib main loop variable - defined in nmcli.c */
-extern GMainLoop *loop;
-
 static guint progress_id = 0;  /* ID of event source for displaying progress */
 
 static void
@@ -450,7 +447,6 @@ usage_device_lldp (void)
 	              "used to list neighbors for a particular interface.\n\n"));
 }
 
-/* quit main loop */
 static void
 quit (void)
 {
@@ -459,7 +455,7 @@ quit (void)
 		nmc_terminal_erase_line ();
 	}
 
-	g_main_loop_quit (loop);  /* quit main loop */
+	g_main_loop_quit (loop);
 }
 
 static int
diff --git a/clients/cli/general.c b/clients/cli/general.c
index fc819f79a0..1a32086e08 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -364,10 +364,6 @@ static const NmcMetaGenericInfo *const metagen_general_logging[_NMC_GENERIC_INFO
 
 /*****************************************************************************/
 
-/* glib main loop variable - defined in nmcli.c */
-extern GMainLoop *loop;
-
-
 static void
 usage_general (void)
 {
@@ -507,11 +503,10 @@ usage_monitor (void)
 	              "Prints a line whenever a change occurs in NetworkManager\n\n"));
 }
 
-/* quit main loop */
 static void
 quit (void)
 {
-	g_main_loop_quit (loop);  /* quit main loop */
+	g_main_loop_quit (loop);
 }
 
 static gboolean
diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h
index 3e73e5105c..7203b21c8e 100644
--- a/clients/cli/nmcli.h
+++ b/clients/cli/nmcli.h
@@ -155,6 +155,8 @@ extern NmCli nm_cli;
 #define NMCLI_ERROR (nmcli_error_quark ())
 GQuark nmcli_error_quark (void);
 
+extern GMainLoop *loop;
+
 gboolean nmc_seen_sigint (void);
 void     nmc_clear_sigint (void);
 void     nmc_set_sigquit_internal (void);