wip

49 files changed, 394 insertions, 349 deletions

diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile
index 9679410b7b..98e33243b7 100644
--- a/src/grp-machine/Makefile
+++ b/src/grp-machine/Makefile
@@ -24,6 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 nested.subdirs += grp-import
+nested.subdirs += libmachine-core
 nested.subdirs += machinectl
 nested.subdirs += nss-mymachines
 nested.subdirs += systemd-machined
diff --git a/src/grp-machine/grp-import/libimport/Makefile b/src/grp-machine/grp-import/libimport/Makefile
index 5b15c57715..3e8b6b1401 100644
--- a/src/grp-machine/grp-import/libimport/Makefile
+++ b/src/grp-machine/grp-import/libimport/Makefile
@@ -30,7 +30,7 @@ libimport_la_SOURCES = \
         import-common.c \
 	import-compress.c
 
-libimport_la_LIBADD += libbasic.la
+libimport_la_LIBADD += libsystemd-basic.la
 
 manual_tests += \
 	test-qcow2
diff --git a/src/grp-machine/grp-import/libimport/import-common.c b/src/grp-machine/grp-import/libimport/import-common.c
index 9061cd4da1..b0a34d5745 100644
--- a/src/grp-machine/grp-import/libimport/import-common.c
+++ b/src/grp-machine/grp-import/libimport/import-common.c
@@ -22,11 +22,11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/btrfs-util.h"
-#include "basic/capability-util.h"
-#include "basic/fd-util.h"
-#include "basic/signal-util.h"
-#include "basic/util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/util.h"
 
 #include "import-common.h"
 
diff --git a/src/grp-machine/grp-import/libimport/import-compress.c b/src/grp-machine/grp-import/libimport/import-compress.c
index 4f1a9891e8..2e116df26c 100644
--- a/src/grp-machine/grp-import/libimport/import-compress.c
+++ b/src/grp-machine/grp-import/libimport/import-compress.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-table.h"
-#include "basic/util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/util.h"
 
 #include "import-compress.h"
 
diff --git a/src/grp-machine/grp-import/libimport/import-compress.h b/src/grp-machine/grp-import/libimport/import-compress.h
index 130afb4cd0..025dd030be 100644
--- a/src/grp-machine/grp-import/libimport/import-compress.h
+++ b/src/grp-machine/grp-import/libimport/import-compress.h
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <zlib.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef enum ImportCompressType {
         IMPORT_COMPRESS_UNKNOWN,
diff --git a/src/grp-machine/grp-import/libimport/qcow2-util.c b/src/grp-machine/grp-import/libimport/qcow2-util.c
index bc50b7d0b3..4c81fbebc7 100644
--- a/src/grp-machine/grp-import/libimport/qcow2-util.c
+++ b/src/grp-machine/grp-import/libimport/qcow2-util.c
@@ -19,10 +19,10 @@
 
 #include <zlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/sparse-endian.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/util.h"
 
 #include "qcow2-util.h"
 
diff --git a/src/grp-machine/grp-import/libimport/test-qcow2.c b/src/grp-machine/grp-import/libimport/test-qcow2.c
index 15d7c29aef..7c973970ba 100644
--- a/src/grp-machine/grp-import/libimport/test-qcow2.c
+++ b/src/grp-machine/grp-import/libimport/test-qcow2.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 #include "qcow2-util.h"
 
diff --git a/src/grp-machine/grp-import/systemd-export/export-raw.c b/src/grp-machine/grp-import/systemd-export/export-raw.c
index c17fc952d3..bce4cdf3d4 100644
--- a/src/grp-machine/grp-import/systemd-export/export-raw.c
+++ b/src/grp-machine/grp-import/systemd-export/export-raw.c
@@ -27,15 +27,15 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/ratelimit.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "import-common.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "export-raw.h"
 
diff --git a/src/grp-machine/grp-import/systemd-export/export-raw.h b/src/grp-machine/grp-import/systemd-export/export-raw.h
index 00f6931d7b..89aef76eed 100644
--- a/src/grp-machine/grp-import/systemd-export/export-raw.h
+++ b/src/grp-machine/grp-import/systemd-export/export-raw.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
 #include "import-compress.h"
+#include "systemd-basic/macro.h"
 
 typedef struct RawExport RawExport;
-
 typedef void (*RawExportFinished)(RawExport *export, int error, void *userdata);
 
 int raw_export_new(RawExport **export, sd_event *event, RawExportFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-export/export-tar.c b/src/grp-machine/grp-import/systemd-export/export-tar.c
index e2b3c5f2e9..701dfaf61d 100644
--- a/src/grp-machine/grp-import/systemd-export/export-tar.c
+++ b/src/grp-machine/grp-import/systemd-export/export-tar.c
@@ -19,15 +19,15 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/process-util.h"
-#include "basic/ratelimit.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "import-common.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "export-tar.h"
 
diff --git a/src/grp-machine/grp-import/systemd-export/export-tar.h b/src/grp-machine/grp-import/systemd-export/export-tar.h
index 9efde8931d..2c50c1e5bf 100644
--- a/src/grp-machine/grp-import/systemd-export/export-tar.h
+++ b/src/grp-machine/grp-import/systemd-export/export-tar.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
 #include "import-compress.h"
+#include "systemd-basic/macro.h"
 
 typedef struct TarExport TarExport;
-
 typedef void (*TarExportFinished)(TarExport *export, int error, void *userdata);
 
 int tar_export_new(TarExport **export, sd_event *event, TarExportFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-export/export.c b/src/grp-machine/grp-import/systemd-export/export.c
index 5db164c7d1..a07273da7c 100644
--- a/src/grp-machine/grp-import/systemd-export/export.c
+++ b/src/grp-machine/grp-import/systemd-export/export.c
@@ -21,15 +21,15 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/verbs.h"
-#include "shared/import-util.h"
-#include "shared/machine-image.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-shared/import-util.h"
+#include "systemd-shared/machine-image.h"
 
 #include "export-raw.h"
 #include "export-tar.h"
diff --git a/src/grp-machine/grp-import/systemd-import/Makefile b/src/grp-machine/grp-import/systemd-import/Makefile
index fe3105914c..51510f4470 100644
--- a/src/grp-machine/grp-import/systemd-import/Makefile
+++ b/src/grp-machine/grp-import/systemd-import/Makefile
@@ -38,6 +38,7 @@ systemd_import_CFLAGS = \
 
 systemd_import_LDADD = \
 	libsystemd-shared.la \
+	libimport.la \
 	$(XZ_LIBS) \
 	$(ZLIB_LIBS) \
 	$(BZIP2_LIBS)
diff --git a/src/grp-machine/grp-import/systemd-import/import-raw.c b/src/grp-machine/grp-import/systemd-import/import-raw.c
index 55a6d044ab..7b7226b843 100644
--- a/src/grp-machine/grp-import/systemd-import/import-raw.c
+++ b/src/grp-machine/grp-import/systemd-import/import-raw.c
@@ -22,25 +22,25 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/chattr-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/ratelimit.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "import-common.h"
 #include "import-compress.h"
 #include "qcow2-util.h"
-#include "shared/machine-pool.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/chattr-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/machine-pool.h"
 
 #include "import-raw.h"
 
diff --git a/src/grp-machine/grp-import/systemd-import/import-raw.h b/src/grp-machine/grp-import/systemd-import/import-raw.h
index 61ec8cc91e..64c532242d 100644
--- a/src/grp-machine/grp-import/systemd-import/import-raw.h
+++ b/src/grp-machine/grp-import/systemd-import/import-raw.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
-#include "shared/import-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-shared/import-util.h"
 
 typedef struct RawImport RawImport;
-
 typedef void (*RawImportFinished)(RawImport *import, int error, void *userdata);
 
 int raw_import_new(RawImport **import, sd_event *event, const char *image_root, RawImportFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-import/import-tar.c b/src/grp-machine/grp-import/systemd-import/import-tar.c
index 0d61b5f01d..592377a72a 100644
--- a/src/grp-machine/grp-import/systemd-import/import-tar.c
+++ b/src/grp-machine/grp-import/systemd-import/import-tar.c
@@ -22,25 +22,25 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/ratelimit.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "import-common.h"
 #include "import-compress.h"
 #include "qcow2-util.h"
-#include "shared/machine-pool.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/machine-pool.h"
 
 #include "import-tar.h"
 
diff --git a/src/grp-machine/grp-import/systemd-import/import-tar.h b/src/grp-machine/grp-import/systemd-import/import-tar.h
index 35a08fcfc5..01c3f2d542 100644
--- a/src/grp-machine/grp-import/systemd-import/import-tar.h
+++ b/src/grp-machine/grp-import/systemd-import/import-tar.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
-#include "shared/import-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-shared/import-util.h"
 
 typedef struct TarImport TarImport;
-
 typedef void (*TarImportFinished)(TarImport *import, int error, void *userdata);
 
 int tar_import_new(TarImport **import, sd_event *event, const char *image_root, TarImportFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-import/import.c b/src/grp-machine/grp-import/systemd-import/import.c
index 38fe7f8110..d6f772a159 100644
--- a/src/grp-machine/grp-import/systemd-import/import.c
+++ b/src/grp-machine/grp-import/systemd-import/import.c
@@ -21,15 +21,15 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/verbs.h"
-#include "shared/import-util.h"
-#include "shared/machine-image.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-shared/import-util.h"
+#include "systemd-shared/machine-image.h"
 
 #include "import-raw.h"
 #include "import-tar.h"
diff --git a/src/grp-machine/grp-import/systemd-importd/Makefile b/src/grp-machine/grp-import/systemd-importd/Makefile
index 19705a925e..58b760ea86 100644
--- a/src/grp-machine/grp-import/systemd-importd/Makefile
+++ b/src/grp-machine/grp-import/systemd-importd/Makefile
@@ -33,6 +33,7 @@ systemd_importd_CFLAGS = \
 	-D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
 
 systemd_importd_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 dist_rootlibexec_DATA += \
diff --git a/src/grp-machine/grp-import/systemd-importd/importd.c b/src/grp-machine/grp-import/systemd-importd/importd.c
index f032f06fcf..ecf130cdd1 100644
--- a/src/grp-machine/grp-import/systemd-importd/importd.c
+++ b/src/grp-machine/grp-import/systemd-importd/importd.c
@@ -21,27 +21,27 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/hostname-util.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-table.h"
-#include "basic/strv.h"
-#include "basic/syslog-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "basic/web-util.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
-#include "shared/import-util.h"
-#include "shared/machine-pool.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/web-util.h"
+#include "systemd-shared/import-util.h"
+#include "systemd-shared/machine-pool.h"
 
 typedef struct Transfer Transfer;
 typedef struct Manager Manager;
diff --git a/src/grp-machine/grp-import/systemd-pull/curl-util.c b/src/grp-machine/grp-import/systemd-pull/curl-util.c
index 9e0d56e5c3..52d0894018 100644
--- a/src/grp-machine/grp-import/systemd-pull/curl-util.c
+++ b/src/grp-machine/grp-import/systemd-pull/curl-util.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "curl-util.h"
 
diff --git a/src/grp-machine/grp-import/systemd-pull/curl-util.h b/src/grp-machine/grp-import/systemd-pull/curl-util.h
index 296b35d09c..1619aeb18c 100644
--- a/src/grp-machine/grp-import/systemd-pull/curl-util.h
+++ b/src/grp-machine/grp-import/systemd-pull/curl-util.h
@@ -24,7 +24,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
+#include "systemd-basic/hashmap.h"
 
 typedef struct CurlGlue CurlGlue;
 
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-common.c b/src/grp-machine/grp-import/systemd-pull/pull-common.c
index bd1623e003..9830d8a10f 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-common.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-common.c
@@ -19,23 +19,23 @@
 
 #include <sys/prctl.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/capability-util.h"
-#include "basic/copy.h"
-#include "basic/dirent-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rm-rf.h"
-#include "basic/signal-util.h"
-#include "basic/siphash24.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "basic/web-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/web-util.h"
 
 #include "pull-common.h"
 #include "pull-job.h"
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-common.h b/src/grp-machine/grp-import/systemd-pull/pull-common.h
index 96198a695a..1eb8f27fe8 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-common.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-common.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "shared/import-util.h"
+#include "systemd-shared/import-util.h"
 
 #include "pull-job.h"
 
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-job.c b/src/grp-machine/grp-import/systemd-pull/pull-job.c
index 3735304e6d..e51ac6546e 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-job.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-job.c
@@ -19,15 +19,15 @@
 
 #include <sys/xattr.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/io-util.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/xattr-util.h"
-#include "shared/machine-pool.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/xattr-util.h"
+#include "systemd-shared/machine-pool.h"
 
 #include "pull-job.h"
 
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-job.h b/src/grp-machine/grp-import/systemd-pull/pull-job.h
index 296e32bd09..8a99883794 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-job.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-job.h
@@ -21,8 +21,8 @@
 
 #include <gcrypt.h>
 
-#include "basic/macro.h"
 #include "import-compress.h"
+#include "systemd-basic/macro.h"
 
 #include "curl-util.h"
 
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-raw.c b/src/grp-machine/grp-import/systemd-pull/pull-raw.c
index 9602915a1f..0ed1a83fe4 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-raw.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.c
@@ -24,26 +24,26 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/chattr-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
-#include "basic/web-util.h"
 #include "import-common.h"
 #include "qcow2-util.h"
-#include "shared/import-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/chattr-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/web-util.h"
+#include "systemd-shared/import-util.h"
 
 #include "curl-util.h"
 #include "pull-common.h"
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-raw.h b/src/grp-machine/grp-import/systemd-pull/pull-raw.h
index 47ed499c12..0940cff93b 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-raw.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
-#include "shared/import-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-shared/import-util.h"
 
 typedef struct RawPull RawPull;
-
 typedef void (*RawPullFinished)(RawPull *pull, int error, void *userdata);
 
 int raw_pull_new(RawPull **pull, sd_event *event, const char *image_root, RawPullFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-tar.c b/src/grp-machine/grp-import/systemd-pull/pull-tar.c
index 121ca31dbd..fbc7accaed 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-tar.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.c
@@ -22,25 +22,25 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
-#include "basic/web-util.h"
 #include "import-common.h"
-#include "shared/import-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/web-util.h"
+#include "systemd-shared/import-util.h"
 
 #include "curl-util.h"
 #include "pull-common.h"
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-tar.h b/src/grp-machine/grp-import/systemd-pull/pull-tar.h
index a2850fee9e..21d4db5519 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-tar.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
-#include "shared/import-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-shared/import-util.h"
 
 typedef struct TarPull TarPull;
-
 typedef void (*TarPullFinished)(TarPull *pull, int error, void *userdata);
 
 int tar_pull_new(TarPull **pull, sd_event *event, const char *image_root, TarPullFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-pull/pull.c b/src/grp-machine/grp-import/systemd-pull/pull.c
index 4153c938d8..a6b5ed47a8 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull.c
@@ -21,15 +21,15 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hostname-util.h"
-#include "basic/parse-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/verbs.h"
-#include "basic/web-util.h"
-#include "shared/import-util.h"
-#include "shared/machine-image.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-basic/web-util.h"
+#include "systemd-shared/import-util.h"
+#include "systemd-shared/machine-image.h"
 
 #include "pull-raw.h"
 #include "pull-tar.h"
diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile
new file mode 100644
index 0000000000..76e6e9ddee
--- /dev/null
+++ b/src/grp-machine/libmachine-core/Makefile
@@ -0,0 +1,28 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+nested.subdirs += src
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/systemd-machined/image-dbus.h b/src/grp-machine/libmachine-core/include/image-dbus.h
index b62da996c6..b62da996c6 100644
--- a/src/grp-machine/systemd-machined/image-dbus.h
+++ b/src/grp-machine/libmachine-core/include/image-dbus.h
diff --git a/src/grp-machine/systemd-machined/machine-dbus.h b/src/grp-machine/libmachine-core/include/machine-dbus.h
index d3faf5cb07..d3faf5cb07 100644
--- a/src/grp-machine/systemd-machined/machine-dbus.h
+++ b/src/grp-machine/libmachine-core/include/machine-dbus.h
diff --git a/src/grp-machine/systemd-machined/machine.h b/src/grp-machine/libmachine-core/include/machine.h
index e93f0cf222..361451b1c8 100644
--- a/src/grp-machine/systemd-machined/machine.h
+++ b/src/grp-machine/libmachine-core/include/machine.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef enum KillWho KillWho;
 typedef struct Machine Machine;
diff --git a/src/grp-machine/systemd-machined/machined.h b/src/grp-machine/libmachine-core/include/machined.h
index b16ea3ef15..8994097db0 100644
--- a/src/grp-machine/systemd-machined/machined.h
+++ b/src/grp-machine/libmachine-core/include/machined.h
@@ -24,8 +24,8 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "basic/list.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
 
 typedef struct Manager Manager;
 
diff --git a/src/grp-machine/systemd-machined/operation.h b/src/grp-machine/libmachine-core/include/operation.h
index 713ffe88c4..5eed62bd6f 100644
--- a/src/grp-machine/systemd-machined/operation.h
+++ b/src/grp-machine/libmachine-core/include/operation.h
@@ -24,7 +24,7 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef struct Operation Operation;
 
diff --git a/src/grp-machine/libmachine-core/src/Makefile b/src/grp-machine/libmachine-core/src/Makefile
new file mode 100644
index 0000000000..75c196f199
--- /dev/null
+++ b/src/grp-machine/libmachine-core/src/Makefile
@@ -0,0 +1,53 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+libmachine_core_la_SOURCES = \
+	src/machine/machine.c \
+	src/machine/machine.h \
+	src/machine/machined-dbus.c \
+	src/machine/machine-dbus.c \
+	src/machine/machine-dbus.h \
+	src/machine/image-dbus.c \
+	src/machine/image-dbus.h \
+	src/machine/operation.c \
+	src/machine/operation.h
+
+libmachine_core_la_LIBADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+noinst_LTLIBRARIES += \
+	libmachine-core.la
+
+test_machine_tables_SOURCES = \
+	src/machine/test-machine-tables.c
+
+test_machine_tables_LDADD = \
+	libmachine-core.la
+
+tests += \
+	test-machine-tables
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/systemd-machined/image-dbus.c b/src/grp-machine/libmachine-core/src/image-dbus.c
index 6ab627a710..b8c647eab1 100644
--- a/src/grp-machine/systemd-machined/image-dbus.c
+++ b/src/grp-machine/libmachine-core/src/image-dbus.c
@@ -17,17 +17,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/process-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "shared/bus-util.h"
-#include "shared/machine-image.h"
-
 #include "image-dbus.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/machine-image.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, image_type, ImageType);
 
diff --git a/src/grp-machine/systemd-machined/machine-dbus.c b/src/grp-machine/libmachine-core/src/machine-dbus.c
index 91b5dfa993..5a402e2e95 100644
--- a/src/grp-machine/systemd-machined/machine-dbus.c
+++ b/src/grp-machine/libmachine-core/src/machine-dbus.c
@@ -28,29 +28,28 @@
 #include <libgen.h>
 #undef basename
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/copy.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
+#include "machine-dbus.h"
+#include "machine.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-internal.h"
+#include "sd-bus/bus-util.h"
 #include "sd-netlink/local-addresses.h"
-#include "shared/bus-util.h"
-
-#include "machine-dbus.h"
-#include "machine.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
 
 static int property_get_id(
                 sd_bus *bus,
diff --git a/src/grp-machine/systemd-machined/machine.c b/src/grp-machine/libmachine-core/src/machine.c
index 701fec0e67..49eeea2d6b 100644
--- a/src/grp-machine/systemd-machined/machine.c
+++ b/src/grp-machine/libmachine-core/src/machine.c
@@ -23,26 +23,25 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/extract-word.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/hashmap.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-
 #include "machine-dbus.h"
 #include "machine.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
 
 Machine* machine_new(Manager *manager, MachineClass class, const char *name) {
         Machine *m;
diff --git a/src/grp-machine/systemd-machined/machined-dbus.c b/src/grp-machine/libmachine-core/src/machined-dbus.c
index 349ffcf298..e0245971a1 100644
--- a/src/grp-machine/systemd-machined/machined-dbus.c
+++ b/src/grp-machine/libmachine-core/src/machined-dbus.c
@@ -23,28 +23,27 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/stdio-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
-#include "shared/machine-image.h"
-#include "shared/machine-pool.h"
-
 #include "image-dbus.h"
 #include "machine-dbus.h"
 #include "machined.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/machine-image.h"
+#include "systemd-shared/machine-pool.h"
 
 static int property_get_pool_path(
                 sd_bus *bus,
diff --git a/src/grp-machine/systemd-machined/operation.c b/src/grp-machine/libmachine-core/src/operation.c
index f16c38c47a..0d852aba24 100644
--- a/src/grp-machine/systemd-machined/operation.c
+++ b/src/grp-machine/libmachine-core/src/operation.c
@@ -17,11 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/process-util.h"
-
 #include "operation.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/process-util.h"
 
 static int operation_done(sd_event_source *s, const siginfo_t *si, void *userdata) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
diff --git a/src/grp-machine/systemd-machined/test-machine-tables.c b/src/grp-machine/libmachine-core/src/test-machine-tables.c
index 7d44c55a4b..99c3274c20 100644
--- a/src/grp-machine/systemd-machined/test-machine-tables.c
+++ b/src/grp-machine/libmachine-core/src/test-machine-tables.c
@@ -17,9 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/test-tables.h"
-
 #include "machine.h"
+#include "systemd-shared/test-tables.h"
 
 int main(int argc, char **argv) {
         test_table(machine_class, MACHINE_CLASS);
diff --git a/src/grp-machine/machinectl/machinectl.c b/src/grp-machine/machinectl/machinectl.c
index d5304dba37..bf89f00cb8 100644
--- a/src/grp-machine/machinectl/machinectl.c
+++ b/src/grp-machine/machinectl/machinectl.c
@@ -31,35 +31,35 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/copy.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/hostname-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "basic/verbs.h"
-#include "basic/web-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
-#include "shared/cgroup-show.h"
-#include "shared/import-util.h"
-#include "shared/logs-show.h"
-#include "shared/pager.h"
-#include "shared/ptyfwd.h"
-#include "shared/spawn-polkit-agent.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-basic/web-util.h"
+#include "systemd-shared/bus-unit-util.h"
+#include "systemd-shared/cgroup-show.h"
+#include "systemd-shared/import-util.h"
+#include "systemd-shared/logs-show.h"
+#include "systemd-shared/pager.h"
+#include "systemd-shared/ptyfwd.h"
+#include "systemd-shared/spawn-polkit-agent.h"
 
 static char **arg_property = NULL;
 static bool arg_all = false;
diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile
index 54d78ed2f1..5e3d878b23 100644
--- a/src/grp-machine/nss-mymachines/Makefile
+++ b/src/grp-machine/nss-mymachines/Makefile
@@ -37,7 +37,7 @@ libnss_mymachines_la_LDFLAGS = \
 
 libnss_mymachines_la_LIBADD = \
 	libsystemd-internal.la \
-	libbasic.la
+	libsystemd-basic.la
 
 lib_LTLIBRARIES += \
 	libnss_mymachines.la
diff --git a/src/grp-machine/nss-mymachines/nss-mymachines.c b/src/grp-machine/nss-mymachines/nss-mymachines.c
index 0bcdd45d37..4299dd7a0b 100644
--- a/src/grp-machine/nss-mymachines/nss-mymachines.c
+++ b/src/grp-machine/nss-mymachines/nss-mymachines.c
@@ -23,16 +23,16 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-login.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hostname-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/macro.h"
-#include "basic/nss-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-common-errors.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/nss-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 NSS_GETHOSTBYNAME_PROTOTYPES(mymachines);
 NSS_GETPW_PROTOTYPES(mymachines);
diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile
index 97fa68c5f9..011e740e02 100644
--- a/src/grp-machine/systemd-machined/Makefile
+++ b/src/grp-machine/systemd-machined/Makefile
@@ -29,39 +29,13 @@ systemd_machined_SOURCES = \
 
 systemd_machined_LDADD = \
 	libsystemd-internal.la \
-	libshared.la \
-	libbasic.la \
+	libsystemd-shared.la \
+	libsystemd-basic.la \
 	libmachine-core.la
 
 rootlibexec_PROGRAMS += \
 	systemd-machined
 
-libmachine_core_la_SOURCES = \
-	src/machine/machine.c \
-	src/machine/machine.h \
-	src/machine/machined-dbus.c \
-	src/machine/machine-dbus.c \
-	src/machine/machine-dbus.h \
-	src/machine/image-dbus.c \
-	src/machine/image-dbus.h \
-	src/machine/operation.c \
-	src/machine/operation.h
-
-libmachine_core_la_LIBADD = \
-	libsystemd-shared.la
-
-noinst_LTLIBRARIES += \
-	libmachine-core.la
-
-test_machine_tables_SOURCES = \
-	src/machine/test-machine-tables.c
-
-test_machine_tables_LDADD = \
-	libmachine-core.la
-
-tests += \
-	test-machine-tables
-
 nodist_systemunit_DATA += \
 	units/systemd-machined.service
 
diff --git a/src/grp-machine/systemd-machined/machined.c b/src/grp-machine/systemd-machined/machined.c
index a01d1820a1..361d85cb3f 100644
--- a/src/grp-machine/systemd-machined/machined.c
+++ b/src/grp-machine/systemd-machined/machined.c
@@ -23,19 +23,18 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/hostname-util.h"
-#include "basic/label.h"
-#include "basic/signal-util.h"
-#include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/machine-image.h"
-
 #include "machined.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-shared/machine-image.h"
 
 Manager *manager_new(void) {
         Manager *m;