16 files changed, 382 insertions, 1718 deletions
diff --git a/Makefile-man.am b/Makefile-man.am
index 2ba08e4077..f931ac4361 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1,1407 +1,23 @@
-# Do not edit. Generated by make-man-rules.py.
-# To regenerate:
-#   1. Create, update, or remove source .xml files in man/
-#   2. Run 'make update-man-list'
-#   3. Run 'make man' to generate manpages
-#
-# To make a man page conditional on a configure switch add
-# attribute conditional="ENABLE_WHAT" or conditional="WITH_WHAT"
-# to <refentry> element.
-MANPAGES += \
-	man/bootup.7 \
-	man/busctl.1 \
-	man/daemon.7 \
-	man/file-hierarchy.7 \
-	man/halt.8 \
-	man/hostname.5 \
-	man/journalctl.1 \
-	man/journald.conf.5 \
-	man/kernel-command-line.7 \
-	man/kernel-install.8 \
-	man/locale.conf.5 \
-	man/localtime.5 \
-	man/machine-id.5 \
-	man/machine-info.5 \
-	man/networkctl.1 \
-	man/os-release.5 \
-	man/sd-daemon.3 \
-	man/sd-id128.3 \
-	man/sd-journal.3 \
-	man/sd_booted.3 \
-	man/sd_id128_get_machine.3 \
-	man/sd_id128_randomize.3 \
-	man/sd_id128_to_string.3 \
-	man/sd_is_fifo.3 \
-	man/sd_journal_add_match.3 \
-	man/sd_journal_get_catalog.3 \
-	man/sd_journal_get_cursor.3 \
-	man/sd_journal_get_cutoff_realtime_usec.3 \
-	man/sd_journal_get_data.3 \
-	man/sd_journal_get_fd.3 \
-	man/sd_journal_get_realtime_usec.3 \
-	man/sd_journal_get_usage.3 \
-	man/sd_journal_next.3 \
-	man/sd_journal_open.3 \
-	man/sd_journal_print.3 \
-	man/sd_journal_query_unique.3 \
-	man/sd_journal_seek_head.3 \
-	man/sd_journal_stream_fd.3 \
-	man/sd_listen_fds.3 \
-	man/sd_machine_get_class.3 \
-	man/sd_notify.3 \
-	man/sd_watchdog_enabled.3 \
-	man/shutdown.8 \
-	man/sysctl.d.5 \
-	man/systemctl.1 \
-	man/systemd-activate.8 \
-	man/systemd-analyze.1 \
-	man/systemd-ask-password-console.service.8 \
-	man/systemd-ask-password.1 \
-	man/systemd-cat.1 \
-	man/systemd-cgls.1 \
-	man/systemd-cgtop.1 \
-	man/systemd-debug-generator.8 \
-	man/systemd-delta.1 \
-	man/systemd-detect-virt.1 \
-	man/systemd-efi-boot-generator.8 \
-	man/systemd-escape.1 \
-	man/systemd-fsck@.service.8 \
-	man/systemd-fsckd.service.8 \
-	man/systemd-fstab-generator.8 \
-	man/systemd-getty-generator.8 \
-	man/systemd-gpt-auto-generator.8 \
-	man/systemd-halt.service.8 \
-	man/systemd-hibernate-resume-generator.8 \
-	man/systemd-hibernate-resume@.service.8 \
-	man/systemd-inhibit.1 \
-	man/systemd-initctl.service.8 \
-	man/systemd-journald.service.8 \
-	man/systemd-machine-id-commit.1 \
-	man/systemd-machine-id-commit.service.8 \
-	man/systemd-machine-id-setup.1 \
-	man/systemd-notify.1 \
-	man/systemd-nspawn.1 \
-	man/systemd-path.1 \
-	man/systemd-remount-fs.service.8 \
-	man/systemd-run.1 \
-	man/systemd-shutdownd.service.8 \
-	man/systemd-sleep.conf.5 \
-	man/systemd-socket-proxyd.8 \
-	man/systemd-suspend.service.8 \
-	man/systemd-sysctl.service.8 \
-	man/systemd-system-update-generator.8 \
-	man/systemd-system.conf.5 \
-	man/systemd-sysusers.8 \
-	man/systemd-tmpfiles.8 \
-	man/systemd-tty-ask-password-agent.1 \
-	man/systemd-udevd.service.8 \
-	man/systemd-update-done.service.8 \
-	man/systemd.1 \
-	man/systemd.automount.5 \
-	man/systemd.device.5 \
-	man/systemd.exec.5 \
-	man/systemd.generator.7 \
-	man/systemd.journal-fields.7 \
-	man/systemd.kill.5 \
-	man/systemd.link.5 \
-	man/systemd.mount.5 \
-	man/systemd.path.5 \
-	man/systemd.preset.5 \
-	man/systemd.resource-control.5 \
-	man/systemd.scope.5 \
-	man/systemd.service.5 \
-	man/systemd.slice.5 \
-	man/systemd.snapshot.5 \
-	man/systemd.socket.5 \
-	man/systemd.special.7 \
-	man/systemd.swap.5 \
-	man/systemd.target.5 \
-	man/systemd.time.7 \
-	man/systemd.timer.5 \
-	man/systemd.unit.5 \
-	man/sysusers.d.5 \
-	man/telinit.8 \
-	man/tmpfiles.d.5 \
-	man/udev.7 \
-	man/udev.conf.5 \
-	man/udevadm.8
-MANPAGES_ALIAS += \
-	man/SD_ALERT.3 \
-	man/SD_CRIT.3 \
-	man/SD_DEBUG.3 \
-	man/SD_EMERG.3 \
-	man/SD_ERR.3 \
-	man/SD_ID128_CONST_STR.3 \
-	man/SD_ID128_FORMAT_STR.3 \
-	man/SD_ID128_FORMAT_VAL.3 \
-	man/SD_ID128_MAKE.3 \
-	man/SD_INFO.3 \
-	man/SD_JOURNAL_APPEND.3 \
-	man/SD_JOURNAL_CURRENT_USER.3 \
-	man/SD_JOURNAL_FOREACH.3 \
-	man/SD_JOURNAL_FOREACH_BACKWARDS.3 \
-	man/SD_JOURNAL_FOREACH_DATA.3 \
-	man/SD_JOURNAL_FOREACH_UNIQUE.3 \
-	man/SD_JOURNAL_INVALIDATE.3 \
-	man/SD_JOURNAL_LOCAL_ONLY.3 \
-	man/SD_JOURNAL_NOP.3 \
-	man/SD_JOURNAL_RUNTIME_ONLY.3 \
-	man/SD_JOURNAL_SUPPRESS_LOCATION.3 \
-	man/SD_JOURNAL_SYSTEM.3 \
-	man/SD_LISTEN_FDS_START.3 \
-	man/SD_NOTICE.3 \
-	man/SD_WARNING.3 \
-	man/init.1 \
-	man/journald.conf.d.5 \
-	man/poweroff.8 \
-	man/reboot.8 \
-	man/sd_id128_equal.3 \
-	man/sd_id128_from_string.3 \
-	man/sd_id128_get_boot.3 \
-	man/sd_id128_t.3 \
-	man/sd_is_mq.3 \
-	man/sd_is_socket.3 \
-	man/sd_is_socket_inet.3 \
-	man/sd_is_socket_unix.3 \
-	man/sd_is_special.3 \
-	man/sd_journal.3 \
-	man/sd_journal_add_conjunction.3 \
-	man/sd_journal_add_disjunction.3 \
-	man/sd_journal_close.3 \
-	man/sd_journal_enumerate_data.3 \
-	man/sd_journal_enumerate_unique.3 \
-	man/sd_journal_flush_matches.3 \
-	man/sd_journal_get_catalog_for_message_id.3 \
-	man/sd_journal_get_cutoff_monotonic_usec.3 \
-	man/sd_journal_get_data_threshold.3 \
-	man/sd_journal_get_events.3 \
-	man/sd_journal_get_monotonic_usec.3 \
-	man/sd_journal_get_timeout.3 \
-	man/sd_journal_next_skip.3 \
-	man/sd_journal_open_container.3 \
-	man/sd_journal_open_directory.3 \
-	man/sd_journal_open_files.3 \
-	man/sd_journal_perror.3 \
-	man/sd_journal_previous.3 \
-	man/sd_journal_previous_skip.3 \
-	man/sd_journal_printv.3 \
-	man/sd_journal_process.3 \
-	man/sd_journal_reliable_fd.3 \
-	man/sd_journal_restart_data.3 \
-	man/sd_journal_restart_unique.3 \
-	man/sd_journal_seek_cursor.3 \
-	man/sd_journal_seek_monotonic_usec.3 \
-	man/sd_journal_seek_realtime_usec.3 \
-	man/sd_journal_seek_tail.3 \
-	man/sd_journal_send.3 \
-	man/sd_journal_sendv.3 \
-	man/sd_journal_set_data_threshold.3 \
-	man/sd_journal_test_cursor.3 \
-	man/sd_journal_wait.3 \
-	man/sd_machine_get_ifindices.3 \
-	man/sd_notifyf.3 \
-	man/sd_pid_notify.3 \
-	man/sd_pid_notify_with_fds.3 \
-	man/sd_pid_notifyf.3 \
-	man/sleep.conf.d.5 \
-	man/system.conf.d.5 \
-	man/systemd-ask-password-console.path.8 \
-	man/systemd-ask-password-wall.path.8 \
-	man/systemd-ask-password-wall.service.8 \
-	man/systemd-fsck-root.service.8 \
-	man/systemd-fsck.8 \
-	man/systemd-fsckd.8 \
-	man/systemd-fsckd.socket.8 \
-	man/systemd-hibernate-resume.8 \
-	man/systemd-hibernate.service.8 \
-	man/systemd-hybrid-sleep.service.8 \
-	man/systemd-initctl.8 \
-	man/systemd-initctl.socket.8 \
-	man/systemd-journald-dev-log.socket.8 \
-	man/systemd-journald.8 \
-	man/systemd-journald.socket.8 \
-	man/systemd-kexec.service.8 \
-	man/systemd-poweroff.service.8 \
-	man/systemd-reboot.service.8 \
-	man/systemd-remount-fs.8 \
-	man/systemd-shutdown.8 \
-	man/systemd-shutdownd.8 \
-	man/systemd-shutdownd.socket.8 \
-	man/systemd-sleep.8 \
-	man/systemd-sysctl.8 \
-	man/systemd-sysusers.service.8 \
-	man/systemd-tmpfiles-clean.service.8 \
-	man/systemd-tmpfiles-clean.timer.8 \
-	man/systemd-tmpfiles-setup-dev.service.8 \
-	man/systemd-tmpfiles-setup.service.8 \
-	man/systemd-udevd-control.socket.8 \
-	man/systemd-udevd-kernel.socket.8 \
-	man/systemd-udevd.8 \
-	man/systemd-update-done.8 \
-	man/systemd-user.conf.5 \
-	man/user.conf.d.5
-man/SD_ALERT.3: man/sd-daemon.3
-man/SD_CRIT.3: man/sd-daemon.3
-man/SD_DEBUG.3: man/sd-daemon.3
-man/SD_EMERG.3: man/sd-daemon.3
-man/SD_ERR.3: man/sd-daemon.3
-man/SD_ID128_CONST_STR.3: man/sd-id128.3
-man/SD_ID128_FORMAT_STR.3: man/sd-id128.3
-man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3
-man/SD_ID128_MAKE.3: man/sd-id128.3
-man/SD_INFO.3: man/sd-daemon.3
-man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3
-man/SD_JOURNAL_CURRENT_USER.3: man/sd_journal_open.3
-man/SD_JOURNAL_FOREACH.3: man/sd_journal_next.3
-man/SD_JOURNAL_FOREACH_BACKWARDS.3: man/sd_journal_next.3
-man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3
-man/SD_JOURNAL_FOREACH_UNIQUE.3: man/sd_journal_query_unique.3
-man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3
-man/SD_JOURNAL_LOCAL_ONLY.3: man/sd_journal_open.3
-man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3
-man/SD_JOURNAL_RUNTIME_ONLY.3: man/sd_journal_open.3
-man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3
-man/SD_JOURNAL_SYSTEM.3: man/sd_journal_open.3
-man/SD_LISTEN_FDS_START.3: man/sd_listen_fds.3
-man/SD_NOTICE.3: man/sd-daemon.3
-man/SD_WARNING.3: man/sd-daemon.3
-man/init.1: man/systemd.1
-man/journald.conf.d.5: man/journald.conf.5
-man/poweroff.8: man/halt.8
-man/reboot.8: man/halt.8
-man/sd_id128_equal.3: man/sd-id128.3
-man/sd_id128_from_string.3: man/sd_id128_to_string.3
-man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
-man/sd_id128_t.3: man/sd-id128.3
-man/sd_is_mq.3: man/sd_is_fifo.3
-man/sd_is_socket.3: man/sd_is_fifo.3
-man/sd_is_socket_inet.3: man/sd_is_fifo.3
-man/sd_is_socket_unix.3: man/sd_is_fifo.3
-man/sd_is_special.3: man/sd_is_fifo.3
-man/sd_journal.3: man/sd_journal_open.3
-man/sd_journal_add_conjunction.3: man/sd_journal_add_match.3
-man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3
-man/sd_journal_close.3: man/sd_journal_open.3
-man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3
-man/sd_journal_enumerate_unique.3: man/sd_journal_query_unique.3
-man/sd_journal_flush_matches.3: man/sd_journal_add_match.3
-man/sd_journal_get_catalog_for_message_id.3: man/sd_journal_get_catalog.3
-man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3
-man/sd_journal_get_data_threshold.3: man/sd_journal_get_data.3
-man/sd_journal_get_events.3: man/sd_journal_get_fd.3
-man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3
-man/sd_journal_get_timeout.3: man/sd_journal_get_fd.3
-man/sd_journal_next_skip.3: man/sd_journal_next.3
-man/sd_journal_open_container.3: man/sd_journal_open.3
-man/sd_journal_open_directory.3: man/sd_journal_open.3
-man/sd_journal_open_files.3: man/sd_journal_open.3
-man/sd_journal_perror.3: man/sd_journal_print.3
-man/sd_journal_previous.3: man/sd_journal_next.3
-man/sd_journal_previous_skip.3: man/sd_journal_next.3
-man/sd_journal_printv.3: man/sd_journal_print.3
-man/sd_journal_process.3: man/sd_journal_get_fd.3
-man/sd_journal_reliable_fd.3: man/sd_journal_get_fd.3
-man/sd_journal_restart_data.3: man/sd_journal_get_data.3
-man/sd_journal_restart_unique.3: man/sd_journal_query_unique.3
-man/sd_journal_seek_cursor.3: man/sd_journal_seek_head.3
-man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3
-man/sd_journal_seek_realtime_usec.3: man/sd_journal_seek_head.3
-man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
-man/sd_journal_send.3: man/sd_journal_print.3
-man/sd_journal_sendv.3: man/sd_journal_print.3
-man/sd_journal_set_data_threshold.3: man/sd_journal_get_data.3
-man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3
-man/sd_journal_wait.3: man/sd_journal_get_fd.3
-man/sd_machine_get_ifindices.3: man/sd_machine_get_class.3
-man/sd_notifyf.3: man/sd_notify.3
-man/sd_pid_notify.3: man/sd_notify.3
-man/sd_pid_notify_with_fds.3: man/sd_notify.3
-man/sd_pid_notifyf.3: man/sd_notify.3
-man/sleep.conf.d.5: man/systemd-sleep.conf.5
-man/system.conf.d.5: man/systemd-system.conf.5
-man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
-man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
-man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
-man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
-man/systemd-fsck.8: man/systemd-fsck@.service.8
-man/systemd-fsckd.8: man/systemd-fsckd.service.8
-man/systemd-fsckd.socket.8: man/systemd-fsckd.service.8
-man/systemd-hibernate-resume.8: man/systemd-hibernate-resume@.service.8
-man/systemd-hibernate.service.8: man/systemd-suspend.service.8
-man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8
-man/systemd-initctl.8: man/systemd-initctl.service.8
-man/systemd-initctl.socket.8: man/systemd-initctl.service.8
-man/systemd-journald-dev-log.socket.8: man/systemd-journald.service.8
-man/systemd-journald.8: man/systemd-journald.service.8
-man/systemd-journald.socket.8: man/systemd-journald.service.8
-man/systemd-kexec.service.8: man/systemd-halt.service.8
-man/systemd-poweroff.service.8: man/systemd-halt.service.8
-man/systemd-reboot.service.8: man/systemd-halt.service.8
-man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
-man/systemd-shutdown.8: man/systemd-halt.service.8
-man/systemd-shutdownd.8: man/systemd-shutdownd.service.8
-man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8
-man/systemd-sleep.8: man/systemd-suspend.service.8
-man/systemd-sysctl.8: man/systemd-sysctl.service.8
-man/systemd-sysusers.service.8: man/systemd-sysusers.8
-man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
-man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
-man/systemd-tmpfiles-setup-dev.service.8: man/systemd-tmpfiles.8
-man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
-man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
-man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
-man/systemd-udevd.8: man/systemd-udevd.service.8
-man/systemd-update-done.8: man/systemd-update-done.service.8
-man/systemd-user.conf.5: man/systemd-system.conf.5
-man/user.conf.d.5: man/systemd-system.conf.5
-man/SD_ALERT.html: man/sd-daemon.html
-	$(html-alias)
-
-man/SD_CRIT.html: man/sd-daemon.html
-	$(html-alias)
-
-man/SD_DEBUG.html: man/sd-daemon.html
-	$(html-alias)
-
-man/SD_EMERG.html: man/sd-daemon.html
-	$(html-alias)
-
-man/SD_ERR.html: man/sd-daemon.html
-	$(html-alias)
-
-man/SD_ID128_CONST_STR.html: man/sd-id128.html
-	$(html-alias)
-
-man/SD_ID128_FORMAT_STR.html: man/sd-id128.html
-	$(html-alias)
-
-man/SD_ID128_FORMAT_VAL.html: man/sd-id128.html
-	$(html-alias)
-
-man/SD_ID128_MAKE.html: man/sd-id128.html
-	$(html-alias)
-
-man/SD_INFO.html: man/sd-daemon.html
-	$(html-alias)
-
-man/SD_JOURNAL_APPEND.html: man/sd_journal_get_fd.html
-	$(html-alias)
-
-man/SD_JOURNAL_CURRENT_USER.html: man/sd_journal_open.html
-	$(html-alias)
-
-man/SD_JOURNAL_FOREACH.html: man/sd_journal_next.html
-	$(html-alias)
-
-man/SD_JOURNAL_FOREACH_BACKWARDS.html: man/sd_journal_next.html
-	$(html-alias)
-
-man/SD_JOURNAL_FOREACH_DATA.html: man/sd_journal_get_data.html
-	$(html-alias)
-
-man/SD_JOURNAL_FOREACH_UNIQUE.html: man/sd_journal_query_unique.html
-	$(html-alias)
-
-man/SD_JOURNAL_INVALIDATE.html: man/sd_journal_get_fd.html
-	$(html-alias)
-
-man/SD_JOURNAL_LOCAL_ONLY.html: man/sd_journal_open.html
-	$(html-alias)
-
-man/SD_JOURNAL_NOP.html: man/sd_journal_get_fd.html
-	$(html-alias)
-
-man/SD_JOURNAL_RUNTIME_ONLY.html: man/sd_journal_open.html
-	$(html-alias)
-
-man/SD_JOURNAL_SUPPRESS_LOCATION.html: man/sd_journal_print.html
-	$(html-alias)
-
-man/SD_JOURNAL_SYSTEM.html: man/sd_journal_open.html
-	$(html-alias)
-
-man/SD_LISTEN_FDS_START.html: man/sd_listen_fds.html
-	$(html-alias)
-
-man/SD_NOTICE.html: man/sd-daemon.html
-	$(html-alias)
-
-man/SD_WARNING.html: man/sd-daemon.html
-	$(html-alias)
-
-man/init.html: man/systemd.html
-	$(html-alias)
-
-man/journald.conf.d.html: man/journald.conf.html
-	$(html-alias)
-
-man/poweroff.html: man/halt.html
-	$(html-alias)
-
-man/reboot.html: man/halt.html
-	$(html-alias)
-
-man/sd_id128_equal.html: man/sd-id128.html
-	$(html-alias)
-
-man/sd_id128_from_string.html: man/sd_id128_to_string.html
-	$(html-alias)
-
-man/sd_id128_get_boot.html: man/sd_id128_get_machine.html
-	$(html-alias)
-
-man/sd_id128_t.html: man/sd-id128.html
-	$(html-alias)
-
-man/sd_is_mq.html: man/sd_is_fifo.html
-	$(html-alias)
-
-man/sd_is_socket.html: man/sd_is_fifo.html
-	$(html-alias)
-
-man/sd_is_socket_inet.html: man/sd_is_fifo.html
-	$(html-alias)
-
-man/sd_is_socket_unix.html: man/sd_is_fifo.html
-	$(html-alias)
-
-man/sd_is_special.html: man/sd_is_fifo.html
-	$(html-alias)
-
-man/sd_journal.html: man/sd_journal_open.html
-	$(html-alias)
-
-man/sd_journal_add_conjunction.html: man/sd_journal_add_match.html
-	$(html-alias)
-
-man/sd_journal_add_disjunction.html: man/sd_journal_add_match.html
-	$(html-alias)
-
-man/sd_journal_close.html: man/sd_journal_open.html
-	$(html-alias)
-
-man/sd_journal_enumerate_data.html: man/sd_journal_get_data.html
-	$(html-alias)
-
-man/sd_journal_enumerate_unique.html: man/sd_journal_query_unique.html
-	$(html-alias)
-
-man/sd_journal_flush_matches.html: man/sd_journal_add_match.html
-	$(html-alias)
-
-man/sd_journal_get_catalog_for_message_id.html: man/sd_journal_get_catalog.html
-	$(html-alias)
-
-man/sd_journal_get_cutoff_monotonic_usec.html: man/sd_journal_get_cutoff_realtime_usec.html
-	$(html-alias)
-
-man/sd_journal_get_data_threshold.html: man/sd_journal_get_data.html
-	$(html-alias)
-
-man/sd_journal_get_events.html: man/sd_journal_get_fd.html
-	$(html-alias)
-
-man/sd_journal_get_monotonic_usec.html: man/sd_journal_get_realtime_usec.html
-	$(html-alias)
-
-man/sd_journal_get_timeout.html: man/sd_journal_get_fd.html
-	$(html-alias)
-
-man/sd_journal_next_skip.html: man/sd_journal_next.html
-	$(html-alias)
-
-man/sd_journal_open_container.html: man/sd_journal_open.html
-	$(html-alias)
-
-man/sd_journal_open_directory.html: man/sd_journal_open.html
-	$(html-alias)
-
-man/sd_journal_open_files.html: man/sd_journal_open.html
-	$(html-alias)
-
-man/sd_journal_perror.html: man/sd_journal_print.html
-	$(html-alias)
-
-man/sd_journal_previous.html: man/sd_journal_next.html
-	$(html-alias)
-
-man/sd_journal_previous_skip.html: man/sd_journal_next.html
-	$(html-alias)
-
-man/sd_journal_printv.html: man/sd_journal_print.html
-	$(html-alias)
-
-man/sd_journal_process.html: man/sd_journal_get_fd.html
-	$(html-alias)
-
-man/sd_journal_reliable_fd.html: man/sd_journal_get_fd.html
-	$(html-alias)
-
-man/sd_journal_restart_data.html: man/sd_journal_get_data.html
-	$(html-alias)
-
-man/sd_journal_restart_unique.html: man/sd_journal_query_unique.html
-	$(html-alias)
-
-man/sd_journal_seek_cursor.html: man/sd_journal_seek_head.html
-	$(html-alias)
-
-man/sd_journal_seek_monotonic_usec.html: man/sd_journal_seek_head.html
-	$(html-alias)
-
-man/sd_journal_seek_realtime_usec.html: man/sd_journal_seek_head.html
-	$(html-alias)
-
-man/sd_journal_seek_tail.html: man/sd_journal_seek_head.html
-	$(html-alias)
-
-man/sd_journal_send.html: man/sd_journal_print.html
-	$(html-alias)
-
-man/sd_journal_sendv.html: man/sd_journal_print.html
-	$(html-alias)
-
-man/sd_journal_set_data_threshold.html: man/sd_journal_get_data.html
-	$(html-alias)
-
-man/sd_journal_test_cursor.html: man/sd_journal_get_cursor.html
-	$(html-alias)
-
-man/sd_journal_wait.html: man/sd_journal_get_fd.html
-	$(html-alias)
-
-man/sd_machine_get_ifindices.html: man/sd_machine_get_class.html
-	$(html-alias)
-
-man/sd_notifyf.html: man/sd_notify.html
-	$(html-alias)
-
-man/sd_pid_notify.html: man/sd_notify.html
-	$(html-alias)
-
-man/sd_pid_notify_with_fds.html: man/sd_notify.html
-	$(html-alias)
-
-man/sd_pid_notifyf.html: man/sd_notify.html
-	$(html-alias)
-
-man/sleep.conf.d.html: man/systemd-sleep.conf.html
-	$(html-alias)
-
-man/system.conf.d.html: man/systemd-system.conf.html
-	$(html-alias)
-
-man/systemd-ask-password-console.path.html: man/systemd-ask-password-console.service.html
-	$(html-alias)
-
-man/systemd-ask-password-wall.path.html: man/systemd-ask-password-console.service.html
-	$(html-alias)
-
-man/systemd-ask-password-wall.service.html: man/systemd-ask-password-console.service.html
-	$(html-alias)
-
-man/systemd-fsck-root.service.html: man/systemd-fsck@.service.html
-	$(html-alias)
-
-man/systemd-fsck.html: man/systemd-fsck@.service.html
-	$(html-alias)
-
-man/systemd-fsckd.html: man/systemd-fsckd.service.html
-	$(html-alias)
-
-man/systemd-fsckd.socket.html: man/systemd-fsckd.service.html
-	$(html-alias)
-
-man/systemd-hibernate-resume.html: man/systemd-hibernate-resume@.service.html
-	$(html-alias)
-
-man/systemd-hibernate.service.html: man/systemd-suspend.service.html
-	$(html-alias)
-
-man/systemd-hybrid-sleep.service.html: man/systemd-suspend.service.html
-	$(html-alias)
-
-man/systemd-initctl.html: man/systemd-initctl.service.html
-	$(html-alias)
-
-man/systemd-initctl.socket.html: man/systemd-initctl.service.html
-	$(html-alias)
-
-man/systemd-journald-dev-log.socket.html: man/systemd-journald.service.html
-	$(html-alias)
-
-man/systemd-journald.html: man/systemd-journald.service.html
-	$(html-alias)
-
-man/systemd-journald.socket.html: man/systemd-journald.service.html
-	$(html-alias)
-
-man/systemd-kexec.service.html: man/systemd-halt.service.html
-	$(html-alias)
-
-man/systemd-poweroff.service.html: man/systemd-halt.service.html
-	$(html-alias)
-
-man/systemd-reboot.service.html: man/systemd-halt.service.html
-	$(html-alias)
-
-man/systemd-remount-fs.html: man/systemd-remount-fs.service.html
-	$(html-alias)
-
-man/systemd-shutdown.html: man/systemd-halt.service.html
-	$(html-alias)
-
-man/systemd-shutdownd.html: man/systemd-shutdownd.service.html
-	$(html-alias)
-
-man/systemd-shutdownd.socket.html: man/systemd-shutdownd.service.html
-	$(html-alias)
-
-man/systemd-sleep.html: man/systemd-suspend.service.html
-	$(html-alias)
-
-man/systemd-sysctl.html: man/systemd-sysctl.service.html
-	$(html-alias)
-
-man/systemd-sysusers.service.html: man/systemd-sysusers.html
-	$(html-alias)
-
-man/systemd-tmpfiles-clean.service.html: man/systemd-tmpfiles.html
-	$(html-alias)
-
-man/systemd-tmpfiles-clean.timer.html: man/systemd-tmpfiles.html
-	$(html-alias)
-
-man/systemd-tmpfiles-setup-dev.service.html: man/systemd-tmpfiles.html
-	$(html-alias)
-
-man/systemd-tmpfiles-setup.service.html: man/systemd-tmpfiles.html
-	$(html-alias)
-
-man/systemd-udevd-control.socket.html: man/systemd-udevd.service.html
-	$(html-alias)
-
-man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html
-	$(html-alias)
-
-man/systemd-udevd.html: man/systemd-udevd.service.html
-	$(html-alias)
-
-man/systemd-update-done.html: man/systemd-update-done.service.html
-	$(html-alias)
-
-man/systemd-user.conf.html: man/systemd-system.conf.html
-	$(html-alias)
-
-man/user.conf.d.html: man/systemd-system.conf.html
-	$(html-alias)
-
-
-if ENABLE_BACKLIGHT
-MANPAGES += \
-	man/systemd-backlight@.service.8
-MANPAGES_ALIAS += \
-	man/systemd-backlight.8
-man/systemd-backlight.8: man/systemd-backlight@.service.8
-man/systemd-backlight.html: man/systemd-backlight@.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_BINFMT
-MANPAGES += \
-	man/binfmt.d.5 \
-	man/systemd-binfmt.service.8
-MANPAGES_ALIAS += \
-	man/systemd-binfmt.8
-man/systemd-binfmt.8: man/systemd-binfmt.service.8
-man/systemd-binfmt.html: man/systemd-binfmt.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_BOOTCHART
-MANPAGES += \
-	man/bootchart.conf.5 \
-	man/systemd-bootchart.1
-MANPAGES_ALIAS += \
-	man/bootchart.conf.d.5
-man/bootchart.conf.d.5: man/bootchart.conf.5
-man/bootchart.conf.d.html: man/bootchart.conf.html
-	$(html-alias)
-
-endif
-
-if ENABLE_COREDUMP
-MANPAGES += \
-	man/coredump.conf.5 \
-	man/coredumpctl.1 \
-	man/systemd-coredump.8
-MANPAGES_ALIAS += \
-	man/coredump.conf.d.5
-man/coredump.conf.d.5: man/coredump.conf.5
-man/coredump.conf.d.html: man/coredump.conf.html
-	$(html-alias)
-
-endif
-
-if ENABLE_EFI
-MANPAGES += \
-	man/bootctl.1
-MANPAGES_ALIAS += \
-	#
-
-
-endif
-
-if ENABLE_FIRSTBOOT
-MANPAGES += \
-	man/systemd-firstboot.1
-MANPAGES_ALIAS += \
-	man/systemd-firstboot.service.1
-man/systemd-firstboot.service.1: man/systemd-firstboot.1
-man/systemd-firstboot.service.html: man/systemd-firstboot.html
-	$(html-alias)
-
-endif
-
-if ENABLE_HOSTNAMED
-MANPAGES += \
-	man/hostnamectl.1 \
-	man/systemd-hostnamed.service.8
-MANPAGES_ALIAS += \
-	man/systemd-hostnamed.8
-man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
-man/systemd-hostnamed.html: man/systemd-hostnamed.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_HWDB
-MANPAGES += \
-	man/hwdb.7 \
-	man/systemd-hwdb.8
-MANPAGES_ALIAS += \
-	#
-
-
-endif
-
-if ENABLE_KDBUS
-MANPAGES += \
-	man/sd_bus_creds_get_pid.3 \
-	man/sd_bus_creds_new_from_pid.3 \
-	man/sd_bus_error.3 \
-	man/sd_bus_message_append.3 \
-	man/sd_bus_message_append_array.3 \
-	man/sd_bus_message_append_basic.3 \
-	man/sd_bus_message_append_string_memfd.3 \
-	man/sd_bus_message_append_strv.3 \
-	man/sd_bus_message_get_cookie.3 \
-	man/sd_bus_message_get_monotonic_usec.3 \
-	man/sd_bus_negotiate_fds.3 \
-	man/sd_bus_new.3 \
-	man/sd_bus_open_user.3 \
-	man/sd_bus_path_encode.3 \
-	man/sd_bus_request_name.3 \
-	man/sd_event_add_child.3 \
-	man/sd_event_add_defer.3 \
-	man/sd_event_add_signal.3 \
-	man/sd_event_add_time.3 \
-	man/sd_event_get_fd.3 \
-	man/sd_event_new.3 \
-	man/sd_event_run.3 \
-	man/sd_event_set_name.3 \
-	man/sd_event_wait.3 \
-	man/systemd-bus-proxyd.8 \
-	man/systemd-bus-proxyd@.service.8
-MANPAGES_ALIAS += \
-	man/sd_bus_creds_get_audit_login_uid.3 \
-	man/sd_bus_creds_get_audit_session_id.3 \
-	man/sd_bus_creds_get_cgroup.3 \
-	man/sd_bus_creds_get_cmdline.3 \
-	man/sd_bus_creds_get_comm.3 \
-	man/sd_bus_creds_get_connection_name.3 \
-	man/sd_bus_creds_get_exe.3 \
-	man/sd_bus_creds_get_gid.3 \
-	man/sd_bus_creds_get_mask.3 \
-	man/sd_bus_creds_get_owner_uid.3 \
-	man/sd_bus_creds_get_selinux_context.3 \
-	man/sd_bus_creds_get_session.3 \
-	man/sd_bus_creds_get_slice.3 \
-	man/sd_bus_creds_get_tid.3 \
-	man/sd_bus_creds_get_tid_comm.3 \
-	man/sd_bus_creds_get_uid.3 \
-	man/sd_bus_creds_get_unique_name.3 \
-	man/sd_bus_creds_get_unit.3 \
-	man/sd_bus_creds_get_user_unit.3 \
-	man/sd_bus_creds_get_well_known_names.3 \
-	man/sd_bus_creds_has_bounding_cap.3 \
-	man/sd_bus_creds_has_effective_cap.3 \
-	man/sd_bus_creds_has_inheritable_cap.3 \
-	man/sd_bus_creds_has_permitted_cap.3 \
-	man/sd_bus_creds_ref.3 \
-	man/sd_bus_creds_unref.3 \
-	man/sd_bus_default_system.3 \
-	man/sd_bus_default_user.3 \
-	man/sd_bus_error_copy.3 \
-	man/sd_bus_error_free.3 \
-	man/sd_bus_error_get_errno.3 \
-	man/sd_bus_error_has_name.3 \
-	man/sd_bus_error_is_set.3 \
-	man/sd_bus_error_set.3 \
-	man/sd_bus_error_set_const.3 \
-	man/sd_bus_error_set_errno.3 \
-	man/sd_bus_error_set_errnof.3 \
-	man/sd_bus_message_append_array_iovec.3 \
-	man/sd_bus_message_append_array_memfd.3 \
-	man/sd_bus_message_append_array_space.3 \
-	man/sd_bus_message_append_string_iovec.3 \
-	man/sd_bus_message_append_string_space.3 \
-	man/sd_bus_message_get_realtime_usec.3 \
-	man/sd_bus_message_get_reply_cookie.3 \
-	man/sd_bus_message_get_seqnum.3 \
-	man/sd_bus_negotiate_creds.3 \
-	man/sd_bus_negotiate_timestamps.3 \
-	man/sd_bus_open_system.3 \
-	man/sd_bus_open_system_container.3 \
-	man/sd_bus_open_system_remote.3 \
-	man/sd_bus_path_decode.3 \
-	man/sd_bus_ref.3 \
-	man/sd_bus_release_name.3 \
-	man/sd_bus_unref.3 \
-	man/sd_event_add_exit.3 \
-	man/sd_event_add_post.3 \
-	man/sd_event_default.3 \
-	man/sd_event_dispatch.3 \
-	man/sd_event_get_name.3 \
-	man/sd_event_loop.3 \
-	man/sd_event_prepare.3 \
-	man/sd_event_ref.3 \
-	man/sd_event_source_get_child_pid.3 \
-	man/sd_event_source_get_signal.3 \
-	man/sd_event_source_get_time.3 \
-	man/sd_event_source_get_time_accuracy.3 \
-	man/sd_event_source_get_time_clock.3 \
-	man/sd_event_source_set_time.3 \
-	man/sd_event_source_set_time_accuracy.3 \
-	man/sd_event_unref.3 \
-	man/systemd-bus-proxyd.socket.8
-man/sd_bus_creds_get_audit_login_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_audit_session_id.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_cgroup.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_cmdline.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_comm.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_connection_name.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_exe.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_gid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_mask.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_creds_get_owner_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_selinux_context.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_session.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_slice.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_tid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_tid_comm.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_unique_name.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_unit.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_user_unit.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_well_known_names.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_bounding_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_effective_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_inheritable_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_permitted_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_ref.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_creds_unref.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_default_system.3: man/sd_bus_open_user.3
-man/sd_bus_default_user.3: man/sd_bus_open_user.3
-man/sd_bus_error_copy.3: man/sd_bus_error.3
-man/sd_bus_error_free.3: man/sd_bus_error.3
-man/sd_bus_error_get_errno.3: man/sd_bus_error.3
-man/sd_bus_error_has_name.3: man/sd_bus_error.3
-man/sd_bus_error_is_set.3: man/sd_bus_error.3
-man/sd_bus_error_set.3: man/sd_bus_error.3
-man/sd_bus_error_set_const.3: man/sd_bus_error.3
-man/sd_bus_error_set_errno.3: man/sd_bus_error.3
-man/sd_bus_error_set_errnof.3: man/sd_bus_error.3
-man/sd_bus_message_append_array_iovec.3: man/sd_bus_message_append_array.3
-man/sd_bus_message_append_array_memfd.3: man/sd_bus_message_append_array.3
-man/sd_bus_message_append_array_space.3: man/sd_bus_message_append_array.3
-man/sd_bus_message_append_string_iovec.3: man/sd_bus_message_append_string_memfd.3
-man/sd_bus_message_append_string_space.3: man/sd_bus_message_append_string_memfd.3
-man/sd_bus_message_get_realtime_usec.3: man/sd_bus_message_get_monotonic_usec.3
-man/sd_bus_message_get_reply_cookie.3: man/sd_bus_message_get_cookie.3
-man/sd_bus_message_get_seqnum.3: man/sd_bus_message_get_monotonic_usec.3
-man/sd_bus_negotiate_creds.3: man/sd_bus_negotiate_fds.3
-man/sd_bus_negotiate_timestamps.3: man/sd_bus_negotiate_fds.3
-man/sd_bus_open_system.3: man/sd_bus_open_user.3
-man/sd_bus_open_system_container.3: man/sd_bus_open_user.3
-man/sd_bus_open_system_remote.3: man/sd_bus_open_user.3
-man/sd_bus_path_decode.3: man/sd_bus_path_encode.3
-man/sd_bus_ref.3: man/sd_bus_new.3
-man/sd_bus_release_name.3: man/sd_bus_request_name.3
-man/sd_bus_unref.3: man/sd_bus_new.3
-man/sd_event_add_exit.3: man/sd_event_add_defer.3
-man/sd_event_add_post.3: man/sd_event_add_defer.3
-man/sd_event_default.3: man/sd_event_new.3
-man/sd_event_dispatch.3: man/sd_event_wait.3
-man/sd_event_get_name.3: man/sd_event_set_name.3
-man/sd_event_loop.3: man/sd_event_run.3
-man/sd_event_prepare.3: man/sd_event_wait.3
-man/sd_event_ref.3: man/sd_event_new.3
-man/sd_event_source_get_child_pid.3: man/sd_event_add_child.3
-man/sd_event_source_get_signal.3: man/sd_event_add_signal.3
-man/sd_event_source_get_time.3: man/sd_event_add_time.3
-man/sd_event_source_get_time_accuracy.3: man/sd_event_add_time.3
-man/sd_event_source_get_time_clock.3: man/sd_event_add_time.3
-man/sd_event_source_set_time.3: man/sd_event_add_time.3
-man/sd_event_source_set_time_accuracy.3: man/sd_event_add_time.3
-man/sd_event_unref.3: man/sd_event_new.3
-man/systemd-bus-proxyd.socket.8: man/systemd-bus-proxyd@.service.8
-man/sd_bus_creds_get_audit_login_uid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_audit_session_id.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_cgroup.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_cmdline.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_comm.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_connection_name.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_exe.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_gid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_mask.html: man/sd_bus_creds_new_from_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_owner_uid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_selinux_context.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_session.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_slice.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_tid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_tid_comm.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_uid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_unique_name.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_unit.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_user_unit.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_well_known_names.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_has_bounding_cap.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_has_effective_cap.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_has_inheritable_cap.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_has_permitted_cap.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_ref.html: man/sd_bus_creds_new_from_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_unref.html: man/sd_bus_creds_new_from_pid.html
-	$(html-alias)
-
-man/sd_bus_default_system.html: man/sd_bus_open_user.html
-	$(html-alias)
-
-man/sd_bus_default_user.html: man/sd_bus_open_user.html
-	$(html-alias)
-
-man/sd_bus_error_copy.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_free.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_get_errno.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_has_name.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_is_set.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_set.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_set_const.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_set_errno.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_set_errnof.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_message_append_array_iovec.html: man/sd_bus_message_append_array.html
-	$(html-alias)
-
-man/sd_bus_message_append_array_memfd.html: man/sd_bus_message_append_array.html
-	$(html-alias)
-
-man/sd_bus_message_append_array_space.html: man/sd_bus_message_append_array.html
-	$(html-alias)
-
-man/sd_bus_message_append_string_iovec.html: man/sd_bus_message_append_string_memfd.html
-	$(html-alias)
-
-man/sd_bus_message_append_string_space.html: man/sd_bus_message_append_string_memfd.html
-	$(html-alias)
-
-man/sd_bus_message_get_realtime_usec.html: man/sd_bus_message_get_monotonic_usec.html
-	$(html-alias)
-
-man/sd_bus_message_get_reply_cookie.html: man/sd_bus_message_get_cookie.html
-	$(html-alias)
-
-man/sd_bus_message_get_seqnum.html: man/sd_bus_message_get_monotonic_usec.html
-	$(html-alias)
-
-man/sd_bus_negotiate_creds.html: man/sd_bus_negotiate_fds.html
-	$(html-alias)
-
-man/sd_bus_negotiate_timestamps.html: man/sd_bus_negotiate_fds.html
-	$(html-alias)
-
-man/sd_bus_open_system.html: man/sd_bus_open_user.html
-	$(html-alias)
-
-man/sd_bus_open_system_container.html: man/sd_bus_open_user.html
-	$(html-alias)
-
-man/sd_bus_open_system_remote.html: man/sd_bus_open_user.html
-	$(html-alias)
-
-man/sd_bus_path_decode.html: man/sd_bus_path_encode.html
-	$(html-alias)
-
-man/sd_bus_ref.html: man/sd_bus_new.html
-	$(html-alias)
-
-man/sd_bus_release_name.html: man/sd_bus_request_name.html
-	$(html-alias)
-
-man/sd_bus_unref.html: man/sd_bus_new.html
-	$(html-alias)
-
-man/sd_event_add_exit.html: man/sd_event_add_defer.html
-	$(html-alias)
-
-man/sd_event_add_post.html: man/sd_event_add_defer.html
-	$(html-alias)
-
-man/sd_event_default.html: man/sd_event_new.html
-	$(html-alias)
-
-man/sd_event_dispatch.html: man/sd_event_wait.html
-	$(html-alias)
-
-man/sd_event_get_name.html: man/sd_event_set_name.html
-	$(html-alias)
-
-man/sd_event_loop.html: man/sd_event_run.html
-	$(html-alias)
-
-man/sd_event_prepare.html: man/sd_event_wait.html
-	$(html-alias)
-
-man/sd_event_ref.html: man/sd_event_new.html
-	$(html-alias)
-
-man/sd_event_source_get_child_pid.html: man/sd_event_add_child.html
-	$(html-alias)
-
-man/sd_event_source_get_signal.html: man/sd_event_add_signal.html
-	$(html-alias)
-
-man/sd_event_source_get_time.html: man/sd_event_add_time.html
-	$(html-alias)
-
-man/sd_event_source_get_time_accuracy.html: man/sd_event_add_time.html
-	$(html-alias)
-
-man/sd_event_source_get_time_clock.html: man/sd_event_add_time.html
-	$(html-alias)
-
-man/sd_event_source_set_time.html: man/sd_event_add_time.html
-	$(html-alias)
-
-man/sd_event_source_set_time_accuracy.html: man/sd_event_add_time.html
-	$(html-alias)
-
-man/sd_event_unref.html: man/sd_event_new.html
-	$(html-alias)
-
-man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd@.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_LOCALED
-MANPAGES += \
-	man/localectl.1 \
-	man/systemd-localed.service.8
-MANPAGES_ALIAS += \
-	man/systemd-localed.8
-man/systemd-localed.8: man/systemd-localed.service.8
-man/systemd-localed.html: man/systemd-localed.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_LOGIND
 MANPAGES += \
 	man/loginctl.1 \
 	man/logind.conf.5 \
-	man/systemd-logind.service.8
+	man/logind.8
 MANPAGES_ALIAS += \
-	man/logind.conf.d.5 \
-	man/systemd-logind.8
+	man/logind.conf.d.5
 man/logind.conf.d.5: man/logind.conf.5
-man/systemd-logind.8: man/systemd-logind.service.8
 man/logind.conf.d.html: man/logind.conf.html
 	$(html-alias)
 
-man/systemd-logind.html: man/systemd-logind.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_MACHINED
-MANPAGES += \
-	man/machinectl.1 \
-	man/nss-mymachines.8 \
-	man/systemd-machined.service.8
-MANPAGES_ALIAS += \
-	man/libnss_mymachines.so.2.8 \
-	man/systemd-machined.8
-man/libnss_mymachines.so.2.8: man/nss-mymachines.8
-man/systemd-machined.8: man/systemd-machined.service.8
-man/libnss_mymachines.so.2.html: man/nss-mymachines.html
-	$(html-alias)
-
-man/systemd-machined.html: man/systemd-machined.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_NETWORKD
-MANPAGES += \
-	man/systemd-networkd-wait-online.service.8 \
-	man/systemd-networkd.service.8 \
-	man/systemd.netdev.5 \
-	man/systemd.network.5
-MANPAGES_ALIAS += \
-	man/systemd-networkd-wait-online.8 \
-	man/systemd-networkd.8
-man/systemd-networkd-wait-online.8: man/systemd-networkd-wait-online.service.8
-man/systemd-networkd.8: man/systemd-networkd.service.8
-man/systemd-networkd-wait-online.html: man/systemd-networkd-wait-online.service.html
-	$(html-alias)
-
-man/systemd-networkd.html: man/systemd-networkd.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_QUOTACHECK
-MANPAGES += \
-	man/systemd-quotacheck.service.8
-MANPAGES_ALIAS += \
-	man/systemd-quotacheck.8
-man/systemd-quotacheck.8: man/systemd-quotacheck.service.8
-man/systemd-quotacheck.html: man/systemd-quotacheck.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_RANDOMSEED
-MANPAGES += \
-	man/systemd-random-seed.service.8
-MANPAGES_ALIAS += \
-	man/systemd-random-seed.8
-man/systemd-random-seed.8: man/systemd-random-seed.service.8
-man/systemd-random-seed.html: man/systemd-random-seed.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_RESOLVED
-MANPAGES += \
-	man/resolved.conf.5 \
-	man/systemd-resolved.service.8
-MANPAGES_ALIAS += \
-	man/resolved.conf.d.5 \
-	man/systemd-resolved.8
-man/resolved.conf.d.5: man/resolved.conf.5
-man/systemd-resolved.8: man/systemd-resolved.service.8
-man/resolved.conf.d.html: man/resolved.conf.html
-	$(html-alias)
-
-man/systemd-resolved.html: man/systemd-resolved.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_RFKILL
-MANPAGES += \
-	man/systemd-rfkill@.service.8
-MANPAGES_ALIAS += \
-	man/systemd-rfkill.8
-man/systemd-rfkill.8: man/systemd-rfkill@.service.8
-man/systemd-rfkill.html: man/systemd-rfkill@.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_TIMEDATED
-MANPAGES += \
-	man/systemd-timedated.service.8 \
-	man/timedatectl.1
-MANPAGES_ALIAS += \
-	man/systemd-timedated.8
-man/systemd-timedated.8: man/systemd-timedated.service.8
-man/systemd-timedated.html: man/systemd-timedated.service.html
-	$(html-alias)
-
-endif
-
-if ENABLE_TIMESYNCD
-MANPAGES += \
-	man/systemd-timesyncd.service.8 \
-	man/timesyncd.conf.5
-MANPAGES_ALIAS += \
-	man/systemd-timesyncd.8 \
-	man/timesyncd.conf.d.5
-man/systemd-timesyncd.8: man/systemd-timesyncd.service.8
-man/timesyncd.conf.d.5: man/timesyncd.conf.5
-man/systemd-timesyncd.html: man/systemd-timesyncd.service.html
-	$(html-alias)
-
-man/timesyncd.conf.d.html: man/timesyncd.conf.html
-	$(html-alias)
-
-endif
-
-if ENABLE_VCONSOLE
-MANPAGES += \
-	man/systemd-vconsole-setup.service.8 \
-	man/vconsole.conf.5
-MANPAGES_ALIAS += \
-	man/systemd-vconsole-setup.8
-man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8
-man/systemd-vconsole-setup.html: man/systemd-vconsole-setup.service.html
-	$(html-alias)
-
-endif
-
-if HAVE_KMOD
-MANPAGES += \
-	man/modules-load.d.5 \
-	man/systemd-modules-load.service.8
-MANPAGES_ALIAS += \
-	man/systemd-modules-load.8
-man/systemd-modules-load.8: man/systemd-modules-load.service.8
-man/systemd-modules-load.html: man/systemd-modules-load.service.html
-	$(html-alias)
-
-endif
-
-if HAVE_LIBCRYPTSETUP
-MANPAGES += \
-	man/crypttab.5 \
-	man/systemd-cryptsetup-generator.8 \
-	man/systemd-cryptsetup@.service.8
-MANPAGES_ALIAS += \
-	man/systemd-cryptsetup.8
-man/systemd-cryptsetup.8: man/systemd-cryptsetup@.service.8
-man/systemd-cryptsetup.html: man/systemd-cryptsetup@.service.html
-	$(html-alias)
-
-endif
-
-if HAVE_MICROHTTPD
-MANPAGES += \
-	man/journal-remote.conf.5 \
-	man/systemd-journal-gatewayd.service.8 \
-	man/systemd-journal-remote.8 \
-	man/systemd-journal-upload.8
-MANPAGES_ALIAS += \
-	man/journal-remote.conf.d.5 \
-	man/systemd-journal-gatewayd.8 \
-	man/systemd-journal-gatewayd.socket.8
-man/journal-remote.conf.d.5: man/journal-remote.conf.5
-man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
-man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
-man/journal-remote.conf.d.html: man/journal-remote.conf.html
-	$(html-alias)
-
-man/systemd-journal-gatewayd.html: man/systemd-journal-gatewayd.service.html
-	$(html-alias)
-
-man/systemd-journal-gatewayd.socket.html: man/systemd-journal-gatewayd.service.html
-	$(html-alias)
-
-endif
-
-if HAVE_MYHOSTNAME
-MANPAGES += \
-	man/nss-myhostname.8
-MANPAGES_ALIAS += \
-	man/libnss_myhostname.so.2.8
-man/libnss_myhostname.so.2.8: man/nss-myhostname.8
-man/libnss_myhostname.so.2.html: man/nss-myhostname.html
-	$(html-alias)
-
-endif
-
 if HAVE_PAM
 MANPAGES += \
-	man/pam_systemd.8 \
+	man/pam_elogind.8 \
 	man/sd-login.3 \
 	man/sd_get_seats.3 \
 	man/sd_login_monitor_new.3 \
 	man/sd_pid_get_session.3 \
 	man/sd_seat_get_active.3 \
 	man/sd_session_is_active.3 \
-	man/sd_uid_get_state.3 \
-	man/systemd-user-sessions.service.8
+	man/sd_uid_get_state.3
 MANPAGES_ALIAS += \
 	man/sd_get_machine_names.3 \
 	man/sd_get_sessions.3 \
@@ -1443,8 +59,7 @@ MANPAGES_ALIAS += \
 	man/sd_uid_get_display.3 \
 	man/sd_uid_get_seats.3 \
 	man/sd_uid_get_sessions.3 \
-	man/sd_uid_is_on_seat.3 \
-	man/systemd-user-sessions.8
+	man/sd_uid_is_on_seat.3
 man/sd_get_machine_names.3: man/sd_get_seats.3
 man/sd_get_sessions.3: man/sd_get_seats.3
 man/sd_get_uids.3: man/sd_get_seats.3
@@ -1486,7 +101,6 @@ man/sd_uid_get_display.3: man/sd_uid_get_state.3
 man/sd_uid_get_seats.3: man/sd_uid_get_state.3
 man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
 man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
-man/systemd-user-sessions.8: man/systemd-user-sessions.service.8
 man/sd_get_machine_names.html: man/sd_get_seats.html
 	$(html-alias)
 
@@ -1610,220 +224,16 @@ man/sd_uid_get_sessions.html: man/sd_uid_get_state.html
 man/sd_uid_is_on_seat.html: man/sd_uid_get_state.html
 	$(html-alias)
 
-man/systemd-user-sessions.html: man/systemd-user-sessions.service.html
-	$(html-alias)
-
 endif
 
-# Really, do not edit this file.
-
 EXTRA_DIST += \
-	man/binfmt.d.xml \
-	man/bootchart.conf.xml \
-	man/bootctl.xml \
-	man/bootup.xml \
-	man/busctl.xml \
-	man/coredump.conf.xml \
-	man/coredumpctl.xml \
-	man/crypttab.xml \
-	man/daemon.xml \
-	man/file-hierarchy.xml \
-	man/halt.xml \
-	man/hostname.xml \
-	man/hostnamectl.xml \
-	man/hwdb.xml \
-	man/journal-remote.conf.xml \
-	man/journalctl.xml \
-	man/journald.conf.xml \
-	man/kernel-command-line.xml \
-	man/kernel-install.xml \
-	man/less-variables.xml \
-	man/libsystemd-pkgconfig.xml \
-	man/locale.conf.xml \
-	man/localectl.xml \
-	man/localtime.xml \
 	man/loginctl.xml \
+	man/logind.xml \
 	man/logind.conf.xml \
-	man/machine-id.xml \
-	man/machine-info.xml \
-	man/machinectl.xml \
-	man/modules-load.d.xml \
-	man/networkctl.xml \
-	man/nss-myhostname.xml \
-	man/nss-mymachines.xml \
-	man/os-release.xml \
-	man/pam_systemd.xml \
-	man/resolved.conf.xml \
-	man/runlevel.xml \
-	man/sd-daemon.xml \
-	man/sd-id128.xml \
-	man/sd-journal.xml \
-	man/sd-login.xml \
-	man/sd_booted.xml \
-	man/sd_bus_creds_get_pid.xml \
-	man/sd_bus_creds_new_from_pid.xml \
-	man/sd_bus_error.xml \
-	man/sd_bus_message_append.xml \
-	man/sd_bus_message_append_array.xml \
-	man/sd_bus_message_append_basic.xml \
-	man/sd_bus_message_append_string_memfd.xml \
-	man/sd_bus_message_append_strv.xml \
-	man/sd_bus_message_get_cookie.xml \
-	man/sd_bus_message_get_monotonic_usec.xml \
-	man/sd_bus_negotiate_fds.xml \
-	man/sd_bus_new.xml \
-	man/sd_bus_open_user.xml \
-	man/sd_bus_path_encode.xml \
-	man/sd_bus_request_name.xml \
-	man/sd_event_add_child.xml \
-	man/sd_event_add_defer.xml \
-	man/sd_event_add_signal.xml \
-	man/sd_event_add_time.xml \
-	man/sd_event_get_fd.xml \
-	man/sd_event_new.xml \
-	man/sd_event_run.xml \
-	man/sd_event_set_name.xml \
-	man/sd_event_wait.xml \
+	man/pam_elogind.xml \
 	man/sd_get_seats.xml \
-	man/sd_id128_get_machine.xml \
-	man/sd_id128_randomize.xml \
-	man/sd_id128_to_string.xml \
-	man/sd_is_fifo.xml \
-	man/sd_journal_add_match.xml \
-	man/sd_journal_get_catalog.xml \
-	man/sd_journal_get_cursor.xml \
-	man/sd_journal_get_cutoff_realtime_usec.xml \
-	man/sd_journal_get_data.xml \
-	man/sd_journal_get_fd.xml \
-	man/sd_journal_get_realtime_usec.xml \
-	man/sd_journal_get_usage.xml \
-	man/sd_journal_next.xml \
-	man/sd_journal_open.xml \
-	man/sd_journal_print.xml \
-	man/sd_journal_query_unique.xml \
-	man/sd_journal_seek_head.xml \
-	man/sd_journal_stream_fd.xml \
-	man/sd_listen_fds.xml \
 	man/sd_login_monitor_new.xml \
-	man/sd_machine_get_class.xml \
-	man/sd_notify.xml \
 	man/sd_pid_get_session.xml \
 	man/sd_seat_get_active.xml \
 	man/sd_session_is_active.xml \
-	man/sd_uid_get_state.xml \
-	man/sd_watchdog_enabled.xml \
-	man/shutdown.xml \
-	man/standard-conf.xml \
-	man/standard-options.xml \
-	man/sysctl.d.xml \
-	man/systemctl.xml \
-	man/systemd-activate.xml \
-	man/systemd-analyze.xml \
-	man/systemd-ask-password-console.service.xml \
-	man/systemd-ask-password.xml \
-	man/systemd-backlight@.service.xml \
-	man/systemd-binfmt.service.xml \
-	man/systemd-bootchart.xml \
-	man/systemd-bus-proxyd.xml \
-	man/systemd-bus-proxyd@.service.xml \
-	man/systemd-cat.xml \
-	man/systemd-cgls.xml \
-	man/systemd-cgtop.xml \
-	man/systemd-coredump.xml \
-	man/systemd-cryptsetup-generator.xml \
-	man/systemd-cryptsetup@.service.xml \
-	man/systemd-debug-generator.xml \
-	man/systemd-delta.xml \
-	man/systemd-detect-virt.xml \
-	man/systemd-efi-boot-generator.xml \
-	man/systemd-escape.xml \
-	man/systemd-firstboot.xml \
-	man/systemd-fsck@.service.xml \
-	man/systemd-fsckd.service.xml \
-	man/systemd-fstab-generator.xml \
-	man/systemd-getty-generator.xml \
-	man/systemd-gpt-auto-generator.xml \
-	man/systemd-halt.service.xml \
-	man/systemd-hibernate-resume-generator.xml \
-	man/systemd-hibernate-resume@.service.xml \
-	man/systemd-hostnamed.service.xml \
-	man/systemd-hwdb.xml \
-	man/systemd-inhibit.xml \
-	man/systemd-initctl.service.xml \
-	man/systemd-journal-gatewayd.service.xml \
-	man/systemd-journal-remote.xml \
-	man/systemd-journal-upload.xml \
-	man/systemd-journald.service.xml \
-	man/systemd-localed.service.xml \
-	man/systemd-logind.service.xml \
-	man/systemd-machine-id-commit.service.xml \
-	man/systemd-machine-id-commit.xml \
-	man/systemd-machine-id-setup.xml \
-	man/systemd-machined.service.xml \
-	man/systemd-modules-load.service.xml \
-	man/systemd-networkd-wait-online.service.xml \
-	man/systemd-networkd.service.xml \
-	man/systemd-notify.xml \
-	man/systemd-nspawn.xml \
-	man/systemd-path.xml \
-	man/systemd-quotacheck.service.xml \
-	man/systemd-random-seed.service.xml \
-	man/systemd-remount-fs.service.xml \
-	man/systemd-resolved.service.xml \
-	man/systemd-rfkill@.service.xml \
-	man/systemd-run.xml \
-	man/systemd-shutdownd.service.xml \
-	man/systemd-sleep.conf.xml \
-	man/systemd-socket-proxyd.xml \
-	man/systemd-suspend.service.xml \
-	man/systemd-sysctl.service.xml \
-	man/systemd-system-update-generator.xml \
-	man/systemd-system.conf.xml \
-	man/systemd-sysusers.xml \
-	man/systemd-sysv-generator.xml \
-	man/systemd-timedated.service.xml \
-	man/systemd-timesyncd.service.xml \
-	man/systemd-tmpfiles.xml \
-	man/systemd-tty-ask-password-agent.xml \
-	man/systemd-udevd.service.xml \
-	man/systemd-update-done.service.xml \
-	man/systemd-update-utmp.service.xml \
-	man/systemd-user-sessions.service.xml \
-	man/systemd-vconsole-setup.service.xml \
-	man/systemd.automount.xml \
-	man/systemd.device.xml \
-	man/systemd.directives.xml \
-	man/systemd.exec.xml \
-	man/systemd.generator.xml \
-	man/systemd.index.xml \
-	man/systemd.journal-fields.xml \
-	man/systemd.kill.xml \
-	man/systemd.link.xml \
-	man/systemd.mount.xml \
-	man/systemd.netdev.xml \
-	man/systemd.network.xml \
-	man/systemd.path.xml \
-	man/systemd.preset.xml \
-	man/systemd.resource-control.xml \
-	man/systemd.scope.xml \
-	man/systemd.service.xml \
-	man/systemd.slice.xml \
-	man/systemd.snapshot.xml \
-	man/systemd.socket.xml \
-	man/systemd.special.xml \
-	man/systemd.swap.xml \
-	man/systemd.target.xml \
-	man/systemd.time.xml \
-	man/systemd.timer.xml \
-	man/systemd.unit.xml \
-	man/systemd.xml \
-	man/sysusers.d.xml \
-	man/telinit.xml \
-	man/timedatectl.xml \
-	man/timesyncd.conf.xml \
-	man/tmpfiles.d.xml \
-	man/udev.conf.xml \
-	man/udev.xml \
-	man/udevadm.xml \
-	man/user-system-options.xml \
-	man/vconsole.conf.xml
+	man/sd_uid_get_state.xml
diff --git a/Makefile.am b/Makefile.am
index bc23c2485b..78e0740d4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,9 +155,12 @@ CLEANFILES = $(BUILT_SOURCES) \
 	$(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \
 	$(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS)
 
+# FIXME a different pkttyagent path...
+
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
+	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
 	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
 	-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
 	-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
@@ -190,6 +193,10 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/systemd \
 	-I $(top_builddir)/src/core \
 	-I $(top_srcdir)/src/core \
+	-I $(top_srcdir)/src/libsystemd/sd-bus \
+	-I $(top_srcdir)/src/libsystemd/sd-event \
+	-I $(top_srcdir)/src/libsystemd/sd-device \
+	$(UDEV_CFLAGS) \
 	$(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -329,7 +336,6 @@ dist_doc_DATA = \
 	LICENSE.LGPL2.1 \
 	LICENSE.GPL2 \
 	LICENSE.MIT \
-	DISTRO_PORTING \
 	src/libsystemd/sd-bus/PORTING-DBUS1 \
 	src/libsystemd/sd-bus/DIFFERENCES \
 	src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
@@ -476,8 +482,6 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/unit-name.h \
 	src/shared/watchdog.c \
 	src/shared/watchdog.h \
-	src/shared/spawn-ask-password-agent.c \
-	src/shared/spawn-ask-password-agent.h \
 	src/shared/replace-var.c \
 	src/shared/replace-var.h \
 	src/shared/spawn-polkit-agent.c \
@@ -519,6 +523,16 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/xml.h \
 	src/shared/json.c \
 	src/shared/json.h \
+	src/shared/selinux-util.c \
+	src/shared/selinux-util.h \
+	src/shared/smack-util.c \
+	src/shared/smack-util.h \
+	src/shared/label.c \
+	src/shared/label.h \
+	src/shared/socket-label.c \
+	src/shared/mkdir-label.c \
+	src/shared/fileio-label.h \
+	src/shared/fileio-label.c \
 	src/shared/bus-label.c \
 	src/shared/bus-label.h \
 	src/shared/gpt.h \
@@ -621,10 +635,6 @@ libsystemd_core_la_SOURCES = \
 	src/core/snapshot.h \
 	src/core/device.c \
 	src/core/device.h \
-	src/core/mount.c \
-	src/core/mount.h \
-	src/core/automount.c \
-	src/core/automount.h \
 	src/core/swap.c \
 	src/core/swap.h \
 	src/core/timer.c \
@@ -661,10 +671,6 @@ libsystemd_core_la_SOURCES = \
 	src/core/dbus-snapshot.h \
 	src/core/dbus-device.c \
 	src/core/dbus-device.h \
-	src/core/dbus-mount.c \
-	src/core/dbus-mount.h \
-	src/core/dbus-automount.c \
-	src/core/dbus-automount.h \
 	src/core/dbus-swap.c \
 	src/core/dbus-swap.h \
 	src/core/dbus-timer.c \
@@ -697,12 +703,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/hostname-setup.h \
 	src/core/machine-id-setup.c \
 	src/core/machine-id-setup.h \
-	src/core/mount-setup.c \
-	src/core/mount-setup.h \
 	src/core/kmod-setup.c \
 	src/core/kmod-setup.h \
-	src/core/loopback-setup.h \
-	src/core/loopback-setup.c \
 	src/core/namespace.c \
 	src/core/namespace.h \
 	src/core/killall.h \
@@ -725,7 +727,6 @@ libsystemd_core_la_CFLAGS = \
 
 libsystemd_core_la_LIBADD = \
 	libsystemd-shared.la \
-	libsystemd-internal.la \
 	$(PAM_LIBS)
 
 src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
@@ -819,7 +820,10 @@ dist_factory_pam_DATA = \
 endif
 
 # ------------------------------------------------------------------------------
-libsystemd_la_SOURCES = \
+noinst_LTLIBRARIES += \
+	libsystemd-internal.la
+
+libsystemd_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
 	src/systemd/sd-bus-vtable.h \
@@ -832,7 +836,6 @@ libsystemd_la_SOURCES = \
 	src/systemd/sd-daemon.h \
 	src/systemd/sd-path.h \
 	src/systemd/sd-network.h \
-	src/systemd/sd-hwdb.h \
 	src/systemd/sd-device.h \
 	src/libsystemd/sd-bus/sd-bus.c \
 	src/libsystemd/sd-bus/bus-control.c \
@@ -895,27 +898,28 @@ libsystemd_la_SOURCES = \
 	src/libsystemd/sd-network/sd-network.c \
 	src/libsystemd/sd-network/network-util.h \
 	src/libsystemd/sd-network/network-util.c \
-	src/libsystemd/sd-hwdb/sd-hwdb.c \
-	src/libsystemd/sd-hwdb/hwdb-util.h \
-	src/libsystemd/sd-hwdb/hwdb-intenal.h \
 	src/libsystemd/sd-device/device-internal.h \
 	src/libsystemd/sd-device/device-util.h \
 	src/libsystemd/sd-device/sd-device.c \
 	src/libsystemd/sd-device/device-private.c \
 	src/libsystemd/sd-device/device-private.h
 
-nodist_libsystemd_la_SOURCES = \
+nodist_libsystemd_internal_la_SOURCES = \
 	src/libsystemd/libsystemd.sym
 
-libsystemd_la_CFLAGS = \
+libsystemd_internal_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-pthread
 
-libsystemd_la_LIBADD = \
+BUILT_SOURCES += \
+       src/libsystemd/libsystemd.sym
+
+
+libsystemd_internal_la_LIBADD = \
 	$(RT_LIBS) \
 	libsystemd-shared.la
 
-libsystemd_la_LDFLAGS = \
+libsystemd_internal_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
 	-Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
@@ -935,9 +939,6 @@ pkgconfiglib_DATA += \
 pkginclude_HEADERS += \
 	src/systemd/sd-login.h
 
-lib_LTLIBRARIES += \
-	libsystemd.la
-
 # ------------------------------------------------------------------------------
 systemd_logind_SOURCES = \
 	src/login/logind.c \
@@ -974,9 +975,8 @@ libsystemd_logind_core_la_SOURCES = \
 	src/login/logind-acl.h
 
 libsystemd_logind_core_la_LIBADD = \
-	libsystemd-label.la \
-	libudev-internal.la \
 	$(UDEV_LIBS) \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 if HAVE_ACL
@@ -1001,8 +1001,6 @@ loginctl_SOURCES = \
 loginctl_LDADD = \
 	$(UDEV_LIBS) \
 	libsystemd-internal.la \
-	libsystemd-logs.la \
-	libsystemd-journal-internal.la \
 	libsystemd-shared.la
 
 rootbin_PROGRAMS += \
@@ -1149,7 +1147,6 @@ substitutions = \
        '|userunitdir=$(userunitdir)|' \
        '|systempresetdir=$(systempresetdir)|' \
        '|userpresetdir=$(userpresetdir)|' \
-       '|udevhwdbdir=$(udevhwdbdir)|' \
        '|udevrulesdir=$(udevrulesdir)|' \
        '|catalogdir=$(catalogdir)|' \
        '|tmpfilesdir=$(tmpfilesdir)|' \
@@ -1333,8 +1330,6 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
 clean-local: $(CLEAN_LOCAL_HOOKS)
 	rm -rf $(abs_srcdir)/install-tree
-	rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
-	      $(abs_srcdir)/hwdb/iab.txt
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
diff --git a/configure.ac b/configure.ac
index 1851c073a4..64d8b213ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,6 +316,9 @@ AS_IF([test "x$enable_dbus" != "xno"], [
 AM_CONDITIONAL(HAVE_DBUS, [test "$have_dbus" = "yes"])
 
 # ------------------------------------------------------------------------------
+PKG_CHECK_MODULES(UDEV, [libudev])
+
+# ------------------------------------------------------------------------------
 have_compat_libs=no
 AC_ARG_ENABLE([compat_libs], AS_HELP_STRING([--enable-compat-libs],[Enable creation of compatibility libraries]),
                 [case "${enableval}" in
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
new file mode 100644
index 0000000000..5730bed4a1
--- /dev/null
+++ b/man/custom-html.xsl
@@ -0,0 +1,264 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+
+<!--
+  This file is part of systemd.
+
+  Copyright 2011 Lennart Poettering
+
+  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/>.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+
+<!-- translate man page references to links to html pages -->
+<xsl:template match="citerefentry[not(@project)]">
+  <a>
+    <xsl:attribute name="href">
+      <xsl:value-of select="refentrytitle"/><xsl:text>.html</xsl:text>
+    </xsl:attribute>
+    <xsl:call-template name="inline.charseq"/>
+  </a>
+</xsl:template>
+
+<xsl:template match="citerefentry[@project='man-pages'] | citerefentry[manvolnum='2'] | citerefentry[manvolnum='4']">
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>http://man7.org/linux/man-pages/man</xsl:text>
+      <xsl:value-of select="manvolnum"/>
+      <xsl:text>/</xsl:text>
+      <xsl:value-of select="refentrytitle"/>
+      <xsl:text>.</xsl:text>
+      <xsl:value-of select="manvolnum"/>
+      <xsl:text>.html</xsl:text>
+    </xsl:attribute>
+    <xsl:call-template name="inline.charseq"/>
+  </a>
+</xsl:template>
+
+<xsl:template match="citerefentry[@project='die-net']">
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>http://linux.die.net/man/</xsl:text>
+      <xsl:value-of select="manvolnum"/>
+      <xsl:text>/</xsl:text>
+      <xsl:value-of select="refentrytitle"/>
+    </xsl:attribute>
+    <xsl:call-template name="inline.charseq"/>
+  </a>
+</xsl:template>
+
+<xsl:template match="citerefentry[@project='mankier']">
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>https://www.mankier.com/</xsl:text>
+      <xsl:value-of select="manvolnum"/>
+      <xsl:text>/</xsl:text>
+      <xsl:value-of select="refentrytitle"/>
+    </xsl:attribute>
+    <xsl:call-template name="inline.charseq"/>
+  </a>
+</xsl:template>
+
+<xsl:template match="citerefentry[@project='archlinux']">
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>https://www.archlinux.org/</xsl:text>
+      <xsl:value-of select="refentrytitle"/>
+      <xsl:text>/</xsl:text>
+      <xsl:value-of select="refentrytitle"/>
+      <xsl:text>.</xsl:text>
+      <xsl:value-of select="manvolnum"/>
+      <xsl:text>.html</xsl:text>
+    </xsl:attribute>
+    <xsl:call-template name="inline.charseq"/>
+  </a>
+</xsl:template>
+
+<xsl:template match="citerefentry[@project='freebsd']">
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>https://www.freebsd.org/cgi/man.cgi?</xsl:text>
+      <xsl:value-of select="refentrytitle"/>
+      <xsl:text>(</xsl:text>
+      <xsl:value-of select="manvolnum"/>
+      <xsl:text>)</xsl:text>
+    </xsl:attribute>
+    <xsl:call-template name="inline.charseq"/>
+  </a>
+</xsl:template>
+
+<xsl:template match="citerefentry[@project='dbus']">
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>http://dbus.freedesktop.org/doc/</xsl:text>
+      <xsl:value-of select="refentrytitle"/>
+      <xsl:text>.</xsl:text>
+      <xsl:value-of select="manvolnum"/>
+      <xsl:text>.html</xsl:text>
+    </xsl:attribute>
+    <xsl:call-template name="inline.charseq"/>
+  </a>
+</xsl:template>
+
+<xsl:template match="refsect1/title|refsect1/info/title">
+  <!-- the ID is output in the block.object call for refsect1 -->
+  <h2>
+    <xsl:attribute name="id">
+      <xsl:call-template name="inline.charseq"/>
+    </xsl:attribute>
+    <xsl:apply-templates/>
+    <a>
+      <xsl:attribute name="class">
+        <xsl:text>headerlink</xsl:text>
+      </xsl:attribute>
+      <xsl:attribute name="title">
+        <xsl:text>Permalink to this headline</xsl:text>
+      </xsl:attribute>
+      <xsl:attribute name="href">
+        <xsl:text>#</xsl:text>
+        <xsl:call-template name="inline.charseq"/>
+      </xsl:attribute>
+      <xsl:text>¶</xsl:text>
+    </a>
+  </h2>
+</xsl:template>
+
+<xsl:template match="refsect2/title|refsect2/info/title">
+  <h3>
+    <xsl:attribute name="id">
+      <xsl:call-template name="inline.charseq"/>
+    </xsl:attribute>
+    <xsl:apply-templates/>
+    <a>
+      <xsl:attribute name="class">
+        <xsl:text>headerlink</xsl:text>
+      </xsl:attribute>
+      <xsl:attribute name="title">
+        <xsl:text>Permalink to this headline</xsl:text>
+      </xsl:attribute>
+      <xsl:attribute name="href">
+        <xsl:text>#</xsl:text>
+        <xsl:call-template name="inline.charseq"/>
+      </xsl:attribute>
+      <xsl:text>¶</xsl:text>
+    </a>
+  </h3>
+</xsl:template>
+
+<xsl:template match="varlistentry">
+  <dt>
+    <xsl:attribute name="id">
+      <xsl:call-template name="inline.charseq">
+        <xsl:with-param name="content">
+          <xsl:copy-of select="term[position()=1]" />
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:attribute>
+    <xsl:apply-templates select="term"/>
+    <a>
+      <xsl:attribute name="class">
+        <xsl:text>headerlink</xsl:text>
+      </xsl:attribute>
+      <xsl:attribute name="title">
+        <xsl:text>Permalink to this term</xsl:text>
+      </xsl:attribute>
+      <xsl:attribute name="href">
+        <!--        <xsl:call-template name="href.target.uri" /> -->
+        <xsl:text>#</xsl:text>
+        <xsl:call-template name="inline.charseq">
+          <xsl:with-param name="content">
+            <xsl:copy-of select="term[position()=1]" />
+          </xsl:with-param>
+        </xsl:call-template>
+      </xsl:attribute>
+      <xsl:text>¶</xsl:text>
+    </a>
+  </dt>
+  <dd>
+    <xsl:apply-templates select="listitem"/>
+  </dd>
+</xsl:template>
+
+
+<!-- add Index link at top of page -->
+<xsl:template name="user.header.content">
+  <style>
+    a.headerlink {
+      color: #c60f0f;
+      font-size: 0.8em;
+      padding: 0 4px 0 4px;
+      text-decoration: none;
+      visibility: hidden;
+    }
+
+    a.headerlink:hover {
+      background-color: #c60f0f;
+      color: white;
+    }
+
+    h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink {
+      visibility: visible;
+    }
+  </style>
+
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>index.html</xsl:text>
+    </xsl:attribute>
+    <xsl:text>Index </xsl:text>
+  </a>·
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>systemd.directives.html</xsl:text>
+    </xsl:attribute>
+    <xsl:text>Directives </xsl:text>
+  </a>·
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>../python-systemd/index.html</xsl:text>
+    </xsl:attribute>
+    <xsl:text>Python </xsl:text>
+  </a>·
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>../libudev/index.html</xsl:text>
+    </xsl:attribute>
+    <xsl:text>libudev </xsl:text>
+  </a>·
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>../libudev/index.html</xsl:text>
+    </xsl:attribute>
+    <xsl:text>gudev </xsl:text>
+  </a>
+
+  <span style="float:right">
+    <xsl:text>systemd </xsl:text>
+    <xsl:value-of select="$systemd.version"/>
+  </span>
+  <hr/>
+</xsl:template>
+
+<xsl:template match="literal">
+  <xsl:text>"</xsl:text>
+  <xsl:call-template name="inline.monoseq"/>
+  <xsl:text>"</xsl:text>
+</xsl:template>
+
+<!-- Switch things to UTF-8, ISO-8859-1 is soo yesteryear -->
+<xsl:output method="html" encoding="UTF-8" indent="no"/>
+
+</xsl:stylesheet>
diff --git a/man/custom-man.xsl b/man/custom-man.xsl
new file mode 100644
index 0000000000..e1b8d3618a
--- /dev/null
+++ b/man/custom-man.xsl
@@ -0,0 +1,64 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+
+<!--
+  This file is part of systemd.
+
+  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+
+  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/>.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:exsl="http://exslt.org/common"
+                extension-element-prefixes="exsl"
+                version="1.0">
+
+<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
+
+<xsl:template name="top.comment" />
+
+<xsl:template name="TH.title.line">
+    <xsl:param name="title"/>
+    <xsl:param name="section"/>
+    <xsl:param name="extra1"/>
+    <xsl:param name="extra2"/>
+    <xsl:param name="extra3"/>
+
+    <xsl:call-template name="mark.subheading"/>
+    <xsl:text>.TH "</xsl:text>
+    <xsl:call-template name="string.upper">
+      <xsl:with-param name="string">
+        <xsl:value-of select="normalize-space($title)"/>
+      </xsl:with-param>
+    </xsl:call-template>
+    <xsl:text>" "</xsl:text>
+    <xsl:value-of select="normalize-space($section)"/>
+    <xsl:text>" "" "systemd </xsl:text>
+    <xsl:value-of select="$systemd.version"/>
+    <xsl:text>" "</xsl:text>
+    <xsl:value-of select="normalize-space($extra3)"/>
+    <xsl:text>"&#10;</xsl:text>
+    <xsl:call-template name="mark.subheading"/>
+</xsl:template>
+
+<xsl:template match="literal">
+  <xsl:if test="$man.hyphenate.computer.inlines = 0">
+    <xsl:call-template name="suppress.hyphenation"/>
+  </xsl:if>
+  <xsl:text>"</xsl:text>
+  <xsl:call-template name="inline.monoseq"/>
+  <xsl:text>"</xsl:text>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/man/systemd-logind.service.xml b/man/logind.xml
index 5733e42cd1..5733e42cd1 100644
--- a/man/systemd-logind.service.xml
+++ b/man/logind.xml
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 6b8abb4802..b28137789e 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -933,7 +933,8 @@ int manager_setup_cgroup(Manager *m) {
 
                 /* 3. Install agent */
                 if (m->running_as == SYSTEMD_SYSTEM) {
-                        r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH);
+                        r = -EINVAL;
+                        // cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH);
                         if (r < 0)
                                 log_warning_errno(r, "Failed to install release agent, ignoring: %m");
                         else if (r > 0)
diff --git a/src/core/execute.c b/src/core/execute.c
index 02df51b5bb..027e3319ed 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -61,7 +61,6 @@
 #include "namespace.h"
 #include "exit-status.h"
 #include "missing.h"
-#include "utmp-wtmp.h"
 #include "def.h"
 #include "path-util.h"
 #include "env-util.h"
diff --git a/src/core/service.c b/src/core/service.c
index d9385504e8..beaf21340f 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -347,7 +347,7 @@ static int service_add_fd_store(Service *s, int fd) {
                 return 0;
 
         LIST_FOREACH(fd_store, fs, s->fd_store) {
-                r = same_fd(fs->fd, fd);
+                r = -EINVAL;
                 if (r < 0)
                         return r;
                 if (r > 0) {
diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c b/src/libsystemd/sd-rtnl/rtnl-types.c
index 5ae47900a3..455ae28d19 100644
--- a/src/libsystemd/sd-rtnl/rtnl-types.c
+++ b/src/libsystemd/sd-rtnl/rtnl-types.c
@@ -357,8 +357,8 @@ static const NLType rtnl_address_types[IFA_MAX + 1] = {
 /*
         [IFA_ANYCAST],
         [IFA_MULTICAST],
-*/
         [IFA_FLAGS]             = { .type = NLA_U32 },
+*/
 };
 
 static const NLTypeSystem rtnl_address_type_system = {
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index ec102ae4c7..6c173ed61a 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -492,7 +492,7 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
         if (i.scope) {
                 printf("\t    Unit: %s\n", i.scope);
                 show_unit_cgroup(bus, "org.freedesktop.systemd1.Scope", i.scope, i.leader);
-
+#if 0
                 if (arg_transport == BUS_TRANSPORT_LOCAL) {
 
                         show_journal_by_unit(
@@ -508,6 +508,7 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
                                         true,
                                         NULL);
                 }
+#endif
         }
 
         return 0;
@@ -576,7 +577,7 @@ static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line)
         if (i.slice) {
                 printf("\t    Unit: %s\n", i.slice);
                 show_unit_cgroup(bus, "org.freedesktop.systemd1.Slice", i.slice, 0);
-
+#if 0
                 show_journal_by_unit(
                                 stdout,
                                 i.slice,
@@ -589,6 +590,7 @@ static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line)
                                 SD_JOURNAL_LOCAL_ONLY,
                                 true,
                                 NULL);
+#endif
         }
 
 finish:
@@ -1272,7 +1274,11 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 'o':
+#if 0
                         arg_output = output_mode_from_string(optarg);
+#else
+                        arg_output = -1;
+#endif
                         if (arg_output < 0) {
                                 log_error("Unknown output '%s'.", optarg);
                                 return -EINVAL;
diff --git a/src/shared/build.h b/src/shared/build.h
index b0a5a72467..653a505e68 100644
--- a/src/shared/build.h
+++ b/src/shared/build.h
@@ -130,7 +130,6 @@
         _IMA_FEATURE_ " "                                               \
         _APPARMOR_FEATURE_ " "                                          \
         _SMACK_FEATURE_ " "                                             \
-        _SYSVINIT_FEATURE_ " "                                          \
         _LIBCRYPTSETUP_FEATURE_ " "                                     \
         _GCRYPT_FEATURE_ " "                                            \
         _GNUTLS_FEATURE_ " "                                            \
diff --git a/src/shared/missing.h b/src/shared/missing.h
index ca670cea43..4abd0232f8 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -930,13 +930,3 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
 #ifndef RENAME_NOREPLACE
 #define RENAME_NOREPLACE (1 << 0)
 #endif
-
-#if !HAVE_DECL_KCMP
-static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) {
-        return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2);
-}
-#endif
-
-#ifndef KCMP_FILE
-#define KCMP_FILE 0
-#endif
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index 5f09ce181f..0a7741afef 100644
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "udev.h"
+#include "libudev.h"
 #include "util.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev*, udev_unref);
diff --git a/src/shared/util.c b/src/shared/util.c
index 605fffcb7a..72984735ce 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -7794,71 +7794,6 @@ int fd_setcrtime(int fd, usec_t usec) {
         return 0;
 }
 
-int same_fd(int a, int b) {
-        struct stat sta, stb;
-        pid_t pid;
-        int r, fa, fb;
-
-        assert(a >= 0);
-        assert(b >= 0);
-
-        /* Compares two file descriptors. Note that semantics are
-         * quite different depending on whether we have kcmp() or we
-         * don't. If we have kcmp() this will only return true for
-         * dup()ed file descriptors, but not otherwise. If we don't
-         * have kcmp() this will also return true for two fds of the same
-         * file, created by separate open() calls. Since we use this
-         * call mostly for filtering out duplicates in the fd store
-         * this difference hopefully doesn't matter too much. */
-
-        if (a == b)
-                return true;
-
-        /* Try to use kcmp() if we have it. */
-        pid = getpid();
-        r = kcmp(pid, pid, KCMP_FILE, a, b);
-        if (r == 0)
-                return true;
-        if (r > 0)
-                return false;
-        if (errno != ENOSYS)
-                return -errno;
-
-        /* We don't have kcmp(), use fstat() instead. */
-        if (fstat(a, &sta) < 0)
-                return -errno;
-
-        if (fstat(b, &stb) < 0)
-                return -errno;
-
-        if ((sta.st_mode & S_IFMT) != (stb.st_mode & S_IFMT))
-                return false;
-
-        /* We consider all device fds different, since two device fds
-         * might refer to quite different device contexts even though
-         * they share the same inode and backing dev_t. */
-
-        if (S_ISCHR(sta.st_mode) || S_ISBLK(sta.st_mode))
-                return false;
-
-        if (sta.st_dev != stb.st_dev || sta.st_ino != stb.st_ino)
-                return false;
-
-        /* The fds refer to the same inode on disk, let's also check
-         * if they have the same fd flags. This is useful to
-         * distuingish the read and write side of a pipe created with
-         * pipe(). */
-        fa = fcntl(a, F_GETFL);
-        if (fa < 0)
-                return -errno;
-
-        fb = fcntl(b, F_GETFL);
-        if (fb < 0)
-                return -errno;
-
-        return fa == fb;
-}
-
 int chattr_fd(int fd, bool b, unsigned mask) {
         unsigned old_attr, new_attr;
 
diff --git a/src/shared/util.h b/src/shared/util.h
index 124c7c06d4..11cc10ba30 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -1054,8 +1054,6 @@ int fd_getcrtime(int fd, usec_t *usec);
 int path_getcrtime(const char *p, usec_t *usec);
 int fd_getcrtime_at(int dirfd, const char *name, usec_t *usec, int flags);
 
-int same_fd(int a, int b);
-
 int chattr_fd(int fd, bool b, unsigned mask);
 int chattr_path(const char *p, bool b, unsigned mask);
 int change_attr_fd(int fd, unsigned value, unsigned mask);