[network-manager-libreswan/th/vpn-plugin-debug-bgo766872: 3/20] shared: cleanup includes in "utils.c"

[Thomas Haller <thaller src gnome org>]

commit b4350c5476b3f7a680502faa963f68df04c9f4e6
Author: Thomas Haller <thaller redhat com>
Date:   Thu May 26 11:05:13 2016 +0200

    shared: cleanup includes in "utils.c"

 shared/nm-default.h |    1 +
 shared/utils.c      |   16 ++++------------
 2 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 4fa954a..299a51a 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -74,6 +74,7 @@
 #include <nm-utils.h>
 #include <nm-vpn-plugin-ui-interface.h>
 
+#define nm_simple_connection_new                    nm_connection_new
 #define NMV_EDITOR_PLUGIN_ERROR                     NM_SETTING_VPN_ERROR
 #define NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY    NM_SETTING_VPN_ERROR_INVALID_PROPERTY
 
diff --git a/shared/utils.c b/shared/utils.c
index ba2124c..28dff83 100644
--- a/shared/utils.c
+++ b/shared/utils.c
@@ -21,21 +21,13 @@
  * Copyright (C) 2010 - 2015 Red Hat, Inc.
  */
 
-#include <unistd.h>
-#include <string.h>
-#include <glib.h>
-
-#ifdef NM_VPN_OLD
-#define NM_VPN_LIBNM_COMPAT
-#include <nm-connection.h>
-#define nm_simple_connection_new nm_connection_new
-#else
-#include <NetworkManager.h>
-#endif
+#include "nm-default.h"
 
-#include "nm-service-defines.h"
 #include "utils.h"
 
+#include <unistd.h>
+#include <string.h>
+
 gboolean debug = FALSE;
 
 NMConnection *