9 files changed, 34 insertions, 32 deletions
diff --git a/src/systemd-timesyncd/Makefile b/src/systemd-timesyncd/Makefile
index c9289846c4..50333d0380 100644
--- a/src/systemd-timesyncd/Makefile
+++ b/src/systemd-timesyncd/Makefile
@@ -61,4 +61,6 @@ EXTRA_DIST += \
 	units/systemd-timesyncd.service.in \
 	src/timesync/timesyncd.conf.in
 
+systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-timesyncd/timesyncd-conf.c b/src/systemd-timesyncd/timesyncd-conf.c
index 20c64a3354..154b8e294b 100644
--- a/src/systemd-timesyncd/timesyncd-conf.c
+++ b/src/systemd-timesyncd/timesyncd-conf.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
-#include "def.h"
-#include "extract-word.h"
-#include "string-util.h"
+#include "basic/alloc-util.h"
+#include "basic/def.h"
+#include "basic/extract-word.h"
+#include "basic/string-util.h"
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
 #include "timesyncd-server.h"
diff --git a/src/systemd-timesyncd/timesyncd-conf.h b/src/systemd-timesyncd/timesyncd-conf.h
index cba0724b1b..1c96bd066d 100644
--- a/src/systemd-timesyncd/timesyncd-conf.h
+++ b/src/systemd-timesyncd/timesyncd-conf.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "timesyncd-manager.h"
 
 const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);
diff --git a/src/systemd-timesyncd/timesyncd-gperf.gperf b/src/systemd-timesyncd/timesyncd-gperf.gperf
index 29a2cfeef6..b8af831105 100644
--- a/src/systemd-timesyncd/timesyncd-gperf.gperf
+++ b/src/systemd-timesyncd/timesyncd-gperf.gperf
@@ -1,6 +1,6 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "timesyncd-conf.h"
 %}
 struct ConfigPerfItem;
diff --git a/src/systemd-timesyncd/timesyncd-manager.c b/src/systemd-timesyncd/timesyncd-manager.c
index 6a4b52af69..8464f38fab 100644
--- a/src/systemd-timesyncd/timesyncd-manager.c
+++ b/src/systemd-timesyncd/timesyncd-manager.c
@@ -31,22 +31,22 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "fs-util.h"
-#include "list.h"
-#include "log.h"
-#include "missing.h"
-#include "network-util.h"
-#include "ratelimit.h"
-#include "socket-util.h"
-#include "sparse-endian.h"
-#include "string-util.h"
-#include "strv.h"
-#include "time-util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/fs-util.h"
+#include "basic/list.h"
+#include "basic/log.h"
+#include "basic/missing.h"
+#include "sd-network/network-util.h"
+#include "basic/ratelimit.h"
+#include "basic/socket-util.h"
+#include "basic/sparse-endian.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/time-util.h"
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
-#include "util.h"
+#include "basic/util.h"
 
 #ifndef ADJ_SETOFFSET
 #define ADJ_SETOFFSET                   0x0100  /* add 'time' to current time */
diff --git a/src/systemd-timesyncd/timesyncd-manager.h b/src/systemd-timesyncd/timesyncd-manager.h
index fd25647725..de6836087d 100644
--- a/src/systemd-timesyncd/timesyncd-manager.h
+++ b/src/systemd-timesyncd/timesyncd-manager.h
@@ -23,8 +23,8 @@
 #include <systemd/sd-network.h>
 #include <systemd/sd-resolve.h>
 
-#include "list.h"
-#include "ratelimit.h"
+#include "basic/list.h"
+#include "basic/ratelimit.h"
 
 typedef struct Manager Manager;
 
diff --git a/src/systemd-timesyncd/timesyncd-server.c b/src/systemd-timesyncd/timesyncd-server.c
index 6bda86fe6e..ceeaf1b6e0 100644
--- a/src/systemd-timesyncd/timesyncd-server.c
+++ b/src/systemd-timesyncd/timesyncd-server.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "timesyncd-server.h"
 
 int server_address_new(
diff --git a/src/systemd-timesyncd/timesyncd-server.h b/src/systemd-timesyncd/timesyncd-server.h
index 8a19e41d67..438146c8f7 100644
--- a/src/systemd-timesyncd/timesyncd-server.h
+++ b/src/systemd-timesyncd/timesyncd-server.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "list.h"
-#include "socket-util.h"
+#include "basic/list.h"
+#include "basic/socket-util.h"
 
 typedef struct ServerAddress ServerAddress;
 typedef struct ServerName ServerName;
diff --git a/src/systemd-timesyncd/timesyncd.c b/src/systemd-timesyncd/timesyncd.c
index 9e538a82f2..0a3a08b46c 100644
--- a/src/systemd-timesyncd/timesyncd.c
+++ b/src/systemd-timesyncd/timesyncd.c
@@ -20,15 +20,15 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "capability-util.h"
-#include "clock-util.h"
-#include "fd-util.h"
-#include "fs-util.h"
-#include "network-util.h"
-#include "signal-util.h"
+#include "basic/capability-util.h"
+#include "basic/clock-util.h"
+#include "basic/fd-util.h"
+#include "basic/fs-util.h"
+#include "sd-network/network-util.h"
+#include "basic/signal-util.h"
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
-#include "user-util.h"
+#include "basic/user-util.h"
 
 static int load_clock_timestamp(uid_t uid, gid_t gid) {
         _cleanup_close_ int fd = -1;