From 8af18182f3bf55270aadc83f32c518935d553a2a Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 8 Apr 2015 09:17:51 +0200 Subject: [PATCH] build: move systemd DHCP files to a common directory Create a new directory 'src/systemd' and move systemd DHCP files there. This new directory will contain all the files imported from systemd. --- .../src/libsystemd-network/dhcp-identifier.c | 0 .../src/libsystemd-network/dhcp-identifier.h | 0 .../src/libsystemd-network/dhcp-internal.h | 0 .../src/libsystemd-network/dhcp-lease-internal.h | 0 .../src/libsystemd-network/dhcp-network.c | 0 .../systemd-dhcp => systemd}/src/libsystemd-network/dhcp-option.c | 0 .../systemd-dhcp => systemd}/src/libsystemd-network/dhcp-packet.c | 0 .../src/libsystemd-network/dhcp-protocol.h | 0 .../src/libsystemd-network/dhcp6-internal.h | 0 .../src/libsystemd-network/dhcp6-lease-internal.h | 0 .../src/libsystemd-network/dhcp6-network.c | 0 .../src/libsystemd-network/dhcp6-option.c | 0 .../src/libsystemd-network/dhcp6-protocol.h | 0 .../src/libsystemd-network/network-internal.c | 0 .../src/libsystemd-network/network-internal.h | 0 .../src/libsystemd-network/sd-dhcp-client.c | 0 .../src/libsystemd-network/sd-dhcp-lease.c | 0 .../src/libsystemd-network/sd-dhcp6-client.c | 0 .../src/libsystemd-network/sd-dhcp6-lease.c | 0 .../systemd-dhcp => systemd}/src/libsystemd/sd-id128/sd-id128.c | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/async.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/fileio.c | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/fileio.h | 0 .../systemd-dhcp => systemd}/src/shared/in-addr-util.c | 0 .../systemd-dhcp => systemd}/src/shared/in-addr-util.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/list.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/log.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/macro.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/path-util.c | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/path-util.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/refcnt.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/siphash24.c | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/siphash24.h | 0 .../systemd-dhcp => systemd}/src/shared/socket-util.h | 0 .../systemd-dhcp => systemd}/src/shared/sparse-endian.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/strv.c | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/strv.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/time-util.c | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/time-util.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/unaligned.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/utf8.c | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/utf8.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/util.c | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/util.h | 0 .../systemd-dhcp => systemd}/src/systemd/_sd-common.h | 0 .../systemd-dhcp => systemd}/src/systemd/sd-dhcp-client.h | 0 .../systemd-dhcp => systemd}/src/systemd/sd-dhcp-lease.h | 0 .../systemd-dhcp => systemd}/src/systemd/sd-dhcp6-client.h | 0 .../systemd-dhcp => systemd}/src/systemd/sd-dhcp6-lease.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/systemd/sd-event.h | 0 src/{dhcp-manager/systemd-dhcp => systemd}/src/systemd/sd-id128.h | 0 51 files changed, 0 insertions(+), 0 deletions(-) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp-identifier.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp-identifier.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp-internal.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp-lease-internal.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp-network.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp-option.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp-packet.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp-protocol.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp6-internal.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp6-lease-internal.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp6-network.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp6-option.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/dhcp6-protocol.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/network-internal.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/network-internal.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/sd-dhcp-client.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/sd-dhcp-lease.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/sd-dhcp6-client.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd-network/sd-dhcp6-lease.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/libsystemd/sd-id128/sd-id128.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/async.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/fileio.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/fileio.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/in-addr-util.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/in-addr-util.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/list.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/log.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/macro.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/path-util.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/path-util.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/refcnt.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/siphash24.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/siphash24.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/socket-util.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/sparse-endian.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/strv.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/strv.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/time-util.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/time-util.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/unaligned.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/utf8.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/utf8.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/util.c (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/shared/util.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/systemd/_sd-common.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/systemd/sd-dhcp-client.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/systemd/sd-dhcp-lease.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/systemd/sd-dhcp6-client.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/systemd/sd-dhcp6-lease.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/systemd/sd-event.h (100%) rename src/{dhcp-manager/systemd-dhcp => systemd}/src/systemd/sd-id128.h (100%) diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.c b/src/systemd/src/libsystemd-network/dhcp-identifier.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.c rename to src/systemd/src/libsystemd-network/dhcp-identifier.c diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.h b/src/systemd/src/libsystemd-network/dhcp-identifier.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.h rename to src/systemd/src/libsystemd-network/dhcp-identifier.h diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-internal.h b/src/systemd/src/libsystemd-network/dhcp-internal.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-internal.h rename to src/systemd/src/libsystemd-network/dhcp-internal.h diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h b/src/systemd/src/libsystemd-network/dhcp-lease-internal.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h rename to src/systemd/src/libsystemd-network/dhcp-lease-internal.h diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c b/src/systemd/src/libsystemd-network/dhcp-network.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c rename to src/systemd/src/libsystemd-network/dhcp-network.c diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c b/src/systemd/src/libsystemd-network/dhcp-option.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c rename to src/systemd/src/libsystemd-network/dhcp-option.c diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c b/src/systemd/src/libsystemd-network/dhcp-packet.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c rename to src/systemd/src/libsystemd-network/dhcp-packet.c diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h b/src/systemd/src/libsystemd-network/dhcp-protocol.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h rename to src/systemd/src/libsystemd-network/dhcp-protocol.h diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-internal.h b/src/systemd/src/libsystemd-network/dhcp6-internal.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-internal.h rename to src/systemd/src/libsystemd-network/dhcp6-internal.h diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-lease-internal.h b/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-lease-internal.h rename to src/systemd/src/libsystemd-network/dhcp6-lease-internal.h diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c b/src/systemd/src/libsystemd-network/dhcp6-network.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c rename to src/systemd/src/libsystemd-network/dhcp6-network.c diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c rename to src/systemd/src/libsystemd-network/dhcp6-option.c diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h b/src/systemd/src/libsystemd-network/dhcp6-protocol.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h rename to src/systemd/src/libsystemd-network/dhcp6-protocol.h diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c b/src/systemd/src/libsystemd-network/network-internal.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c rename to src/systemd/src/libsystemd-network/network-internal.c diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h b/src/systemd/src/libsystemd-network/network-internal.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h rename to src/systemd/src/libsystemd-network/network-internal.h diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c b/src/systemd/src/libsystemd-network/sd-dhcp-client.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c rename to src/systemd/src/libsystemd-network/sd-dhcp-client.c diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c b/src/systemd/src/libsystemd-network/sd-dhcp-lease.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c rename to src/systemd/src/libsystemd-network/sd-dhcp-lease.c diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c rename to src/systemd/src/libsystemd-network/sd-dhcp6-client.c diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c b/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c rename to src/systemd/src/libsystemd-network/sd-dhcp6-lease.c diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd/sd-id128/sd-id128.c b/src/systemd/src/libsystemd/sd-id128/sd-id128.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/libsystemd/sd-id128/sd-id128.c rename to src/systemd/src/libsystemd/sd-id128/sd-id128.c diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/async.h b/src/systemd/src/shared/async.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/async.h rename to src/systemd/src/shared/async.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c b/src/systemd/src/shared/fileio.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/fileio.c rename to src/systemd/src/shared/fileio.c diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.h b/src/systemd/src/shared/fileio.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/fileio.h rename to src/systemd/src/shared/fileio.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c b/src/systemd/src/shared/in-addr-util.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c rename to src/systemd/src/shared/in-addr-util.c diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h b/src/systemd/src/shared/in-addr-util.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h rename to src/systemd/src/shared/in-addr-util.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/list.h b/src/systemd/src/shared/list.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/list.h rename to src/systemd/src/shared/list.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/log.h b/src/systemd/src/shared/log.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/log.h rename to src/systemd/src/shared/log.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/macro.h b/src/systemd/src/shared/macro.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/macro.h rename to src/systemd/src/shared/macro.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/path-util.c b/src/systemd/src/shared/path-util.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/path-util.c rename to src/systemd/src/shared/path-util.c diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/path-util.h b/src/systemd/src/shared/path-util.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/path-util.h rename to src/systemd/src/shared/path-util.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h b/src/systemd/src/shared/refcnt.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h rename to src/systemd/src/shared/refcnt.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c b/src/systemd/src/shared/siphash24.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c rename to src/systemd/src/shared/siphash24.c diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h b/src/systemd/src/shared/siphash24.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h rename to src/systemd/src/shared/siphash24.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h b/src/systemd/src/shared/socket-util.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h rename to src/systemd/src/shared/socket-util.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h b/src/systemd/src/shared/sparse-endian.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h rename to src/systemd/src/shared/sparse-endian.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/strv.c b/src/systemd/src/shared/strv.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/strv.c rename to src/systemd/src/shared/strv.c diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/strv.h b/src/systemd/src/shared/strv.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/strv.h rename to src/systemd/src/shared/strv.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.c b/src/systemd/src/shared/time-util.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/time-util.c rename to src/systemd/src/shared/time-util.c diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.h b/src/systemd/src/shared/time-util.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/time-util.h rename to src/systemd/src/shared/time-util.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h b/src/systemd/src/shared/unaligned.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h rename to src/systemd/src/shared/unaligned.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.c b/src/systemd/src/shared/utf8.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/utf8.c rename to src/systemd/src/shared/utf8.c diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.h b/src/systemd/src/shared/utf8.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/utf8.h rename to src/systemd/src/shared/utf8.h diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/util.c b/src/systemd/src/shared/util.c similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/util.c rename to src/systemd/src/shared/util.c diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/util.h b/src/systemd/src/shared/util.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/shared/util.h rename to src/systemd/src/shared/util.h diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h b/src/systemd/src/systemd/_sd-common.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h rename to src/systemd/src/systemd/_sd-common.h diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h rename to src/systemd/src/systemd/sd-dhcp-client.h diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h rename to src/systemd/src/systemd/sd-dhcp-lease.h diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h rename to src/systemd/src/systemd/sd-dhcp6-client.h diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h b/src/systemd/src/systemd/sd-dhcp6-lease.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h rename to src/systemd/src/systemd/sd-dhcp6-lease.h diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h rename to src/systemd/src/systemd/sd-event.h diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h b/src/systemd/src/systemd/sd-id128.h similarity index 100% rename from src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h rename to src/systemd/src/systemd/sd-id128.h