diff --git a/src/Makefile.am b/src/Makefile.am
index f5cf129897..039e2c0441 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,8 +106,8 @@ noinst_LTLIBRARIES = \
 libsystemd_nm_la_SOURCES = \
 	systemd/nm-sd.c \
 	systemd/nm-sd.h \
-	systemd/nm-sd-adapt.c \
-	systemd/nm-sd-adapt.h \
+	systemd/sd-adapt/nm-sd-adapt.c \
+	systemd/sd-adapt/nm-sd-adapt.h \
 	systemd/sd-adapt/build.h \
 	systemd/sd-adapt/cgroup-util.h \
 	systemd/sd-adapt/condition.h \
diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c
index d975a63500..a28cb8a5a7 100644
--- a/src/dhcp-manager/nm-dhcp-systemd.c
+++ b/src/dhcp-manager/nm-dhcp-systemd.c
@@ -34,13 +34,11 @@
 #include "NetworkManagerUtils.h"
 #include "nm-platform.h"
 #include "nm-dhcp-client-logging.h"
+#include "nm-sd.h"
 
 #include "sd-dhcp-client.h"
 #include "sd-dhcp6-client.h"
 
-#include "nm-sd-adapt.h"
-#include "dhcp-lease-internal.h"
-
 G_DEFINE_TYPE (NMDhcpSystemd, nm_dhcp_systemd, NM_TYPE_DHCP_CLIENT)
 
 #define NM_DHCP_SYSTEMD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_SYSTEMD, NMDhcpSystemdPrivate))
diff --git a/src/systemd/nm-sd.c b/src/systemd/nm-sd.c
index 4d596020c9..43ae0a8b58 100644
--- a/src/systemd/nm-sd.c
+++ b/src/systemd/nm-sd.c
@@ -134,3 +134,10 @@ nm_sd_event_attach_default (void)
 
 /*****************************************************************************/
 
+/* ensure that defines in nm-sd.h correspond to the internal defines. */
+
+#include "nm-sd-adapt.h"
+#include "dhcp-lease-internal.h"
+
+/*****************************************************************************/
+
diff --git a/src/systemd/nm-sd.h b/src/systemd/nm-sd.h
index 888d44ab0c..f07a708269 100644
--- a/src/systemd/nm-sd.h
+++ b/src/systemd/nm-sd.h
@@ -21,5 +21,16 @@
 
 guint nm_sd_event_attach_default (void);
 
+/*****************************************************************************
+ * expose internal systemd API
+ *
+ * FIXME: don't use any internal systemd API.
+ *****************************************************************************/
+
+struct sd_dhcp_lease;
+
+int dhcp_lease_save(struct sd_dhcp_lease *lease, const char *lease_file);
+int dhcp_lease_load(struct sd_dhcp_lease **ret, const char *lease_file);
+
 #endif /* __NM_SD_H__ */
 
diff --git a/src/systemd/nm-sd-adapt.c b/src/systemd/sd-adapt/nm-sd-adapt.c
similarity index 100%
rename from src/systemd/nm-sd-adapt.c
rename to src/systemd/sd-adapt/nm-sd-adapt.c
diff --git a/src/systemd/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h
similarity index 100%
rename from src/systemd/nm-sd-adapt.h
rename to src/systemd/sd-adapt/nm-sd-adapt.h