fix

64 files changed, 106 insertions, 104 deletions

diff --git a/src/libbasic/include/basic/Makefile b/src/libbasic/include/basic/Makefile
index 886236375e..f371394691 100644
--- a/src/libbasic/include/basic/Makefile
+++ b/src/libbasic/include/basic/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-$(outdir)/errno-list.txt:
+$(outdir)/errno-list.txt: | $(outdir)/.deps
 	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
 
 $(outdir)/errno-to-name.h: $(outdir)/errno-list.txt
@@ -59,4 +59,6 @@ $(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt
 $(outdir)/cap-from-name.h: $(outdir)/cap-from-name.gperf
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
 
+systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/include/basic/af-list.h b/src/libbasic/include/basic/af-list.h
index 6a4cc03839..da9d373872 100644
--- a/src/libbasic/include/basic/af-list.h
+++ b/src/libbasic/include/basic/af-list.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "string-util.h"
+#include "basic/string-util.h"
 
 const char *af_to_name(int id);
 int af_from_name(const char *name);
diff --git a/src/libbasic/include/basic/alloc-util.h b/src/libbasic/include/basic/alloc-util.h
index ceeee519b7..e17c027634 100644
--- a/src/libbasic/include/basic/alloc-util.h
+++ b/src/libbasic/include/basic/alloc-util.h
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n)))
 
diff --git a/src/libbasic/include/basic/architecture.h b/src/libbasic/include/basic/architecture.h
index b3e4d85906..2d4f710f71 100644
--- a/src/libbasic/include/basic/architecture.h
+++ b/src/libbasic/include/basic/architecture.h
@@ -21,8 +21,8 @@
 
 #include <endian.h>
 
-#include "macro.h"
-#include "util.h"
+#include "basic/macro.h"
+#include "basic/util.h"
 
 /* A cleaned up architecture definition. We don't want to get lost in
  * processor features, models, generations or even ABIs. Hence we
diff --git a/src/libbasic/include/basic/barrier.h b/src/libbasic/include/basic/barrier.h
index 6347fddc4d..a27a8fc7d6 100644
--- a/src/libbasic/include/basic/barrier.h
+++ b/src/libbasic/include/basic/barrier.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 /* See source file for an API description. */
 
diff --git a/src/libbasic/include/basic/bitmap.h b/src/libbasic/include/basic/bitmap.h
index f5f8f2f018..ee0e13de9e 100644
--- a/src/libbasic/include/basic/bitmap.h
+++ b/src/libbasic/include/basic/bitmap.h
@@ -21,8 +21,8 @@
 
 #include <stdbool.h>
 
-#include "hashmap.h"
-#include "macro.h"
+#include "basic/hashmap.h"
+#include "basic/macro.h"
 
 typedef struct Bitmap Bitmap;
 
diff --git a/src/libbasic/include/basic/blkid-util.h b/src/libbasic/include/basic/blkid-util.h
index 7aa75eb091..69a941ede2 100644
--- a/src/libbasic/include/basic/blkid-util.h
+++ b/src/libbasic/include/basic/blkid-util.h
@@ -23,7 +23,7 @@
 #include <blkid/blkid.h>
 #endif
 
-#include "util.h"
+#include "basic/util.h"
 
 #ifdef HAVE_BLKID
 DEFINE_TRIVIAL_CLEANUP_FUNC(blkid_probe, blkid_free_probe);
diff --git a/src/libbasic/include/basic/btrfs-ctree.h b/src/libbasic/include/basic/btrfs-ctree.h
index 66bdf9736e..f35bfbc7f4 100644
--- a/src/libbasic/include/basic/btrfs-ctree.h
+++ b/src/libbasic/include/basic/btrfs-ctree.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "macro.h"
-#include "sparse-endian.h"
+#include "basic/macro.h"
+#include "basic/sparse-endian.h"
 
 /* Stolen from btrfs' ctree.h */
 
diff --git a/src/libbasic/include/basic/btrfs-util.h b/src/libbasic/include/basic/btrfs-util.h
index db431f5b74..6221089f3a 100644
--- a/src/libbasic/include/basic/btrfs-util.h
+++ b/src/libbasic/include/basic/btrfs-util.h
@@ -25,7 +25,7 @@
 
 #include <systemd/sd-id128.h>
 
-#include "time-util.h"
+#include "basic/time-util.h"
 
 typedef struct BtrfsSubvolInfo {
         uint64_t subvol_id;
diff --git a/src/libbasic/include/basic/calendarspec.h b/src/libbasic/include/basic/calendarspec.h
index f6472c1244..8456afe499 100644
--- a/src/libbasic/include/basic/calendarspec.h
+++ b/src/libbasic/include/basic/calendarspec.h
@@ -24,8 +24,8 @@
 
 #include <stdbool.h>
 
-#include "time-util.h"
-#include "util.h"
+#include "basic/time-util.h"
+#include "basic/util.h"
 
 typedef struct CalendarComponent {
         int value;
diff --git a/src/libbasic/include/basic/capability-util.h b/src/libbasic/include/basic/capability-util.h
index 35a896e229..2486cd8eb4 100644
--- a/src/libbasic/include/basic/capability-util.h
+++ b/src/libbasic/include/basic/capability-util.h
@@ -24,8 +24,8 @@
 #include <sys/capability.h>
 #include <sys/types.h>
 
-#include "macro.h"
-#include "util.h"
+#include "basic/macro.h"
+#include "basic/util.h"
 
 #define CAP_ALL (uint64_t) -1
 
diff --git a/src/libbasic/include/basic/cgroup-util.h b/src/libbasic/include/basic/cgroup-util.h
index 4bb5291296..f957b181a5 100644
--- a/src/libbasic/include/basic/cgroup-util.h
+++ b/src/libbasic/include/basic/cgroup-util.h
@@ -25,10 +25,10 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "def.h"
-#include "hashmap.h"
-#include "macro.h"
-#include "set.h"
+#include "basic/def.h"
+#include "basic/hashmap.h"
+#include "basic/macro.h"
+#include "basic/set.h"
 
 /* An enum of well known cgroup controllers */
 typedef enum CGroupController {
diff --git a/src/libbasic/include/basic/cpu-set-util.h b/src/libbasic/include/basic/cpu-set-util.h
index 6f49d9afb0..17cafff2ae 100644
--- a/src/libbasic/include/basic/cpu-set-util.h
+++ b/src/libbasic/include/basic/cpu-set-util.h
@@ -22,7 +22,7 @@
 
 #include <sched.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(cpu_set_t*, CPU_FREE);
 #define _cleanup_cpu_free_ _cleanup_(CPU_FREEp)
diff --git a/src/libbasic/include/basic/def.h b/src/libbasic/include/basic/def.h
index 1a7a0f4928..c9151e6023 100644
--- a/src/libbasic/include/basic/def.h
+++ b/src/libbasic/include/basic/def.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
+#include "basic/util.h"
 
 #define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC)
 #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
diff --git a/src/libbasic/include/basic/dirent-util.h b/src/libbasic/include/basic/dirent-util.h
index b91d04908f..4352db66c5 100644
--- a/src/libbasic/include/basic/dirent-util.h
+++ b/src/libbasic/include/basic/dirent-util.h
@@ -23,8 +23,8 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include "macro.h"
-#include "path-util.h"
+#include "basic/macro.h"
+#include "basic/path-util.h"
 
 int dirent_ensure_type(DIR *d, struct dirent *de);
 
diff --git a/src/libbasic/include/basic/env-util.h b/src/libbasic/include/basic/env-util.h
index b1fef704c2..f22958257d 100644
--- a/src/libbasic/include/basic/env-util.h
+++ b/src/libbasic/include/basic/env-util.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 bool env_name_is_valid(const char *e);
 bool env_value_is_valid(const char *e);
diff --git a/src/libbasic/include/basic/escape.h b/src/libbasic/include/basic/escape.h
index deaa4def28..dffe417cc6 100644
--- a/src/libbasic/include/basic/escape.h
+++ b/src/libbasic/include/basic/escape.h
@@ -25,8 +25,8 @@
 #include <sys/types.h>
 #include <uchar.h>
 
-#include "string-util.h"
-#include "missing.h"
+#include "basic/string-util.h"
+#include "basic/missing.h"
 
 /* What characters are special in the shell? */
 /* must be escaped outside and inside double-quotes */
diff --git a/src/libbasic/include/basic/exit-status.h b/src/libbasic/include/basic/exit-status.h
index 1208c8feed..3e9dcb1e53 100644
--- a/src/libbasic/include/basic/exit-status.h
+++ b/src/libbasic/include/basic/exit-status.h
@@ -21,9 +21,9 @@
 
 #include <stdbool.h>
 
-#include "hashmap.h"
-#include "macro.h"
-#include "set.h"
+#include "basic/hashmap.h"
+#include "basic/macro.h"
+#include "basic/set.h"
 
 typedef enum ExitStatus {
         /* EXIT_SUCCESS defined by libc */
diff --git a/src/libbasic/include/basic/extract-word.h b/src/libbasic/include/basic/extract-word.h
index 21db5ef33f..6211a7d15b 100644
--- a/src/libbasic/include/basic/extract-word.h
+++ b/src/libbasic/include/basic/extract-word.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "macro.h"
+#include "basic/macro.h"
 
 typedef enum ExtractFlags {
         EXTRACT_RELAX                    = 1,
diff --git a/src/libbasic/include/basic/fd-util.h b/src/libbasic/include/basic/fd-util.h
index b86e41698a..706c49324c 100644
--- a/src/libbasic/include/basic/fd-util.h
+++ b/src/libbasic/include/basic/fd-util.h
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <sys/socket.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 /* Make sure we can distinguish fd 0 and NULL */
 #define FD_TO_PTR(fd) INT_TO_PTR((fd)+1)
diff --git a/src/libbasic/include/basic/fdset.h b/src/libbasic/include/basic/fdset.h
index 16efe5bdf2..3ff5d519af 100644
--- a/src/libbasic/include/basic/fdset.h
+++ b/src/libbasic/include/basic/fdset.h
@@ -21,9 +21,9 @@
 
 #include <stdbool.h>
 
-#include "hashmap.h"
-#include "macro.h"
-#include "set.h"
+#include "basic/hashmap.h"
+#include "basic/macro.h"
+#include "basic/set.h"
 
 typedef struct FDSet FDSet;
 
diff --git a/src/libbasic/include/basic/fileio-label.h b/src/libbasic/include/basic/fileio-label.h
index fe7543013d..e8e8375de6 100644
--- a/src/libbasic/include/basic/fileio-label.h
+++ b/src/libbasic/include/basic/fileio-label.h
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 
-#include "fileio.h"
+#include "basic/fileio.h"
 
 int write_string_file_atomic_label(const char *fn, const char *line);
 int write_env_file_label(const char *fname, char **l);
diff --git a/src/libbasic/include/basic/fileio.h b/src/libbasic/include/basic/fileio.h
index 58dbc80c24..31f75d0f97 100644
--- a/src/libbasic/include/basic/fileio.h
+++ b/src/libbasic/include/basic/fileio.h
@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "macro.h"
-#include "time-util.h"
+#include "basic/macro.h"
+#include "basic/time-util.h"
 
 typedef enum {
         WRITE_STRING_FILE_CREATE = 1,
diff --git a/src/libbasic/include/basic/fs-util.h b/src/libbasic/include/basic/fs-util.h
index 517b599d6f..69292a3b22 100644
--- a/src/libbasic/include/basic/fs-util.h
+++ b/src/libbasic/include/basic/fs-util.h
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "time-util.h"
+#include "basic/time-util.h"
 
 int unlink_noerrno(const char *path);
 
diff --git a/src/libbasic/include/basic/glob-util.h b/src/libbasic/include/basic/glob-util.h
index 5d8fb47a26..63daf4d67f 100644
--- a/src/libbasic/include/basic/glob-util.h
+++ b/src/libbasic/include/basic/glob-util.h
@@ -22,8 +22,8 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "macro.h"
-#include "string-util.h"
+#include "basic/macro.h"
+#include "basic/string-util.h"
 
 int glob_exists(const char *path);
 int glob_extend(char ***strv, const char *path);
diff --git a/src/libbasic/include/basic/hash-funcs.h b/src/libbasic/include/basic/hash-funcs.h
index 299189d143..95c565a3ce 100644
--- a/src/libbasic/include/basic/hash-funcs.h
+++ b/src/libbasic/include/basic/hash-funcs.h
@@ -20,8 +20,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "macro.h"
-#include "siphash24.h"
+#include "basic/macro.h"
+#include "basic/siphash24.h"
 
 typedef void (*hash_func_t)(const void *p, struct siphash *state);
 typedef int (*compare_func_t)(const void *a, const void *b);
diff --git a/src/libbasic/include/basic/hashmap.h b/src/libbasic/include/basic/hashmap.h
index 6d1ae48b21..2be0e99d42 100644
--- a/src/libbasic/include/basic/hashmap.h
+++ b/src/libbasic/include/basic/hashmap.h
@@ -24,9 +24,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "hash-funcs.h"
-#include "macro.h"
-#include "util.h"
+#include "basic/hash-funcs.h"
+#include "basic/macro.h"
+#include "basic/util.h"
 
 /*
  * A hash table implementation. As a minor optimization a NULL hashmap object
diff --git a/src/libbasic/include/basic/hexdecoct.h b/src/libbasic/include/basic/hexdecoct.h
index 1ba2f69ebd..3c1225cf8b 100644
--- a/src/libbasic/include/basic/hexdecoct.h
+++ b/src/libbasic/include/basic/hexdecoct.h
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 char octchar(int x) _const_;
 int unoctchar(char c) _const_;
diff --git a/src/libbasic/include/basic/hostname-util.h b/src/libbasic/include/basic/hostname-util.h
index 7af4e6c7ec..e23412e116 100644
--- a/src/libbasic/include/basic/hostname-util.h
+++ b/src/libbasic/include/basic/hostname-util.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 bool hostname_is_set(void);
 
diff --git a/src/libbasic/include/basic/in-addr-util.h b/src/libbasic/include/basic/in-addr-util.h
index 17798ce816..c28a84a0d9 100644
--- a/src/libbasic/include/basic/in-addr-util.h
+++ b/src/libbasic/include/basic/in-addr-util.h
@@ -23,8 +23,8 @@
 #include <stddef.h>
 #include <sys/socket.h>
 
-#include "macro.h"
-#include "util.h"
+#include "basic/macro.h"
+#include "basic/util.h"
 
 union in_addr_union {
         struct in_addr in;
diff --git a/src/libbasic/include/basic/io-util.h b/src/libbasic/include/basic/io-util.h
index 4684ed3bfc..100f15c283 100644
--- a/src/libbasic/include/basic/io-util.h
+++ b/src/libbasic/include/basic/io-util.h
@@ -25,8 +25,8 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 
-#include "macro.h"
-#include "time-util.h"
+#include "basic/macro.h"
+#include "basic/time-util.h"
 
 int flush_fd(int fd);
 
diff --git a/src/libbasic/include/basic/locale-util.h b/src/libbasic/include/basic/locale-util.h
index 0630a034ab..e5db878b12 100644
--- a/src/libbasic/include/basic/locale-util.h
+++ b/src/libbasic/include/basic/locale-util.h
@@ -22,7 +22,7 @@
 #include <libintl.h>
 #include <stdbool.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 typedef enum LocaleVariable {
         /* We don't list LC_ALL here on purpose. People should be
diff --git a/src/libbasic/include/basic/lockfile-util.h b/src/libbasic/include/basic/lockfile-util.h
index 22491ee8e1..e344e1f8f1 100644
--- a/src/libbasic/include/basic/lockfile-util.h
+++ b/src/libbasic/include/basic/lockfile-util.h
@@ -21,8 +21,8 @@
 
 #include <stddef.h>
 
-#include "macro.h"
-#include "missing.h"
+#include "basic/macro.h"
+#include "basic/missing.h"
 
 typedef struct LockFile {
         char *path;
diff --git a/src/libbasic/include/basic/log.h b/src/libbasic/include/basic/log.h
index d2a22b5829..6ddbac1436 100644
--- a/src/libbasic/include/basic/log.h
+++ b/src/libbasic/include/basic/log.h
@@ -29,7 +29,7 @@
 
 #include <systemd/sd-id128.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 typedef enum LogTarget{
         LOG_TARGET_CONSOLE,
diff --git a/src/libbasic/include/basic/macro.h b/src/libbasic/include/basic/macro.h
index e41aa4260f..e83d2f77d2 100644
--- a/src/libbasic/include/basic/macro.h
+++ b/src/libbasic/include/basic/macro.h
@@ -403,4 +403,4 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
         }                                                       \
         struct __useless_struct_to_allow_trailing_semicolon__
 
-#include "log.h"
+#include "basic/log.h"
diff --git a/src/libbasic/include/basic/missing.h b/src/libbasic/include/basic/missing.h
index 651e414395..13c9b89080 100644
--- a/src/libbasic/include/basic/missing.h
+++ b/src/libbasic/include/basic/missing.h
@@ -50,7 +50,7 @@
 #include <linux/btrfs.h>
 #endif
 
-#include "macro.h"
+#include "basic/macro.h"
 
 #ifndef RLIMIT_RTTIME
 #define RLIMIT_RTTIME 15
@@ -1013,4 +1013,4 @@ typedef int32_t key_serial_t;
 
 #endif
 
-#include "missing_syscall.h"
+#include "basic/missing_syscall.h"
diff --git a/src/libbasic/include/basic/mount-util.h b/src/libbasic/include/basic/mount-util.h
index bdb525d6b0..bb5b37d9a1 100644
--- a/src/libbasic/include/basic/mount-util.h
+++ b/src/libbasic/include/basic/mount-util.h
@@ -26,8 +26,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "macro.h"
-#include "missing.h"
+#include "basic/macro.h"
+#include "basic/missing.h"
 
 int fd_is_mount_point(int fd, const char *filename, int flags);
 int path_is_mount_point(const char *path, int flags);
diff --git a/src/libbasic/include/basic/ordered-set.h b/src/libbasic/include/basic/ordered-set.h
index e1dfc86380..2823c17dda 100644
--- a/src/libbasic/include/basic/ordered-set.h
+++ b/src/libbasic/include/basic/ordered-set.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "hashmap.h"
+#include "basic/hashmap.h"
 
 typedef struct OrderedSet OrderedSet;
 
diff --git a/src/libbasic/include/basic/parse-util.h b/src/libbasic/include/basic/parse-util.h
index 7dc579a159..7132c958ef 100644
--- a/src/libbasic/include/basic/parse-util.h
+++ b/src/libbasic/include/basic/parse-util.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 #define MODE_INVALID ((mode_t) -1)
 
diff --git a/src/libbasic/include/basic/path-util.h b/src/libbasic/include/basic/path-util.h
index a27c13fcc3..cd787fae59 100644
--- a/src/libbasic/include/basic/path-util.h
+++ b/src/libbasic/include/basic/path-util.h
@@ -23,8 +23,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "macro.h"
-#include "time-util.h"
+#include "basic/macro.h"
+#include "basic/time-util.h"
 
 #define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
 #define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":/sbin:/bin"
diff --git a/src/libbasic/include/basic/prioq.h b/src/libbasic/include/basic/prioq.h
index 113c73d040..25dc1a253d 100644
--- a/src/libbasic/include/basic/prioq.h
+++ b/src/libbasic/include/basic/prioq.h
@@ -21,8 +21,8 @@
 
 #include <stdbool.h>
 
-#include "hashmap.h"
-#include "macro.h"
+#include "basic/hashmap.h"
+#include "basic/macro.h"
 
 typedef struct Prioq Prioq;
 
diff --git a/src/libbasic/include/basic/process-util.h b/src/libbasic/include/basic/process-util.h
index 9f75088796..4fa45a97e3 100644
--- a/src/libbasic/include/basic/process-util.h
+++ b/src/libbasic/include/basic/process-util.h
@@ -27,8 +27,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "formats-util.h"
-#include "macro.h"
+#include "basic/formats-util.h"
+#include "basic/macro.h"
 
 #define procfs_file_alloca(pid, field)                                  \
         ({                                                              \
diff --git a/src/libbasic/include/basic/ratelimit.h b/src/libbasic/include/basic/ratelimit.h
index 9c8dddf5ad..f54209c534 100644
--- a/src/libbasic/include/basic/ratelimit.h
+++ b/src/libbasic/include/basic/ratelimit.h
@@ -21,8 +21,8 @@
 
 #include <stdbool.h>
 
-#include "time-util.h"
-#include "util.h"
+#include "basic/time-util.h"
+#include "basic/util.h"
 
 typedef struct RateLimit {
         usec_t interval;
diff --git a/src/libbasic/include/basic/rlimit-util.h b/src/libbasic/include/basic/rlimit-util.h
index d4594eccd6..d9a6a4e902 100644
--- a/src/libbasic/include/basic/rlimit-util.h
+++ b/src/libbasic/include/basic/rlimit-util.h
@@ -21,7 +21,7 @@
 
 #include <sys/resource.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 const char *rlimit_to_string(int i) _const_;
 int rlimit_from_string(const char *s) _pure_;
diff --git a/src/libbasic/include/basic/selinux-util.h b/src/libbasic/include/basic/selinux-util.h
index ce6bc8e44c..a619d0322a 100644
--- a/src/libbasic/include/basic/selinux-util.h
+++ b/src/libbasic/include/basic/selinux-util.h
@@ -23,7 +23,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 bool mac_selinux_use(void);
 bool mac_selinux_have(void);
diff --git a/src/libbasic/include/basic/set.h b/src/libbasic/include/basic/set.h
index e0d9dd001c..4e74e9108b 100644
--- a/src/libbasic/include/basic/set.h
+++ b/src/libbasic/include/basic/set.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "hashmap.h"
-#include "macro.h"
+#include "basic/hashmap.h"
+#include "basic/macro.h"
 
 Set *internal_set_new(const struct hash_ops *hash_ops  HASHMAP_DEBUG_PARAMS);
 #define set_new(ops) internal_set_new(ops  HASHMAP_DEBUG_SRC_ARGS)
diff --git a/src/libbasic/include/basic/signal-util.h b/src/libbasic/include/basic/signal-util.h
index dfd6eb564d..bfc1be809a 100644
--- a/src/libbasic/include/basic/signal-util.h
+++ b/src/libbasic/include/basic/signal-util.h
@@ -21,7 +21,7 @@
 
 #include <signal.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 int reset_all_signal_handlers(void);
 int reset_signal_mask(void);
diff --git a/src/libbasic/include/basic/smack-util.h b/src/libbasic/include/basic/smack-util.h
index f90ba0a027..9ff19b30b3 100644
--- a/src/libbasic/include/basic/smack-util.h
+++ b/src/libbasic/include/basic/smack-util.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 #define SMACK_FLOOR_LABEL "_"
 #define SMACK_STAR_LABEL  "*"
diff --git a/src/libbasic/include/basic/socket-util.h b/src/libbasic/include/basic/socket-util.h
index e9230e4a9f..a711d368d5 100644
--- a/src/libbasic/include/basic/socket-util.h
+++ b/src/libbasic/include/basic/socket-util.h
@@ -29,8 +29,8 @@
 #include <linux/netlink.h>
 #include <linux/if_packet.h>
 
-#include "macro.h"
-#include "util.h"
+#include "basic/macro.h"
+#include "basic/util.h"
 
 union sockaddr_union {
         struct sockaddr sa;
diff --git a/src/libbasic/include/basic/stat-util.h b/src/libbasic/include/basic/stat-util.h
index 56d28f791e..8c0cd0c97c 100644
--- a/src/libbasic/include/basic/stat-util.h
+++ b/src/libbasic/include/basic/stat-util.h
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/vfs.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 int is_symlink(const char *path);
 int is_dir(const char *path, bool follow);
diff --git a/src/libbasic/include/basic/stdio-util.h b/src/libbasic/include/basic/stdio-util.h
index bd1144b4c9..414a278d0f 100644
--- a/src/libbasic/include/basic/stdio-util.h
+++ b/src/libbasic/include/basic/stdio-util.h
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 #define xsprintf(buf, fmt, ...) \
         assert_message_se((size_t) snprintf(buf, ELEMENTSOF(buf), fmt, __VA_ARGS__) < ELEMENTSOF(buf), "xsprintf: " #buf "[] must be big enough")
diff --git a/src/libbasic/include/basic/string-table.h b/src/libbasic/include/basic/string-table.h
index d88625fca7..cf9345c80a 100644
--- a/src/libbasic/include/basic/string-table.h
+++ b/src/libbasic/include/basic/string-table.h
@@ -26,9 +26,9 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "macro.h"
-#include "parse-util.h"
-#include "string-util.h"
+#include "basic/macro.h"
+#include "basic/parse-util.h"
+#include "basic/string-util.h"
 
 ssize_t string_table_lookup(const char * const *table, size_t len, const char *key);
 
diff --git a/src/libbasic/include/basic/string-util.h b/src/libbasic/include/basic/string-util.h
index 139cc8c91b..e0ff88b7fb 100644
--- a/src/libbasic/include/basic/string-util.h
+++ b/src/libbasic/include/basic/string-util.h
@@ -24,7 +24,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 /* What is interpreted as whitespace? */
 #define WHITESPACE        " \t\n\r"
diff --git a/src/libbasic/include/basic/strv.h b/src/libbasic/include/basic/strv.h
index f61bbb5386..20773223ad 100644
--- a/src/libbasic/include/basic/strv.h
+++ b/src/libbasic/include/basic/strv.h
@@ -24,10 +24,10 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "alloc-util.h"
-#include "extract-word.h"
-#include "macro.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/extract-word.h"
+#include "basic/macro.h"
+#include "basic/util.h"
 
 char *strv_find(char **l, const char *name) _pure_;
 char *strv_find_prefix(char **l, const char *name) _pure_;
diff --git a/src/libbasic/include/basic/strxcpyx.h b/src/libbasic/include/basic/strxcpyx.h
index 80ff58726b..7e9a5399d4 100644
--- a/src/libbasic/include/basic/strxcpyx.h
+++ b/src/libbasic/include/basic/strxcpyx.h
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 size_t strpcpy(char **dest, size_t size, const char *src);
 size_t strpcpyf(char **dest, size_t size, const char *src, ...) _printf_(3, 4);
diff --git a/src/libbasic/include/basic/terminal-util.h b/src/libbasic/include/basic/terminal-util.h
index a7c96a77cb..51f6fd16bc 100644
--- a/src/libbasic/include/basic/terminal-util.h
+++ b/src/libbasic/include/basic/terminal-util.h
@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "macro.h"
-#include "time-util.h"
+#include "basic/macro.h"
+#include "basic/time-util.h"
 
 #define ANSI_RED "\x1B[0;31m"
 #define ANSI_GREEN "\x1B[0;32m"
diff --git a/src/libbasic/include/basic/time-util.h b/src/libbasic/include/basic/time-util.h
index a5e3f567ec..325266ec7e 100644
--- a/src/libbasic/include/basic/time-util.h
+++ b/src/libbasic/include/basic/time-util.h
@@ -32,7 +32,7 @@ typedef uint64_t nsec_t;
 #define NSEC_FMT "%" PRIu64
 #define USEC_FMT "%" PRIu64
 
-#include "macro.h"
+#include "basic/macro.h"
 
 typedef struct dual_timestamp {
         usec_t realtime;
diff --git a/src/libbasic/include/basic/umask-util.h b/src/libbasic/include/basic/umask-util.h
index 359d87d27c..d6a9835021 100644
--- a/src/libbasic/include/basic/umask-util.h
+++ b/src/libbasic/include/basic/umask-util.h
@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 static inline void umaskp(mode_t *u) {
         umask(*u);
diff --git a/src/libbasic/include/basic/unit-name.h b/src/libbasic/include/basic/unit-name.h
index f209a84634..c31e474cb7 100644
--- a/src/libbasic/include/basic/unit-name.h
+++ b/src/libbasic/include/basic/unit-name.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 #define UNIT_NAME_MAX 256
 
diff --git a/src/libbasic/include/basic/utf8.h b/src/libbasic/include/basic/utf8.h
index f9b9c9468b..f6fdb6eff7 100644
--- a/src/libbasic/include/basic/utf8.h
+++ b/src/libbasic/include/basic/utf8.h
@@ -24,8 +24,8 @@
 #include <stdint.h>
 #include <uchar.h>
 
-#include "macro.h"
-#include "missing.h"
+#include "basic/macro.h"
+#include "basic/missing.h"
 
 #define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd"
 #define UTF8_BYTE_ORDER_MARK "\xef\xbb\xbf"
diff --git a/src/libbasic/include/basic/util.h b/src/libbasic/include/basic/util.h
index 1c032c15c9..18d7eb2250 100644
--- a/src/libbasic/include/basic/util.h
+++ b/src/libbasic/include/basic/util.h
@@ -41,10 +41,10 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "formats-util.h"
-#include "macro.h"
-#include "missing.h"
-#include "time-util.h"
+#include "basic/formats-util.h"
+#include "basic/macro.h"
+#include "basic/missing.h"
+#include "basic/time-util.h"
 
 size_t page_size(void) _pure_;
 #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
diff --git a/src/libbasic/include/basic/virt.h b/src/libbasic/include/basic/virt.h
index a538f07f6b..b0e30e26f8 100644
--- a/src/libbasic/include/basic/virt.h
+++ b/src/libbasic/include/basic/virt.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 enum {
         VIRTUALIZATION_NONE = 0,
diff --git a/src/libbasic/include/basic/web-util.h b/src/libbasic/include/basic/web-util.h
index e6bb6b53f5..941940e0bc 100644
--- a/src/libbasic/include/basic/web-util.h
+++ b/src/libbasic/include/basic/web-util.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 bool http_url_is_valid(const char *url) _pure_;
 
diff --git a/src/libbasic/include/basic/xattr-util.h b/src/libbasic/include/basic/xattr-util.h
index 6fa097bf7e..9990b05af8 100644
--- a/src/libbasic/include/basic/xattr-util.h
+++ b/src/libbasic/include/basic/xattr-util.h
@@ -23,7 +23,7 @@
 #include <stddef.h>
 #include <sys/types.h>
 
-#include "time-util.h"
+#include "basic/time-util.h"
 
 int getxattr_malloc(const char *path, const char *name, char **value, bool allow_symlink);
 int fgetxattr_malloc(int fd, const char *name, char **value);