diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 99d64a33b..8ae1b7f7c 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -29,7 +29,7 @@
 #include "common.h"
 #include "settings.h"
 #include "nm-glib-compat.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 /* Forward declarations */
 static char *wep_key_type_to_string (NMWepKeyType type);
diff --git a/include/Makefile.am b/include/Makefile.am
index 6e84a5b63..ff7eac8c2 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -4,6 +4,6 @@ EXTRA_DIST = \
      nm-glib-compat.h \
      nm-gvaluearray-compat.h \
      nm-test-utils.h \
-     nm-utils-internal.h
+     nm-macros-internal.h
 
 CLEANFILES=nm-version.h
diff --git a/include/nm-utils-internal.h b/include/nm-macros-internal.h
similarity index 98%
rename from include/nm-utils-internal.h
rename to include/nm-macros-internal.h
index 82c89dcc6..d510445f3 100644
--- a/include/nm-utils-internal.h
+++ b/include/nm-macros-internal.h
@@ -19,8 +19,8 @@
  * (C) Copyright 2014 Red Hat, Inc.
  */
 
-#ifndef __NM_UTILS_INTERNAL_H__
-#define __NM_UTILS_INTERNAL_H__
+#ifndef __NM_MACROS_INTERNAL_H__
+#define __NM_MACROS_INTERNAL_H__
 
 
 #include <glib.h>
@@ -191,4 +191,4 @@ nm_clear_g_source (guint *id)
 
 /*****************************************************************************/
 
-#endif
+#endif /* __NM_MACROS_INTERNAL_H__ */
diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h
index 3b5b94628..d66636609 100644
--- a/include/nm-test-utils.h
+++ b/include/nm-test-utils.h
@@ -92,7 +92,7 @@
 #include <errno.h>
 
 #include "nm-utils.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "nm-glib-compat.h"
 #include "gsystem-local-alloc.h"
 
diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c
index 4887e5248..7e2a8c123 100644
--- a/libnm-core/nm-keyfile-reader.c
+++ b/libnm-core/nm-keyfile-reader.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n-lib.h>
 
 #include "nm-core-internal.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "gsystem-local-alloc.h"
 #include "nm-glib-compat.h"
 #include "nm-keyfile-internal.h"
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index f355c18e7..8024624a2 100644
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -31,7 +31,7 @@
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "gsystem-local-alloc.h"
 
 /**
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 12cdffb18..bca343b9f 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -37,7 +37,7 @@
 #include "nm-setting-private.h"
 #include "crypto.h"
 #include "gsystem-local-alloc.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 #include "nm-setting-bond.h"
 #include "nm-setting-bridge.h"
diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c
index 0f0548ad8..28d659f98 100644
--- a/libnm-core/tests/test-keyfile.c
+++ b/libnm-core/tests/test-keyfile.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "nm-keyfile-utils.h"
 #include "nm-keyfile-internal.h"
 
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 1dc768c21..678d70ab7 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -33,7 +33,7 @@
 #include "crypto.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 /**
  * SECTION:nm-setting-8021x
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 022fa70f0..d0c2ca31f 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -37,7 +37,7 @@
 #include "nm-dbus-glib-types.h"
 #include "nm-setting-private.h"
 #include "crypto.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 /* Embed the commit id in the build binary */
 static const char *const __nm_git_sha = STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : "";
diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
index 213d33a6a..cec6d1350 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
@@ -32,7 +32,7 @@
 #include "nm-platform.h"
 #include "NetworkManagerUtils.h"
 #include "gsystem-local-alloc.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 #define CLIENTID_TAG            "send dhcp-client-identifier"
 
diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c
index ffbc8360c..df5eed341 100644
--- a/src/dhcp-manager/tests/test-dhcp-dhclient.c
+++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c
@@ -32,7 +32,7 @@
 #include "nm-utils.h"
 #include "nm-ip4-config.h"
 #include "nm-platform.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "nm-logging.h"
 
 #include "nm-test-utils.h"
diff --git a/src/nm-logging.h b/src/nm-logging.h
index be453a20b..d02e16528 100644
--- a/src/nm-logging.h
+++ b/src/nm-logging.h
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 /* Log domains */
 typedef enum  { /*< skip >*/
diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c
index c57f2cfed..87f4aba3e 100644
--- a/src/settings/plugins/ifcfg-rh/utils.c
+++ b/src/settings/plugins/ifcfg-rh/utils.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "nm-core-internal.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "NetworkManagerUtils.h"
 
 #include "utils.h"