Rename def.h to constants.h

The name "def.h" originates from before the rule of "no needless abbreviations"
was established. Let's rename the file to clarify that it contains a collection
of various semi-related constants.

75 files changed, 98 insertions, 97 deletions

diff --git a/src/analyze/analyze-cat-config.c b/src/analyze/analyze-cat-config.c
index d214ceaf42..a30662b49f 100644
--- a/src/analyze/analyze-cat-config.c
+++ b/src/analyze/analyze-cat-config.c
@@ -3,7 +3,7 @@
 #include "analyze.h"
 #include "analyze-cat-config.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "nulstr-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 74556ac0f7..cac2d3adba 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -47,7 +47,7 @@
 #include "capability-util.h"
 #include "conf-files.h"
 #include "copy.h"
-#include "def.h"
+#include "constants.h"
 #include "exit-status.h"
 #include "extract-word.h"
 #include "fd-util.h"
diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index a92adbfca5..f161e65973 100644
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -7,7 +7,7 @@
 
 #include "ask-password-api.h"
 #include "build.h"
-#include "def.h"
+#include "constants.h"
 #include "log.h"
 #include "macro.h"
 #include "main-func.h"
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index b03cc70e2e..7949dd7d70 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -12,7 +12,7 @@
 
 #include "alloc-util.h"
 #include "cgroup-util.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index df6d5b7bbb..c9aae5abf6 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -9,7 +9,7 @@
 #include <sys/statfs.h>
 #include <sys/types.h>
 
-#include "def.h"
+#include "constants.h"
 #include "set.h"
 
 #define SYSTEMD_CGROUP_CONTROLLER_LEGACY "name=systemd"
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 532c9d19b8..348f7dcc70 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -7,7 +7,7 @@
 
 #include "chase-symlinks.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "hashmap.h"
diff --git a/src/basic/def.h b/src/basic/constants.h
index 2b4de29021..54021911ab 100644
--- a/src/basic/def.h
+++ b/src/basic/constants.h
@@ -1,6 +1,30 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#if !defined(HAS_FEATURE_MEMORY_SANITIZER)
+#  if defined(__has_feature)
+#    if __has_feature(memory_sanitizer)
+#      define HAS_FEATURE_MEMORY_SANITIZER 1
+#    endif
+#  endif
+#  if !defined(HAS_FEATURE_MEMORY_SANITIZER)
+#    define HAS_FEATURE_MEMORY_SANITIZER 0
+#  endif
+#endif
+
+#if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
+#  ifdef __SANITIZE_ADDRESS__
+#      define HAS_FEATURE_ADDRESS_SANITIZER 1
+#  elif defined(__has_feature)
+#    if __has_feature(address_sanitizer)
+#      define HAS_FEATURE_ADDRESS_SANITIZER 1
+#    endif
+#  endif
+#  if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
+#    define HAS_FEATURE_ADDRESS_SANITIZER 0
+#  endif
+#endif
+
 #define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC)
 #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
 #define DEFAULT_CONFIRM_USEC (30*USEC_PER_SEC)
diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index d8518ec06a..2f486a4d92 100644
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -10,7 +10,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "env-util.h"
 #include "fd-util.h"
diff --git a/src/basic/macro.h b/src/basic/macro.h
index 237117db12..3d1b175123 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -9,32 +9,9 @@
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 
+#include "constants.h"
 #include "macro-fundamental.h"
 
-#if !defined(HAS_FEATURE_MEMORY_SANITIZER)
-#  if defined(__has_feature)
-#    if __has_feature(memory_sanitizer)
-#      define HAS_FEATURE_MEMORY_SANITIZER 1
-#    endif
-#  endif
-#  if !defined(HAS_FEATURE_MEMORY_SANITIZER)
-#    define HAS_FEATURE_MEMORY_SANITIZER 0
-#  endif
-#endif
-
-#if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
-#  ifdef __SANITIZE_ADDRESS__
-#      define HAS_FEATURE_ADDRESS_SANITIZER 1
-#  elif defined(__has_feature)
-#    if __has_feature(address_sanitizer)
-#      define HAS_FEATURE_ADDRESS_SANITIZER 1
-#    endif
-#  endif
-#  if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
-#    define HAS_FEATURE_ADDRESS_SANITIZER 0
-#  endif
-#endif
-
 /* Note: on GCC "no_sanitize_address" is a function attribute only, on llvm it may also be applied to global
  * variables. We define a specific macro which knows this. Note that on GCC we don't need this decorator so much, since
  * our primary usecase for this attribute is registration structures placed in named ELF sections which shall not be
diff --git a/src/basic/meson.build b/src/basic/meson.build
index a4d7cb5fb3..541031b8a3 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -33,7 +33,7 @@ basic_sources = files(
         'chattr-util.h',
         'conf-files.c',
         'conf-files.h',
-        'def.h',
+        'constants.h',
         'devnum-util.c',
         'devnum-util.h',
         'dirent-util.c',
diff --git a/src/basic/path-lookup.h b/src/basic/path-lookup.h
index aed72defe7..46eb32c4b0 100644
--- a/src/basic/path-lookup.h
+++ b/src/basic/path-lookup.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "def.h"
+#include "constants.h"
 #include "macro.h"
 
 typedef enum LookupPathsFlags {
diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
index 4f607307b6..bcba5a5208 100644
--- a/src/basic/procfs-util.c
+++ b/src/basic/procfs-util.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "parse-util.h"
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 77f13c7bea..8fa9986a76 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "devnum-util.h"
 #include "env-util.h"
 #include "fd-util.h"
diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index 3fc954f7c6..ba209a8d47 100644
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -13,7 +13,7 @@
 #include "binfmt-util.h"
 #include "build.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
diff --git a/src/core/execute.c b/src/core/execute.c
index 981bb63440..8e70ecab82 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -48,10 +48,10 @@
 #include "cgroup-setup.h"
 #include "chase-symlinks.h"
 #include "chown-recursive.h"
+#include "constants.h"
 #include "cpu-set-util.h"
 #include "creds-util.h"
 #include "data-fd-util.h"
-#include "def.h"
 #include "env-file.h"
 #include "env-util.h"
 #include "errno-list.h"
diff --git a/src/core/main.c b/src/core/main.c
index 4cf5dd146b..cc725e6c42 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -37,7 +37,7 @@
 #include "crash-handler.h"
 #include "dbus-manager.h"
 #include "dbus.h"
-#include "def.h"
+#include "constants.h"
 #include "dev-setup.h"
 #include "efi-random.h"
 #include "efivars.h"
diff --git a/src/core/manager.c b/src/core/manager.c
index 1473425e4e..ffaa9fa595 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -30,13 +30,13 @@
 #include "bus-util.h"
 #include "clean-ipc.h"
 #include "clock-util.h"
+#include "constants.h"
 #include "core-varlink.h"
 #include "creds-util.h"
 #include "dbus-job.h"
 #include "dbus-manager.h"
 #include "dbus-unit.h"
 #include "dbus.h"
-#include "def.h"
 #include "dirent-util.h"
 #include "env-util.h"
 #include "escape.h"
diff --git a/src/core/service.c b/src/core/service.c
index bd44c37953..2c734eb096 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -13,9 +13,9 @@
 #include "bus-kernel.h"
 #include "bus-util.h"
 #include "chase-symlinks.h"
+#include "constants.h"
 #include "dbus-service.h"
 #include "dbus-unit.h"
-#include "def.h"
 #include "env-util.h"
 #include "escape.h"
 #include "exit-status.h"
diff --git a/src/core/socket.c b/src/core/socket.c
index 2a8aa54f7f..55847c2f7c 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -15,10 +15,10 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "chase-symlinks.h"
+#include "constants.h"
 #include "copy.h"
 #include "dbus-socket.h"
 #include "dbus-unit.h"
-#include "def.h"
 #include "errno-list.h"
 #include "exit-status.h"
 #include "fd-util.h"
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 9507374307..a6abcc6496 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -17,7 +17,7 @@
 #include "bus-util.h"
 #include "chase-symlinks.h"
 #include "compress.h"
-#include "def.h"
+#include "constants.h"
 #include "dissect-image.h"
 #include "fd-util.h"
 #include "format-table.h"
diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c
index e3fea1f2b0..90e31c98ef 100644
--- a/src/environment-d-generator/environment-d-generator.c
+++ b/src/environment-d-generator/environment-d-generator.c
@@ -3,7 +3,7 @@
 #include "sd-path.h"
 
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "env-file.h"
 #include "escape.h"
 #include "glyph-util.h"
diff --git a/src/home/homed-conf.c b/src/home/homed-conf.c
index 296e01449d..429a6e3c55 100644
--- a/src/home/homed-conf.c
+++ b/src/home/homed-conf.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "home-util.h"
 #include "homed-conf.h"
 
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index ee3ef04740..f3d3131828 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -11,7 +11,7 @@
 #include "bus-get-properties.h"
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
-#include "def.h"
+#include "constants.h"
 #include "env-file-label.h"
 #include "env-file.h"
 #include "env-util.h"
diff --git a/src/import/importd.c b/src/import/importd.c
index a6efb5315d..9a3ea131c1 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -10,7 +10,7 @@
 #include "bus-get-properties.h"
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
-#include "def.h"
+#include "constants.h"
 #include "env-util.h"
 #include "fd-util.h"
 #include "float.h"
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index e1b85d5218..7484200065 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -14,8 +14,8 @@
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "initreq.h"
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index 1ebcb8ddce..440aad1cf7 100644
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -7,8 +7,8 @@
 
 #include "build.h"
 #include "conf-parser.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "journal-remote-write.h"
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index e8fe04165e..3d7b552e95 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -10,7 +10,7 @@
 
 #include "af-list.h"
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 6d58e48bbf..5a34b73f76 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -12,8 +12,8 @@
 #include "alloc-util.h"
 #include "build.h"
 #include "conf-parser.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "env-file.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 7de1bd557a..eb8106cbb4 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -25,7 +25,7 @@
 #include "catalog.h"
 #include "chase-symlinks.h"
 #include "chattr-util.h"
-#include "def.h"
+#include "constants.h"
 #include "dissect-image.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index 51673ad1c5..dda6adfd48 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -8,7 +8,7 @@
 #include "bus-error.h"
 #include "bus-kernel.h"
 #include "bus-match.h"
-#include "def.h"
+#include "constants.h"
 #include "hashmap.h"
 #include "list.h"
 #include "prioq.h"
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 3803a2c4c4..7e72245e8d 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -27,7 +27,7 @@
 #include "bus-track.h"
 #include "bus-type.h"
 #include "cgroup-util.h"
-#include "def.h"
+#include "constants.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "glyph-util.h"
diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
index f9595e3477..7d7dc390dd 100644
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
@@ -8,7 +8,7 @@
 #include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-kernel.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "missing_resource.h"
 #include "string-util.h"
diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h
index 62d27f7b89..5302679a62 100644
--- a/src/libsystemd/sd-hwdb/hwdb-internal.h
+++ b/src/libsystemd/sd-hwdb/hwdb-internal.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <sys/stat.h>
 
-#include "def.h"
+#include "constants.h"
 #include "hashmap.h"
 #include "sparse-endian.h"
 
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 7aa47f18c2..a2014e3da0 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -17,7 +17,7 @@
 #include "bus-log-control-api.h"
 #include "bus-message.h"
 #include "bus-polkit.h"
-#include "def.h"
+#include "constants.h"
 #include "dlfcn-util.h"
 #include "kbd-util.h"
 #include "localed-util.h"
diff --git a/src/login/logind.c b/src/login/logind.c
index cdca5ca58c..cc153fd6bf 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -14,8 +14,8 @@
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
 #include "cgroup-util.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "device-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index a1671e3252..af0f5d8612 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -25,8 +25,8 @@
 #include "bus-wait-for-jobs.h"
 #include "cgroup-show.h"
 #include "cgroup-util.h"
+#include "constants.h"
 #include "copy.h"
-#include "def.h"
 #include "env-util.h"
 #include "fd-util.h"
 #include "format-table.h"
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index f8f0eb4900..8e7f7a5eba 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -7,7 +7,7 @@
 
 #include "build.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
diff --git a/src/network/networkd-conf.c b/src/network/networkd-conf.c
index 9190dbfc53..f73b2d43c7 100644
--- a/src/network/networkd-conf.c
+++ b/src/network/networkd-conf.c
@@ -4,7 +4,7 @@
  ***/
 
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "networkd-conf.h"
 #include "networkd-manager.h"
 #include "networkd-speed-meter.h"
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 2db8bb6074..f3ebeadd2c 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -17,8 +17,8 @@
 #include "bus-polkit.h"
 #include "bus-util.h"
 #include "conf-parser.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "dns-domain.h"
diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index 475147c2a0..54f56725a8 100644
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "errno.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/nspawn/nspawn-stub-pid1.c b/src/nspawn/nspawn-stub-pid1.c
index cea5f94b2e..47f7155b19 100644
--- a/src/nspawn/nspawn-stub-pid1.c
+++ b/src/nspawn/nspawn-stub-pid1.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 
 #include "argv-util.h"
-#include "def.h"
+#include "constants.h"
 #include "exit-status.h"
 #include "fd-util.h"
 #include "log.h"
diff --git a/src/partition/repart.c b/src/partition/repart.c
index 51fdaabc42..a037d7be1d 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -23,8 +23,8 @@
 #include "chase-symlinks.h"
 #include "conf-files.h"
 #include "conf-parser.h"
+#include "constants.h"
 #include "cryptsetup-util.h"
-#include "def.h"
 #include "device-util.h"
 #include "devnum-util.h"
 #include "dirent-util.h"
diff --git a/src/portable/portable.c b/src/portable/portable.c
index be906f786c..dd0f6d3d13 100644
--- a/src/portable/portable.c
+++ b/src/portable/portable.c
@@ -8,7 +8,7 @@
 #include "conf-files.h"
 #include "copy.h"
 #include "data-fd-util.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "discover-image.h"
 #include "dissect-image.h"
diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index d0d7bb1caf..ff71535c13 100644
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -12,7 +12,7 @@
 #include "bus-unit-util.h"
 #include "bus-wait-for-jobs.h"
 #include "chase-symlinks.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "env-file.h"
 #include "fd-util.h"
diff --git a/src/portable/portabled.c b/src/portable/portabled.c
index 2f9afdc8f2..a4fae65e7e 100644
--- a/src/portable/portabled.c
+++ b/src/portable/portabled.c
@@ -8,8 +8,8 @@
 #include "alloc-util.h"
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "main-func.h"
 #include "portabled-bus.h"
 #include "portabled-image-bus.h"
diff --git a/src/resolve/resolvconf-compat.c b/src/resolve/resolvconf-compat.c
index 0a0b97fa01..3804d3dde3 100644
--- a/src/resolve/resolvconf-compat.c
+++ b/src/resolve/resolvconf-compat.c
@@ -5,7 +5,7 @@
 
 #include "alloc-util.h"
 #include "build.h"
-#include "def.h"
+#include "constants.h"
 #include "dns-domain.h"
 #include "extract-word.h"
 #include "fileio.h"
diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c
index 6fd193a7cb..2be5986f9b 100644
--- a/src/resolve/resolved-conf.c
+++ b/src/resolve/resolved-conf.c
@@ -2,7 +2,7 @@
 
 #include "alloc-util.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "extract-word.h"
 #include "hexdecoct.h"
 #include "parse-util.h"
diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/resolve/resolved-dns-trust-anchor.c
index 69a484dc12..828045f68f 100644
--- a/src/resolve/resolved-dns-trust-anchor.c
+++ b/src/resolve/resolved-dns-trust-anchor.c
@@ -4,7 +4,7 @@
 
 #include "alloc-util.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "dns-domain.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c
index 464892a8fe..f5a8a80ebc 100644
--- a/src/resolve/resolved-dnssd.c
+++ b/src/resolve/resolved-dnssd.c
@@ -2,7 +2,7 @@
 
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "resolved-dnssd.h"
 #include "resolved-dns-rr.h"
 #include "resolved-manager.h"
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 17474fe0be..84d7b31bad 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -20,8 +20,8 @@
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
+#include "constants.h"
 #include "creds-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 5cb41a39da..69932865ba 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -10,7 +10,7 @@
 #include "alloc-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "dns-domain.h"
 #include "escape.h"
 #include "ether-addr-util.h"
diff --git a/src/shared/creds-util.c b/src/shared/creds-util.c
index ecf90e2084..f6811ce9aa 100644
--- a/src/shared/creds-util.c
+++ b/src/shared/creds-util.c
@@ -10,8 +10,8 @@
 
 #include "blockdev-util.h"
 #include "chattr-util.h"
+#include "constants.h"
 #include "creds-util.h"
-#include "def.h"
 #include "efi-api.h"
 #include "env-util.h"
 #include "fd-util.h"
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index cfa7d7e0f3..101db51a13 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -27,9 +27,9 @@
 #include "blockdev-util.h"
 #include "chase-symlinks.h"
 #include "conf-files.h"
+#include "constants.h"
 #include "copy.h"
 #include "cryptsetup-util.h"
-#include "def.h"
 #include "device-nodes.h"
 #include "device-util.h"
 #include "devnum-util.h"
diff --git a/src/shared/install.c b/src/shared/install.c
index 834a1c59e3..51aa60bb52 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -13,7 +13,7 @@
 #include "chase-symlinks.h"
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "errno-list.h"
 #include "extract-word.h"
diff --git a/src/shared/killall.c b/src/shared/killall.c
index 133b0e28d6..0b5a6642ec 100644
--- a/src/shared/killall.c
+++ b/src/shared/killall.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "format-util.h"
diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
index f165839536..90f258f5bf 100644
--- a/src/shared/pretty-print.c
+++ b/src/shared/pretty-print.c
@@ -6,7 +6,7 @@
 
 #include "alloc-util.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index efc066c4f2..0b1470ca01 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -21,7 +21,7 @@
 #include "blockdev-util.h"
 #include "btrfs-util.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "device-util.h"
 #include "devnum-util.h"
 #include "env-util.h"
diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
index 65e8d48347..ba8a23e18c 100644
--- a/src/shared/tpm2-util.c
+++ b/src/shared/tpm2-util.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
+#include "constants.h"
 #include "cryptsetup-util.h"
-#include "def.h"
 #include "dirent-util.h"
 #include "dlfcn-util.h"
 #include "efi-api.h"
diff --git a/src/shared/userdb-dropin.h b/src/shared/userdb-dropin.h
index 94cdd1517b..fad3981f7c 100644
--- a/src/shared/userdb-dropin.h
+++ b/src/shared/userdb-dropin.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "def.h"
+#include "constants.h"
 #include "group-record.h"
 #include "user-record.h"
 #include "userdb.h"
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index 906ebabbfc..d0120bb85d 100644
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -20,7 +20,7 @@
 #include "cgroup-setup.h"
 #include "cgroup-util.h"
 #include "coredump-util.h"
-#include "def.h"
+#include "constants.h"
 #include "errno-util.h"
 #include "exec-util.h"
 #include "fd-util.h"
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index c442f5544b..c6fa64c344 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -23,7 +23,7 @@
 
 #include "alloc-util.h"
 #include "blockdev-util.h"
-#include "def.h"
+#include "constants.h"
 #include "device-util.h"
 #include "dirent-util.h"
 #include "escape.h"
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 4d5b9d5579..6785ae2330 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -22,7 +22,7 @@
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"
-#include "def.h"
+#include "constants.h"
 #include "exec-util.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c
index 5648dfd83b..6161e134e1 100644
--- a/src/sulogin-shell/sulogin-shell.c
+++ b/src/sulogin-shell/sulogin-shell.c
@@ -11,7 +11,7 @@
 #include "bus-locator.h"
 #include "bus-util.h"
 #include "bus-error.h"
-#include "def.h"
+#include "constants.h"
 #include "env-util.h"
 #include "log.h"
 #include "process-util.h"
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 34f0182fc9..d752ad2742 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -11,8 +11,8 @@
 
 #include "build.h"
 #include "conf-files.h"
+#include "constants.h"
 #include "creds-util.h"
-#include "def.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index 14a3cf95d7..f6e89130bc 100644
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -8,7 +8,7 @@
 #include "bus-locator.h"
 #include "chase-symlinks.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "dissect-image.h"
 #include "fd-util.h"
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index a520d76dce..b68a7d6d5a 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -7,9 +7,9 @@
 #include "build.h"
 #include "chase-symlinks.h"
 #include "conf-files.h"
+#include "constants.h"
 #include "copy.h"
 #include "creds-util.h"
-#include "def.h"
 #include "dissect-image.h"
 #include "env-util.h"
 #include "fd-util.h"
diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c
index b10db0ae9d..2b27b44efb 100644
--- a/src/test/test-ellipsize.c
+++ b/src/test/test-ellipsize.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c
index bae06a81ad..2304f6a8b6 100644
--- a/src/test/test-exec-util.c
+++ b/src/test/test-exec-util.c
@@ -7,7 +7,7 @@
 
 #include "alloc-util.h"
 #include "copy.h"
-#include "def.h"
+#include "constants.h"
 #include "env-util.h"
 #include "exec-util.h"
 #include "fd-util.h"
diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c
index 391e1c97ba..ccf18ecd9c 100644
--- a/src/test/test-mountpoint-util.c
+++ b/src/test/test-mountpoint-util.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hashmap.h"
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 373574cc06..ad483301ef 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -20,7 +20,7 @@
 #include "bus-polkit.h"
 #include "clock-util.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "fileio-label.h"
 #include "fileio.h"
diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c
index 21fe7daec4..3e6cb43597 100644
--- a/src/timesync/timesyncd-conf.c
+++ b/src/timesync/timesyncd-conf.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "dns-domain.h"
 #include "extract-word.h"
 #include "string-util.h"
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 06328d4959..1fec6d4831 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -25,9 +25,9 @@
 #include "chase-symlinks.h"
 #include "chattr-util.h"
 #include "conf-files.h"
+#include "constants.h"
 #include "copy.h"
 #include "creds-util.h"
-#include "def.h"
 #include "devnum-util.h"
 #include "dirent-util.h"
 #include "dissect-image.h"
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 50b6776039..c7609d7d79 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -20,7 +20,7 @@
 #include "ask-password-api.h"
 #include "build.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "exit-status.h"
 #include "fd-util.h"
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index e408725b08..1fbfc58c0d 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -11,8 +11,8 @@
 #include "arphrd-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
+#include "constants.h"
 #include "creds-util.h"
-#include "def.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "ethtool-util.h"
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index f44a174d1f..5f837f4c31 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -6,7 +6,7 @@
 #include "architecture.h"
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "dirent-util.h"