From c5ac69174464521e8d20d8e5e1e8ec1cefe41773 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 30 Apr 2016 03:26:06 +0200
Subject: [PATCH] build: cleanup includes of <gmodule.h>

<gmodule.h> is implicitly included by <gio/gio.h> which is available
everywhere. For that reason, we would not have to include this header
at all. However, it is recommended to explicitly include <gmodule.h>
where needed.

So, include it where needed -- if <gio/gio.h> wouldn't be there --
and drop it from where it is not needed.
---
 clients/common/nm-vpn-helpers.c       | 1 -
 libnm-core/nm-vpn-editor-plugin.c     | 1 +
 src/main-utils.c                      | 1 -
 src/main.c                            | 1 -
 src/settings/plugins/keyfile/plugin.c | 1 -
 5 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index 1d2a6b0f81..fd04f155af 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -28,7 +28,6 @@
 #include "nm-vpn-helpers.h"
 
 #include <string.h>
-#include <gmodule.h>
 
 #include "nm-utils.h"
 
diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c
index a92bbea986..955ff560ba 100644
--- a/libnm-core/nm-vpn-editor-plugin.c
+++ b/libnm-core/nm-vpn-editor-plugin.c
@@ -25,6 +25,7 @@
 #include "nm-vpn-editor-plugin.h"
 
 #include <dlfcn.h>
+#include <gmodule.h>
 
 #include "nm-core-internal.h"
 
diff --git a/src/main-utils.c b/src/main-utils.c
index 8624280221..b94e8b2199 100644
--- a/src/main-utils.c
+++ b/src/main-utils.c
@@ -31,7 +31,6 @@
 
 #include <glib/gstdio.h>
 #include <glib-unix.h>
-#include <gmodule.h>
 
 #include "main-utils.h"
 #include "NetworkManagerUtils.h"
diff --git a/src/main.c b/src/main.c
index b60ec84eb3..c4782b609e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,7 +31,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <gmodule.h>
 #include <string.h>
 #include <sys/resource.h>
 
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index 6003c7457f..c5598fc5b4 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 #include <string.h>
 
-#include <gmodule.h>
 #include <glib/gstdio.h>
 
 #include "nm-connection.h"