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

src/test/test-cgroup-util.c

@@ -27,6 +27,7 @@
 #include "process-util.h"
 #include "string-util.h"
 #include "test-helper.h"
+#include "user-util.h"
 #include "util.h"
 
 static void check_p_d_u(const char *path, int code, const char *result) {

src/test/test-conf-files.c

@@ -28,6 +28,7 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "strv.h"
+#include "user-util.h"
 #include "util.h"
 
 static void setup_test_dir(char *tmp_dir, const char *files, ...) {

src/test/test-uid-range.c

@@ -21,8 +21,9 @@
 
 #include <stddef.h>
 
-#include "util.h"
 #include "uid-range.h"
+#include "user-util.h"
+#include "util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_free_ UidRange *p = NULL;