diff --git a/include/Makefile.am b/include/Makefile.am
index b5b44d82d..a058bff34 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,6 @@
 EXTRA_DIST = \
      NetworkManager.h \
      NetworkManagerVPN.h \
-     wireless-helper.h \
      nm-dbus-glib-types.h \
      nm-glib-compat.h \
      nm-test-helpers.h \
diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c
index 16e6fad64..4e80806fb 100644
--- a/libnm-glib/libnm-glib-test.c
+++ b/libnm-glib/libnm-glib-test.c
@@ -28,8 +28,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "wireless-helper.h"
-
 #include "nm-client.h"
 #include "nm-device.h"
 #include "nm-device-ethernet.h"
diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c
index 37ad07ab5..13fda9f7b 100644
--- a/libnm-util/nm-setting-wireless.c
+++ b/libnm-util/nm-setting-wireless.c
@@ -28,8 +28,6 @@
 #include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
 
-#include "wireless-helper.h"
-
 #include "NetworkManager.h"
 #include "nm-setting-wireless.h"
 #include "nm-param-spec-specialized.h"
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 9d4418e45..073a66882 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -31,8 +31,6 @@
 #include <errno.h>
 #include <arpa/inet.h>
 
-#include "wireless-helper.h"
-
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
@@ -360,6 +358,8 @@ nm_utils_is_empty_ssid (const guint8 * ssid, int len)
         return TRUE;
 }
 
+#define ESSID_MAX_SIZE 32
+
 /**
  * nm_utils_escape_ssid:
  * @ssid: pointer to a buffer containing the SSID data
@@ -376,7 +376,7 @@ nm_utils_is_empty_ssid (const guint8 * ssid, int len)
 const char *
 nm_utils_escape_ssid (const guint8 * ssid, guint32 len)
 {
-	static char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
+	static char escaped[ESSID_MAX_SIZE * 2 + 1];
 	const guint8 *s = ssid;
 	char *d = escaped;
 
@@ -385,7 +385,7 @@ nm_utils_escape_ssid (const guint8 * ssid, guint32 len)
 		return escaped;
 	}
 
-	len = MIN (len, (guint32) IW_ESSID_MAX_SIZE);
+	len = MIN (len, (guint32) ESSID_MAX_SIZE);
 	while (len--) {
 		if (*s == '\0') {
 			*d++ = '\\';
diff --git a/src/Makefile.am b/src/Makefile.am
index 7f7e36c7e..aa14e8c5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -118,6 +118,7 @@ NetworkManager_SOURCES = \
 		nm-device-private.h \
 		nm-device-ethernet.c \
 		nm-device-ethernet.h \
+		wireless-helper.h \
 		wifi-utils.c \
 		wifi-utils.h \
 		wifi-utils-private.h \
diff --git a/include/wireless-helper.h b/src/wireless-helper.h
similarity index 100%
rename from include/wireless-helper.h
rename to src/wireless-helper.h