build-sys: move public header files into a dir of their own

31 files changed, 59 insertions, 35 deletions

diff --git a/Makefile.am b/Makefile.am
index e668c09dd1..0c8804f481 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,7 +100,8 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src \
 	-I $(top_srcdir)/src/readahead \
 	-I $(top_srcdir)/src/login \
-	-I $(top_srcdir)/src/journal
+	-I $(top_srcdir)/src/journal \
+	-I $(top_srcdir)/src/systemd
 
 if TARGET_GENTOO
 AM_CPPFLAGS += \
@@ -1053,7 +1054,7 @@ libsystemd_daemon_la_LDFLAGS = \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
 
 pkginclude_HEADERS += \
-	src/sd-daemon.h
+	src/systemd/sd-daemon.h
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-daemon-install-hook:
@@ -1131,7 +1132,7 @@ noinst_PROGRAMS += \
 	test-id128
 
 pkginclude_HEADERS += \
-	src/sd-id128.h
+	src/systemd/sd-id128.h
 
 lib_LTLIBRARIES += \
 	libsystemd-id128.la
@@ -1290,8 +1291,8 @@ noinst_PROGRAMS += \
 	test-journal
 
 pkginclude_HEADERS += \
-	src/journal/sd-journal.h \
-        src/journal/sd-messages.h
+	src/systemd/sd-journal.h \
+        src/systemd/sd-messages.h
 
 lib_LTLIBRARIES += \
 	libsystemd-journal.la
@@ -1451,7 +1452,7 @@ nodist_systemunit_DATA += \
 	units/systemd-readahead-done.service
 
 EXTRA_DIST += \
-	src/readahead/sd-readahead.h \
+	src/systemd/sd-readahead.h \
 	src/readahead/readahead-common.h \
 	units/systemd-readahead-collect.service.in \
 	units/systemd-readahead-replay.service.in \
@@ -1878,7 +1879,7 @@ dist_pkgsysconf_DATA += \
 	src/login/systemd-logind.conf
 
 pkginclude_HEADERS += \
-	src/login/sd-login.h
+	src/systemd/sd-login.h
 
 lib_LTLIBRARIES += \
 	libsystemd-login.la
diff --git a/src/initctl.c b/src/initctl.c
index 097c85fdd4..e2189e9ee1 100644
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -34,13 +34,13 @@
 #include <ctype.h>
 
 #include <dbus/dbus.h>
+#include <systemd/sd-daemon.h>
 
 #include "util.h"
 #include "log.h"
 #include "list.h"
 #include "initreq.h"
 #include "special.h"
-#include "sd-daemon.h"
 #include "dbus-common.h"
 #include "def.h"
 
diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
index ef0cb6dae6..964e0c2b81 100644
--- a/src/journal/journal-def.h
+++ b/src/journal/journal-def.h
@@ -24,8 +24,9 @@
 
 #include <inttypes.h>
 
+#include <systemd/sd-id128.h>
+
 #include "macro.h"
-#include "sd-id128.h"
 
 typedef struct Header Header;
 typedef struct ObjectHeader ObjectHeader;
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index 51d7119d09..0be3932921 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -24,9 +24,10 @@
 
 #include <inttypes.h>
 
+#include <systemd/sd-id128.h>
+
 #include "journal-def.h"
 #include "util.h"
-#include "sd-id128.h"
 
 typedef struct Window {
         void *ptr;
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index 1b64666da3..e5914bfb63 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -26,8 +26,9 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
+#include <systemd/sd-id128.h>
+
 #include "list.h"
-#include "sd-id128.h"
 
 typedef struct Match Match;
 
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 17d6a7fc23..2e708e959b 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -30,7 +30,8 @@
 #include <time.h>
 #include <getopt.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
+
 #include "log.h"
 #include "util.h"
 #include "build.h"
diff --git a/src/journal/journald.c b/src/journal/journald.c
index d6206a802f..d7f0ed52b4 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -32,19 +32,20 @@
 #include <linux/sockios.h>
 #include <sys/statvfs.h>
 
+#include <systemd/sd-journal.h>
+#include <systemd/sd-login.h>
+#include <systemd/sd-messages.h>
+#include <systemd/sd-daemon.h>
+
 #include "hashmap.h"
 #include "journal-file.h"
-#include "sd-daemon.h"
 #include "socket-util.h"
 #include "acl-util.h"
 #include "cgroup-util.h"
 #include "list.h"
 #include "journal-rate-limit.h"
-#include "sd-journal.h"
-#include "sd-login.h"
 #include "journal-internal.h"
 #include "conf-parser.h"
-#include "sd-messages.h"
 #include "journald.h"
 
 #define USER_JOURNALS_MAX 1024
diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 3d429bea90..a023509b70 100644
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -22,7 +22,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
+
 #include "journal-file.h"
 #include "log.h"
 
diff --git a/src/kmsg-syslogd.c b/src/kmsg-syslogd.c
index f42f72c2ad..da83bb2b1e 100644
--- a/src/kmsg-syslogd.c
+++ b/src/kmsg-syslogd.c
@@ -33,9 +33,10 @@
 #include <fcntl.h>
 #include <sys/signalfd.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "util.h"
 #include "log.h"
-#include "sd-daemon.h"
 #include "fdset.h"
 
 #define SERVER_FD_MAX 16
diff --git a/src/login/logind.c b/src/login/logind.c
index 99534a52ed..4aeac0cc2e 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -29,8 +29,9 @@
 #include <sys/ioctl.h>
 #include <linux/vt.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "logind.h"
-#include "sd-daemon.h"
 #include "dbus-common.h"
 #include "dbus-loop.h"
 #include "strv.h"
diff --git a/src/login/pam-module.c b/src/login/pam-module.c
index 14e706b374..82594c30d5 100644
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -32,9 +32,10 @@
 #include <security/pam_ext.h>
 #include <security/pam_misc.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "util.h"
 #include "macro.h"
-#include "sd-daemon.h"
 #include "strv.h"
 #include "dbus-common.h"
 #include "def.h"
diff --git a/src/login/test-login.c b/src/login/test-login.c
index 7d6f08202d..ae041b6a59 100644
--- a/src/login/test-login.c
+++ b/src/login/test-login.c
@@ -22,7 +22,8 @@
 #include <sys/poll.h>
 #include <string.h>
 
-#include "sd-login.h"
+#include <systemd/sd-login.h>
+
 #include "util.h"
 #include "strv.h"
 
diff --git a/src/login/uaccess.c b/src/login/uaccess.c
index 49ac4af0f4..e1af5bf431 100644
--- a/src/login/uaccess.c
+++ b/src/login/uaccess.c
@@ -22,11 +22,12 @@
 #include <errno.h>
 #include <string.h>
 
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-login.h>
+
 #include "logind-acl.h"
 #include "util.h"
 #include "log.h"
-#include "sd-daemon.h"
-#include "sd-login.h"
 
 int main(int argc, char *argv[]) {
         int r;
diff --git a/src/logs-show.h b/src/logs-show.h
index 5cf1a6369b..d3f3c75960 100644
--- a/src/logs-show.h
+++ b/src/logs-show.h
@@ -24,7 +24,8 @@
 
 #include <stdbool.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
+
 #include "util.h"
 
 typedef enum OutputMode {
diff --git a/src/machine-id-setup.c b/src/machine-id-setup.c
index 9b25b10438..531f3b2073 100644
--- a/src/machine-id-setup.c
+++ b/src/machine-id-setup.c
@@ -27,11 +27,12 @@
 #include <fcntl.h>
 #include <sys/mount.h>
 
+#include <systemd/sd-id128.h>
+
 #include "machine-id-setup.h"
 #include "macro.h"
 #include "util.h"
 #include "log.h"
-#include "sd-id128.h"
 
 static int generate(char id[34]) {
         int fd, r;
diff --git a/src/manager.c b/src/manager.c
index 9957bbf12a..7fd860ed06 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -41,6 +41,8 @@
 #include <libaudit.h>
 #endif
 
+#include <systemd/sd-daemon.h>
+
 #include "manager.h"
 #include "hashmap.h"
 #include "macro.h"
@@ -58,7 +60,6 @@
 #include "special.h"
 #include "bus-errors.h"
 #include "exit-status.h"
-#include "sd-daemon.h"
 #include "virt.h"
 
 /* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
diff --git a/src/notify.c b/src/notify.c
index a9bc51e2db..9d52bdfdd3 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -27,10 +27,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "strv.h"
 #include "util.h"
 #include "log.h"
-#include "sd-daemon.h"
 #include "sd-readahead.h"
 
 static bool arg_ready = false;
diff --git a/src/nspawn.c b/src/nspawn.c
index 3ea603f235..b8b379d991 100644
--- a/src/nspawn.c
+++ b/src/nspawn.c
@@ -39,11 +39,12 @@
 #include <grp.h>
 #include <linux/fs.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "log.h"
 #include "util.h"
 #include "missing.h"
 #include "cgroup-util.h"
-#include "sd-daemon.h"
 #include "strv.h"
 #include "loopback-setup.h"
 
diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c
index eac11e7e5c..6bff32f4dd 100644
--- a/src/readahead/readahead-collect.c
+++ b/src/readahead/readahead-collect.c
@@ -43,10 +43,11 @@
 #include <getopt.h>
 #include <sys/inotify.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "missing.h"
 #include "util.h"
 #include "set.h"
-#include "sd-daemon.h"
 #include "ioprio.h"
 #include "readahead-common.h"
 #include "virt.h"
diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c
index 65011ac4be..88c7a219a8 100644
--- a/src/readahead/readahead-replay.c
+++ b/src/readahead/readahead-replay.c
@@ -35,10 +35,11 @@
 #include <getopt.h>
 #include <sys/inotify.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "missing.h"
 #include "util.h"
 #include "set.h"
-#include "sd-daemon.h"
 #include "ioprio.h"
 #include "readahead-common.h"
 #include "virt.h"
diff --git a/src/sd-id128.c b/src/sd-id128.c
index 387cf919b0..289bcdc4ff 100644
--- a/src/sd-id128.c
+++ b/src/sd-id128.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "sd-id128.h"
+
 #include "util.h"
 #include "macro.h"
 
diff --git a/src/shutdownd.c b/src/shutdownd.c
index 46856b01ad..19b16cbe39 100644
--- a/src/shutdownd.c
+++ b/src/shutdownd.c
@@ -29,11 +29,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "shutdownd.h"
 #include "log.h"
 #include "macro.h"
 #include "util.h"
-#include "sd-daemon.h"
 #include "utmp-wtmp.h"
 
 static int read_packet(int fd, struct shutdownd_command *_c) {
diff --git a/src/stdout-syslog-bridge.c b/src/stdout-syslog-bridge.c
index 6ec23ec612..e82716a1bd 100644
--- a/src/stdout-syslog-bridge.c
+++ b/src/stdout-syslog-bridge.c
@@ -32,10 +32,11 @@
 #include <sys/un.h>
 #include <fcntl.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "util.h"
 #include "log.h"
 #include "list.h"
-#include "sd-daemon.h"
 #include "tcpwrap.h"
 #include "def.h"
 
diff --git a/src/systemctl.c b/src/systemctl.c
index 2f03f6baa8..9b915f65d6 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -35,6 +35,8 @@
 #include <sys/prctl.h>
 #include <dbus/dbus.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "log.h"
 #include "util.h"
 #include "macro.h"
@@ -49,7 +51,6 @@
 #include "list.h"
 #include "path-lookup.h"
 #include "conf-parser.h"
-#include "sd-daemon.h"
 #include "shutdownd.h"
 #include "exit-status.h"
 #include "bus-errors.h"
diff --git a/src/sd-daemon.h b/src/systemd/sd-daemon.h
index 46dc7fd7e5..46dc7fd7e5 100644
--- a/src/sd-daemon.h
+++ b/src/systemd/sd-daemon.h
diff --git a/src/sd-id128.h b/src/systemd/sd-id128.h
index d835cf4768..d835cf4768 100644
--- a/src/sd-id128.h
+++ b/src/systemd/sd-id128.h
diff --git a/src/journal/sd-journal.h b/src/systemd/sd-journal.h
index 87da17ddc6..87da17ddc6 100644
--- a/src/journal/sd-journal.h
+++ b/src/systemd/sd-journal.h
diff --git a/src/login/sd-login.h b/src/systemd/sd-login.h
index 00de6716b0..00de6716b0 100644
--- a/src/login/sd-login.h
+++ b/src/systemd/sd-login.h
diff --git a/src/readahead/sd-readahead.h b/src/systemd/sd-readahead.h
index ee7e30606e..ee7e30606e 100644
--- a/src/readahead/sd-readahead.h
+++ b/src/systemd/sd-readahead.h
diff --git a/src/test-daemon.c b/src/test-daemon.c
index c7600d4d63..20c5d1517e 100644
--- a/src/test-daemon.c
+++ b/src/test-daemon.c
@@ -21,7 +21,7 @@
 
 #include <unistd.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 int main(int argc, char*argv[]) {
 
diff --git a/src/test-id128.c b/src/test-id128.c
index d7c9d4326e..617c95568b 100644
--- a/src/test-id128.c
+++ b/src/test-id128.c
@@ -21,7 +21,8 @@
 
 #include <string.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
+
 #include "util.h"
 #include "macro.h"