diff --git a/src/Makefile.am b/src/Makefile.am
index ce3c222c87..8a04d81152 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -175,11 +175,7 @@ NetworkManager_SOURCES = \
 		nm-dhcp6-config.h \
 		nm-rfkill.h \
 		nm-session-monitor.c \
-		nm-session-monitor.h \
-		nm-agent-manager.c \
-		nm-agent-manager.h \
-		nm-secret-agent.c \
-		nm-secret-agent.h
+		nm-session-monitor.h
 
 nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_access_point --mode=glib-server --output=$@ $<
@@ -223,9 +219,6 @@ nm-device-cdma-glue.h: $(top_srcdir)/introspection/nm-device-cdma.xml
 nm-device-gsm-glue.h: $(top_srcdir)/introspection/nm-device-gsm.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_gsm --mode=glib-server --output=$@ $<
 
-nm-agent-manager-glue.h: $(top_srcdir)/introspection/nm-agent-manager.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_agent_manager --mode=glib-server --output=$@ $<
-
 BUILT_SOURCES = \
 	nm-access-point-glue.h \
 	nm-manager-glue.h \
@@ -240,8 +233,7 @@ BUILT_SOURCES = \
 	nm-ip6-config-glue.h \
 	nm-active-connection-glue.h \
 	nm-dhcp4-config-glue.h \
-	nm-dhcp6-config-glue.h \
-	nm-agent-manager-glue.h
+	nm-dhcp6-config-glue.h
 
 NetworkManager_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am
index ddb2e5a0a7..b6a241310e 100644
--- a/src/settings/Makefile.am
+++ b/src/settings/Makefile.am
@@ -9,7 +9,8 @@ noinst_LTLIBRARIES = libsettings.la
 
 BUILT_SOURCES = \
 	nm-settings-glue.h \
-	nm-settings-connection-glue.h
+	nm-settings-connection-glue.h \
+	nm-agent-manager-glue.h
 
 libsettings_la_SOURCES = \
 	nm-settings.c \
@@ -24,7 +25,11 @@ libsettings_la_SOURCES = \
 	nm-settings-connection.c \
 	nm-settings-connection.h \
 	nm-default-wired-connection.c \
-	nm-default-wired-connection.h
+	nm-default-wired-connection.h \
+	nm-agent-manager.c \
+	nm-agent-manager.h \
+	nm-secret-agent.c \
+	nm-secret-agent.h
 
 libsettings_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
@@ -59,6 +64,9 @@ nm-settings-glue.h: $(top_srcdir)/introspection/nm-settings.xml
 nm-settings-connection-glue.h: $(top_srcdir)/introspection/nm-settings-connection.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_settings_connection --mode=glib-server --output=$@ $<
 
+nm-agent-manager-glue.h: $(top_srcdir)/introspection/nm-agent-manager.xml
+	$(AM_V_GEN) dbus-binding-tool --prefix=nm_agent_manager --mode=glib-server --output=$@ $<
+
 CLEANFILES = \
 	$(BUILT_SOURCES)
 
diff --git a/src/nm-agent-manager.c b/src/settings/nm-agent-manager.c
similarity index 100%
rename from src/nm-agent-manager.c
rename to src/settings/nm-agent-manager.c
diff --git a/src/nm-agent-manager.h b/src/settings/nm-agent-manager.h
similarity index 100%
rename from src/nm-agent-manager.h
rename to src/settings/nm-agent-manager.h
diff --git a/src/nm-secret-agent.c b/src/settings/nm-secret-agent.c
similarity index 100%
rename from src/nm-secret-agent.c
rename to src/settings/nm-secret-agent.c
diff --git a/src/nm-secret-agent.h b/src/settings/nm-secret-agent.h
similarity index 100%
rename from src/nm-secret-agent.h
rename to src/settings/nm-secret-agent.h