diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index b55170b831..26c30b8a87 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -37,7 +37,6 @@
 #include "nm-default.h"
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
-#include "nm-dbus-interface.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-adsl.h"
 #include "nm-setting-bluetooth.h"
diff --git a/libnm-core/nm-core-types.h b/libnm-core/nm-core-types.h
index 524d6396c5..19388c5bb3 100644
--- a/libnm-core/nm-core-types.h
+++ b/libnm-core/nm-core-types.h
@@ -23,6 +23,7 @@
 
 #include <glib-object.h>
 
+#include <nm-version.h>
 #include <nm-dbus-interface.h>
 #include <nm-core-enum-types.h>
 
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index e46bef51f9..34dbe6335f 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -26,8 +26,6 @@
 #ifndef __NM_DBUS_INTERFACE_H__
 #define __NM_DBUS_INTERFACE_H__
 
-#include <nm-version.h>
-
 /*
  * dbus services details
  */
diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c
index 28e5ca2094..4c950f698d 100644
--- a/libnm-core/nm-errors.c
+++ b/libnm-core/nm-errors.c
@@ -24,7 +24,6 @@
 
 #include "nm-default.h"
 #include "nm-errors.h"
-#include "nm-dbus-interface.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-core-internal.h"
 
diff --git a/libnm-core/nm-setting-olpc-mesh.c b/libnm-core/nm-setting-olpc-mesh.c
index 56010de1a8..e04e0a3e27 100644
--- a/libnm-core/nm-setting-olpc-mesh.c
+++ b/libnm-core/nm-setting-olpc-mesh.c
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include "nm-setting-olpc-mesh.h"
-#include "nm-dbus-interface.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
index 6851bf509b..b6be7d0242 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -26,7 +26,6 @@
 #include <net/ethernet.h>
 
 #include "nm-setting-wireless.h"
-#include "nm-dbus-interface.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h
index 46ae6e6dba..9fdf6c1975 100644
--- a/libnm-core/nm-setting-wireless.h
+++ b/libnm-core/nm-setting-wireless.h
@@ -29,7 +29,6 @@
 
 #include <nm-setting.h>
 #include <nm-setting-wireless-security.h>
-#include <nm-dbus-interface.h>
 
 G_BEGIN_DECLS
 
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
index 5f9ec10398..4be58e09a1 100644
--- a/libnm-core/nm-utils.h
+++ b/libnm-core/nm-utils.h
@@ -33,7 +33,6 @@
 #include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
 
-#include "nm-dbus-interface.h"
 #include "nm-core-enum-types.h"
 #include "nm-setting-wireless-security.h"