user-util: move UID/GID related macros from macro.h to user-util.h

src/shared/base-filesystem.c

@@ -30,6 +30,7 @@
 #include "macro.h"
 #include "string-util.h"
 #include "umask-util.h"
+#include "user-util.h"
 #include "util.h"
 
 typedef struct BaseFilesystem {

src/shared/bus-util.c

@@ -39,6 +39,7 @@
 #include "missing.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "proc-cmdline.h"
 #include "rlimit-util.h"
 #include "set.h"
 #include "signal-util.h"
@@ -46,9 +47,9 @@
 #include "strv.h"
 #include "syslog-util.h"
 #include "unit-name.h"
+#include "user-util.h"
 #include "utf8.h"
 #include "util.h"
-#include "proc-cmdline.h"
 
 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
         sd_event *e = userdata;

src/shared/dev-setup.c

@@ -23,10 +23,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "util.h"
+#include "dev-setup.h"
 #include "label.h"
 #include "path-util.h"
-#include "dev-setup.h"
+#include "user-util.h"
+#include "util.h"
 
 int dev_setup(const char *prefix, uid_t uid, gid_t gid) {
         static const char symlinks[] =

src/shared/switch-root.c

@@ -35,6 +35,7 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "switch-root.h"
+#include "user-util.h"
 #include "util.h"
 
 int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,  unsigned long mountflags) {