3 files changed, 25 insertions, 25 deletions
diff --git a/src/systemd-analyze/analyze-verify.c b/src/systemd-analyze/analyze-verify.c
index 5fd3ee49eb..7553574f53 100644
--- a/src/systemd-analyze/analyze-verify.c
+++ b/src/systemd-analyze/analyze-verify.c
@@ -19,16 +19,16 @@
 
 #include <stdlib.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "analyze-verify.h"
-#include "bus-error.h"
-#include "bus-util.h"
-#include "log.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
+#include "basic/log.h"
 #include "manager.h"
-#include "pager.h"
-#include "path-util.h"
-#include "strv.h"
-#include "unit-name.h"
+#include "shared/pager.h"
+#include "basic/path-util.h"
+#include "basic/strv.h"
+#include "basic/unit-name.h"
 
 static int prepare_filename(const char *filename, char **ret) {
         int r;
diff --git a/src/systemd-analyze/analyze-verify.h b/src/systemd-analyze/analyze-verify.h
index d8204dc69c..7b89007fd0 100644
--- a/src/systemd-analyze/analyze-verify.h
+++ b/src/systemd-analyze/analyze-verify.h
@@ -21,6 +21,6 @@
 
 #include <stdbool.h>
 
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 
 int verify_units(char **filenames, UnitFileScope scope, bool check_man);
diff --git a/src/systemd-analyze/analyze.c b/src/systemd-analyze/analyze.c
index 0e1eee16ec..1ce700ccba 100644
--- a/src/systemd-analyze/analyze.c
+++ b/src/systemd-analyze/analyze.c
@@ -25,23 +25,23 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "analyze-verify.h"
-#include "bus-error.h"
-#include "bus-unit-util.h"
-#include "bus-util.h"
-#include "glob-util.h"
-#include "hashmap.h"
-#include "locale-util.h"
-#include "log.h"
-#include "pager.h"
-#include "parse-util.h"
-#include "special.h"
-#include "strv.h"
-#include "strxcpyx.h"
-#include "terminal-util.h"
-#include "unit-name.h"
-#include "util.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
+#include "basic/glob-util.h"
+#include "basic/hashmap.h"
+#include "basic/locale-util.h"
+#include "basic/log.h"
+#include "shared/pager.h"
+#include "basic/parse-util.h"
+#include "basic/special.h"
+#include "basic/strv.h"
+#include "basic/strxcpyx.h"
+#include "basic/terminal-util.h"
+#include "basic/unit-name.h"
+#include "basic/util.h"
 
 #define SCALE_X (0.1 / 1000.0)   /* pixels per us */
 #define SCALE_Y (20.0)