12 files changed, 16 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
index 6649d19fc7..4c66564c4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -157,7 +157,7 @@
 /test-cgroup-util
 /test-compress
 /test-compress-benchmark
-/test-condition-util
+/test-condition
 /test-conf-files
 /test-copy
 /test-coredump-vacuum
diff --git a/Makefile.am b/Makefile.am
index a10c306ceb..461ffa944d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -861,8 +861,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/audit.h \
 	src/shared/xml.c \
 	src/shared/xml.h \
-	src/shared/condition-util.c \
-	src/shared/condition-util.h \
+	src/shared/condition.c \
+	src/shared/condition.h \
 	src/shared/bus-label.c \
 	src/shared/bus-label.h \
 	src/shared/gpt.h \
@@ -1357,7 +1357,7 @@ tests += \
 	test-capability \
 	test-async \
 	test-ratelimit \
-	test-condition-util \
+	test-condition \
 	test-uid-range \
 	test-bus-policy \
 	test-locale-util \
@@ -1517,10 +1517,10 @@ test_copy_SOURCES = \
 test_copy_LDADD = \
 	libsystemd-shared.la
 
-test_condition_util_SOURCES = \
-	src/test/test-condition-util.c
+test_condition_SOURCES = \
+	src/test/test-condition.c
 
-test_condition_util_LDADD = \
+test_condition_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-internal.la \
 	libsystemd-capability.la \
diff --git a/src/core/unit.h b/src/core/unit.h
index b5a224b3d4..8b24272245 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -38,7 +38,7 @@ typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;
 #include "socket-util.h"
 #include "execute.h"
 #include "cgroup.h"
-#include "condition-util.h"
+#include "condition.h"
 #include "install.h"
 #include "unit-name.h"
 #include "failure-action.h"
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index f3141f75dc..6f16050cdc 100644
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -32,7 +32,7 @@
 #include "utf8.h"
 #include "util.h"
 #include "conf-parser.h"
-#include "condition-util.h"
+#include "condition.h"
 #include "network-internal.h"
 
 const char *net_get_name(struct udev_device *device) {
diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h
index 49387d03cf..c64db2e79d 100644
--- a/src/libsystemd-network/network-internal.h
+++ b/src/libsystemd-network/network-internal.h
@@ -26,7 +26,7 @@
 #include <stdbool.h>
 
 #include "udev.h"
-#include "condition-util.h"
+#include "condition.h"
 
 bool net_match_config(const struct ether_addr *match_mac,
                       const char *match_path,
diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h
index e9a8a169db..a6fad2dbc4 100644
--- a/src/network/networkd-netdev.h
+++ b/src/network/networkd-netdev.h
@@ -25,7 +25,6 @@
 #include "hashmap.h"
 #include "list.h"
 #include "set.h"
-#include "condition-util.h"
 #include "in-addr-util.h"
 
 typedef struct NetDevVTable NetDevVTable;
diff --git a/src/network/networkd.h b/src/network/networkd.h
index d4e79ab2f3..19a661e131 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -37,7 +37,7 @@
 #include "hashmap.h"
 #include "list.h"
 #include "set.h"
-#include "condition-util.h"
+#include "condition.h"
 #include "in-addr-util.h"
 
 #define CACHE_INFO_INFINITY_LIFE_TIME 0xFFFFFFFFU
diff --git a/src/shared/condition-util.c b/src/shared/condition.c
index 5db20a7085..08bebeee73 100644
--- a/src/shared/condition-util.c
+++ b/src/shared/condition.c
@@ -28,7 +28,6 @@
 
 #include "sd-id128.h"
 #include "util.h"
-#include "condition-util.h"
 #include "virt.h"
 #include "path-util.h"
 #include "fileio.h"
@@ -40,6 +39,7 @@
 #include "ima-util.h"
 #include "selinux-util.h"
 #include "audit.h"
+#include "condition.h"
 
 Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
         Condition *c;
diff --git a/src/shared/condition-util.h b/src/shared/condition.h
index 28d1d94ff4..28d1d94ff4 100644
--- a/src/shared/condition-util.h
+++ b/src/shared/condition.h
diff --git a/src/test/test-condition-util.c b/src/test/test-condition.c
index b69e62bfd3..349c6470c3 100644
--- a/src/test/test-condition-util.c
+++ b/src/test/test-condition.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "condition-util.h"
+#include "condition.h"
 #include "macro.h"
 #include "util.h"
 #include "log.h"
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index d0a621c775..97d5609adf 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -20,7 +20,7 @@
 #include "automount.h"
 #include "cgroup.h"
 #include "compress.h"
-#include "condition-util.h"
+#include "condition.h"
 #include "device.h"
 #include "execute.h"
 #include "exit-status.h"
diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
index 5f3d4ad142..844ea98629 100644
--- a/src/udev/net/link-config.h
+++ b/src/udev/net/link-config.h
@@ -22,11 +22,10 @@
 #pragma once
 
 #include "ethtool-util.h"
-
-#include "condition-util.h"
-#include "libudev.h"
+#include "condition.h"
 #include "util.h"
 #include "list.h"
+#include "libudev.h"
 
 typedef struct link_config_ctx link_config_ctx;
 typedef struct link_config link_config;