diff --git a/src/Makefile.am b/src/Makefile.am
index f46fbab34e..81a8a66a55 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -187,7 +187,9 @@ NetworkManager_SOURCES = \
 		nm-rfkill.h \
 		nm-session-monitor.h \
 		nm-session-utils.c \
-		nm-session-utils.h
+		nm-session-utils.h \
+		nm-connection-provider.h \
+		nm-connection-provider.c
 
 if WITH_CONCHECK
 NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h
diff --git a/src/settings/nm-connection-provider.c b/src/nm-connection-provider.c
similarity index 100%
rename from src/settings/nm-connection-provider.c
rename to src/nm-connection-provider.c
diff --git a/src/settings/nm-connection-provider.h b/src/nm-connection-provider.h
similarity index 100%
rename from src/settings/nm-connection-provider.h
rename to src/nm-connection-provider.h
diff --git a/src/nm-device.h b/src/nm-device.h
index f4495b9784..ec4282d0e8 100644
--- a/src/nm-device.h
+++ b/src/nm-device.h
@@ -34,7 +34,7 @@
 #include "nm-dhcp6-config.h"
 #include "nm-connection.h"
 #include "nm-rfkill.h"
-#include "settings/nm-connection-provider.h"
+#include "nm-connection-provider.h"
 
 /* Properties */
 #define NM_DEVICE_UDI              "udi"
diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am
index e6d66db5c0..8024d54142 100644
--- a/src/settings/Makefile.am
+++ b/src/settings/Makefile.am
@@ -48,9 +48,7 @@ libsettings_la_SOURCES = \
 	nm-secret-agent.c \
 	nm-secret-agent.h \
 	nm-settings-utils.h \
-	nm-settings-utils.c \
-	nm-connection-provider.h \
-	nm-connection-provider.c
+	nm-settings-utils.c
 
 libsettings_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \