diff options
44 files changed, 68 insertions, 63 deletions
diff --git a/src/grp-machine/systemd-machined/machined.c b/src/grp-machine/systemd-machined/machined.c index f947bbd144..82245819cc 100644 --- a/src/grp-machine/systemd-machined/machined.c +++ b/src/grp-machine/systemd-machined/machined.c @@ -23,6 +23,7 @@ #include <systemd/sd-daemon.h> +#include "machine-core/machined.h" #include "sd-bus/bus-error.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" @@ -35,8 +36,6 @@ #include "systemd-shared/bus-util.h" #include "systemd-shared/machine-image.h" -#include "machined.h" - Manager *manager_new(void) { Manager *m; int r; diff --git a/src/grp-resolve/libbasic-dns/resolved-def.h b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-def.h index c4c1915b18..c4c1915b18 100644 --- a/src/grp-resolve/libbasic-dns/resolved-def.h +++ b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-def.h diff --git a/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-packet.h b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-packet.h index b1aec71ccc..cb03de8986 100644 --- a/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-packet.h +++ b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-packet.h @@ -22,7 +22,6 @@ #include <netinet/ip.h> #include <netinet/udp.h> -#include "resolved-def.h" #include "systemd-basic/hashmap.h" #include "systemd-basic/in-addr-util.h" #include "systemd-basic/macro.h" @@ -31,6 +30,7 @@ typedef struct DnsPacket DnsPacket; typedef struct DnsPacketHeader DnsPacketHeader; +#include "resolved-def.h" #include "resolved-dns-answer.h" #include "resolved-dns-question.h" #include "resolved-dns-rr.h" diff --git a/src/grp-resolve/systemd-resolve/resolve-tool.c b/src/grp-resolve/systemd-resolve/resolve-tool.c index ed55471b97..e0e4c9f70a 100644 --- a/src/grp-resolve/systemd-resolve/resolve-tool.c +++ b/src/grp-resolve/systemd-resolve/resolve-tool.c @@ -22,8 +22,8 @@ #include <systemd/sd-bus.h> +#include "basic-dns/resolved-def.h" #include "basic-dns/resolved-dns-packet.h" -#include "resolved-def.h" #include "sd-bus/bus-error.h" #include "sd-netlink/netlink-util.h" #include "sd-netlink/sd-netlink.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-bus.c b/src/grp-resolve/systemd-resolved/resolved-bus.c index 879de1715d..352d515f32 100644 --- a/src/grp-resolve/systemd-resolved/resolved-bus.c +++ b/src/grp-resolve/systemd-resolved/resolved-bus.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "resolved-def.h" +#include "basic-dns/resolved-def.h" #include "sd-bus/bus-common-errors.h" #include "systemd-basic/alloc-util.h" #include "systemd-shared/bus-util.h" diff --git a/src/grp-system/libcore/src/dbus-manager.h b/src/grp-system/libcore/include/core/dbus-manager.h index 8f54e84bfb..36a2e9481b 100644 --- a/src/grp-system/libcore/src/dbus-manager.h +++ b/src/grp-system/libcore/include/core/dbus-manager.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "core/manager.h" +#include "manager.h" extern const sd_bus_vtable bus_manager_vtable[]; diff --git a/src/grp-system/libcore/src/audit-fd.c b/src/grp-system/libcore/src/audit-fd.c index 3c2d06425f..12509951b7 100644 --- a/src/grp-system/libcore/src/audit-fd.c +++ b/src/grp-system/libcore/src/audit-fd.c @@ -20,7 +20,7 @@ #include <errno.h> -#include "core/audit-fd.h" +#include "audit-fd.h" #ifdef HAVE_AUDIT diff --git a/src/grp-system/libcore/include/core/audit-fd.h b/src/grp-system/libcore/src/audit-fd.h index 0eccb59210..0eccb59210 100644 --- a/src/grp-system/libcore/include/core/audit-fd.h +++ b/src/grp-system/libcore/src/audit-fd.h diff --git a/src/grp-system/libcore/src/dbus-job.c b/src/grp-system/libcore/src/dbus-job.c index 5231cb4607..0eddfe60d7 100644 --- a/src/grp-system/libcore/src/dbus-job.c +++ b/src/grp-system/libcore/src/dbus-job.c @@ -20,13 +20,13 @@ #include <systemd/sd-bus.h> #include "core/job.h" -#include "core/selinux-access.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/log.h" #include "systemd-basic/string-util.h" #include "dbus-job.h" #include "dbus.h" +#include "selinux-access.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, job_type, JobType); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_state, job_state, JobState); diff --git a/src/grp-system/libcore/src/dbus-manager.c b/src/grp-system/libcore/src/dbus-manager.c index 89b93164ec..8ae359f2d4 100644 --- a/src/grp-system/libcore/src/dbus-manager.c +++ b/src/grp-system/libcore/src/dbus-manager.c @@ -21,7 +21,7 @@ #include <sys/prctl.h> #include <unistd.h> -#include "core/selinux-access.h" +#include "core/dbus-manager.h" #include "sd-bus/bus-common-errors.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/architecture.h" @@ -43,9 +43,9 @@ #include "dbus-execute.h" #include "dbus-job.h" -#include "dbus-manager.h" #include "dbus-unit.h" #include "dbus.h" +#include "selinux-access.h" static int property_get_version( sd_bus *bus, diff --git a/src/grp-system/libcore/src/dbus-scope.c b/src/grp-system/libcore/src/dbus-scope.c index 97d0873ae4..5586e1a75f 100644 --- a/src/grp-system/libcore/src/dbus-scope.c +++ b/src/grp-system/libcore/src/dbus-scope.c @@ -18,7 +18,6 @@ ***/ #include "core/scope.h" -#include "core/selinux-access.h" #include "core/unit.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-internal.h" @@ -30,6 +29,7 @@ #include "dbus-scope.h" #include "dbus-unit.h" #include "dbus.h" +#include "selinux-access.h" static int bus_scope_abandon(sd_bus_message *message, void *userdata, sd_bus_error *error) { Scope *s = userdata; diff --git a/src/grp-system/libcore/src/dbus-unit.c b/src/grp-system/libcore/src/dbus-unit.c index cdd564ae91..ef12ad66a3 100644 --- a/src/grp-system/libcore/src/dbus-unit.c +++ b/src/grp-system/libcore/src/dbus-unit.c @@ -19,7 +19,6 @@ #include <systemd/sd-bus.h> -#include "core/selinux-access.h" #include "sd-bus/bus-common-errors.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" @@ -35,6 +34,7 @@ #include "dbus-unit.h" #include "dbus.h" +#include "selinux-access.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_load_state, unit_load_state, UnitLoadState); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_job_mode, job_mode, JobMode); diff --git a/src/grp-system/libcore/src/dbus.c b/src/grp-system/libcore/src/dbus.c index 9b4360dbbc..16fe5d4ded 100644 --- a/src/grp-system/libcore/src/dbus.c +++ b/src/grp-system/libcore/src/dbus.c @@ -23,7 +23,7 @@ #include <systemd/sd-bus.h> -#include "core/selinux-access.h" +#include "core/dbus-manager.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-internal.h" @@ -43,9 +43,9 @@ #include "dbus-execute.h" #include "dbus-job.h" #include "dbus-kill.h" -#include "dbus-manager.h" #include "dbus-unit.h" #include "dbus.h" +#include "selinux-access.h" #define CONNECTIONS_MAX 4096 diff --git a/src/grp-system/libcore/src/load-dropin.c b/src/grp-system/libcore/src/load-dropin.c index 89dbf97283..4374a1fc25 100644 --- a/src/grp-system/libcore/src/load-dropin.c +++ b/src/grp-system/libcore/src/load-dropin.c @@ -18,7 +18,6 @@ ***/ -#include "core/load-dropin.h" #include "core/load-fragment.h" #include "core/unit.h" #include "systemd-basic/log.h" @@ -26,6 +25,8 @@ #include "systemd-basic/unit-name.h" #include "systemd-shared/conf-parser.h" +#include "load-dropin.h" + static int add_dependency_consumer( UnitDependency dependency, const char *entry, diff --git a/src/grp-system/libcore/include/core/load-dropin.h b/src/grp-system/libcore/src/load-dropin.h index d007aec604..aa0fa024de 100644 --- a/src/grp-system/libcore/include/core/load-dropin.h +++ b/src/grp-system/libcore/src/load-dropin.h @@ -19,10 +19,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "core/unit.h" #include "systemd-shared/dropin.h" -#include "unit.h" - /* Read service data supplementary drop-in directories */ static inline int unit_find_dropin_paths(Unit *u, char ***paths) { diff --git a/src/grp-system/libcore/load-fragment-gperf.gperf.m4 b/src/grp-system/libcore/src/load-fragment-gperf.gperf.m4 index 6a5c16a000..6a5c16a000 100644 --- a/src/grp-system/libcore/load-fragment-gperf.gperf.m4 +++ b/src/grp-system/libcore/src/load-fragment-gperf.gperf.m4 diff --git a/src/grp-system/libcore/src/load-fragment.c b/src/grp-system/libcore/src/load-fragment.c index 319bb512cd..f4a9b2261c 100644 --- a/src/grp-system/libcore/src/load-fragment.c +++ b/src/grp-system/libcore/src/load-fragment.c @@ -57,7 +57,6 @@ #ifdef HAVE_SECCOMP #include "systemd-shared/seccomp-util.h" #endif -#include "core/unit-printf.h" #include "core/unit.h" #include "systemd-basic/securebits.h" #include "systemd-basic/signal-util.h" @@ -68,6 +67,8 @@ #include "systemd-basic/utf8.h" #include "systemd-basic/web-util.h" +#include "unit-printf.h" + int config_parse_warn_compat( const char *unit, const char *filename, diff --git a/src/grp-system/libcore/src/locale-setup.c b/src/grp-system/libcore/src/locale-setup.c index 1b7a92e632..1794b474b8 100644 --- a/src/grp-system/libcore/src/locale-setup.c +++ b/src/grp-system/libcore/src/locale-setup.c @@ -20,7 +20,6 @@ #include <errno.h> #include <stdlib.h> -#include "core/locale-setup.h" #include "systemd-basic/env-util.h" #include "systemd-basic/fileio.h" #include "systemd-basic/locale-util.h" @@ -29,6 +28,8 @@ #include "systemd-basic/util.h" #include "systemd-basic/virt.h" +#include "locale-setup.h" + int locale_setup(char ***environment) { char **add; char *variables[_VARIABLE_LC_MAX] = {}; diff --git a/src/grp-system/libcore/include/core/locale-setup.h b/src/grp-system/libcore/src/locale-setup.h index 3b97497afe..3b97497afe 100644 --- a/src/grp-system/libcore/include/core/locale-setup.h +++ b/src/grp-system/libcore/src/locale-setup.h diff --git a/src/grp-system/libcore/src/manager.c b/src/grp-system/libcore/src/manager.c index 9a5bceb2dd..824f01669d 100644 --- a/src/grp-system/libcore/src/manager.c +++ b/src/grp-system/libcore/src/manager.c @@ -39,10 +39,8 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-messages.h> -#include "core/audit-fd.h" -#include "core/locale-setup.h" +#include "core/dbus-manager.h" #include "core/manager.h" -#include "core/transaction.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-kernel.h" @@ -82,10 +80,12 @@ #include "systemd-shared/path-lookup.h" #include "systemd-shared/watchdog.h" +#include "audit-fd.h" #include "dbus-job.h" -#include "dbus-manager.h" #include "dbus-unit.h" #include "dbus.h" +#include "locale-setup.h" +#include "transaction.h" #define NOTIFY_RCVBUF_SIZE (8*1024*1024) #define CGROUPS_AGENT_RCVBUF_SIZE (8*1024*1024) diff --git a/src/grp-system/libcore/src/scope.c b/src/grp-system/libcore/src/scope.c index 708d75360d..11816469a6 100644 --- a/src/grp-system/libcore/src/scope.c +++ b/src/grp-system/libcore/src/scope.c @@ -20,7 +20,6 @@ #include <errno.h> #include <unistd.h> -#include "core/load-dropin.h" #include "core/scope.h" #include "core/unit.h" #include "systemd-basic/alloc-util.h" @@ -32,6 +31,7 @@ #include "systemd-basic/unit-name.h" #include "dbus-scope.h" +#include "load-dropin.h" static const UnitActiveState state_translation_table[_SCOPE_STATE_MAX] = { [SCOPE_DEAD] = UNIT_INACTIVE, diff --git a/src/grp-system/libcore/src/selinux-access.c b/src/grp-system/libcore/src/selinux-access.c index a887dd8535..df3cf14d31 100644 --- a/src/grp-system/libcore/src/selinux-access.c +++ b/src/grp-system/libcore/src/selinux-access.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "core/selinux-access.h" +#include "selinux-access.h" #ifdef HAVE_SELINUX @@ -31,7 +31,6 @@ #include <systemd/sd-bus.h> -#include "core/audit-fd.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/log.h" #include "systemd-basic/path-util.h" @@ -41,6 +40,8 @@ #include "systemd-basic/util.h" #include "systemd-shared/bus-util.h" +#include "audit-fd.h" + static bool initialized = false; struct audit_info { diff --git a/src/grp-system/libcore/include/core/selinux-access.h b/src/grp-system/libcore/src/selinux-access.h index fb4fc4f5a3..1d6fc02a0a 100644 --- a/src/grp-system/libcore/include/core/selinux-access.h +++ b/src/grp-system/libcore/src/selinux-access.h @@ -21,10 +21,9 @@ #include <systemd/sd-bus.h> +#include "core/manager.h" #include "systemd-shared/bus-util.h" -#include "manager.h" - int mac_selinux_generic_access_check(sd_bus_message *message, const char *path, const char *permission, sd_bus_error *error); #ifdef HAVE_SELINUX diff --git a/src/grp-system/libcore/src/service.c b/src/grp-system/libcore/src/service.c index e499a088da..8f532f5039 100644 --- a/src/grp-system/libcore/src/service.c +++ b/src/grp-system/libcore/src/service.c @@ -21,11 +21,9 @@ #include <signal.h> #include <unistd.h> -#include "core/load-dropin.h" #include "core/load-fragment.h" #include "core/manager.h" #include "core/service.h" -#include "core/unit-printf.h" #include "core/unit.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-kernel.h" @@ -54,6 +52,8 @@ #include "systemd-shared/bus-util.h" #include "dbus-service.h" +#include "load-dropin.h" +#include "unit-printf.h" static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, diff --git a/src/grp-system/libcore/src/socket.c b/src/grp-system/libcore/src/socket.c index 2d6b5b322c..3350fb6dfd 100644 --- a/src/grp-system/libcore/src/socket.c +++ b/src/grp-system/libcore/src/socket.c @@ -30,7 +30,6 @@ #include <linux/sctp.h> #include "core/socket.h" -#include "core/unit-printf.h" #include "core/unit.h" #include "sd-bus/bus-error.h" #include "systemd-basic/alloc-util.h" @@ -59,6 +58,7 @@ #include "systemd-shared/bus-util.h" #include "dbus-socket.h" +#include "unit-printf.h" static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = { [SOCKET_DEAD] = UNIT_INACTIVE, diff --git a/src/grp-system/libcore/src/transaction.c b/src/grp-system/libcore/src/transaction.c index 3d375d2e1e..2768be914f 100644 --- a/src/grp-system/libcore/src/transaction.c +++ b/src/grp-system/libcore/src/transaction.c @@ -20,13 +20,13 @@ #include <fcntl.h> #include <unistd.h> -#include "core/transaction.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/terminal-util.h" #include "dbus-unit.h" +#include "transaction.h" static void transaction_unlink_job(Transaction *tr, Job *j, bool delete_dependencies); diff --git a/src/grp-system/libcore/include/core/transaction.h b/src/grp-system/libcore/src/transaction.h index 355b7bb6e6..e4066a0963 100644 --- a/src/grp-system/libcore/include/core/transaction.h +++ b/src/grp-system/libcore/src/transaction.h @@ -19,14 +19,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "core/job.h" +#include "core/manager.h" +#include "core/unit.h" #include "systemd-basic/hashmap.h" typedef struct Transaction Transaction; -#include "job.h" -#include "manager.h" -#include "unit.h" - struct Transaction { /* Jobs to be added */ Hashmap *jobs; /* Unit object => Job object list 1:1 */ diff --git a/src/grp-system/libcore/src/unit-printf.c b/src/grp-system/libcore/src/unit-printf.c index 076ef9be11..2f73214295 100644 --- a/src/grp-system/libcore/src/unit-printf.c +++ b/src/grp-system/libcore/src/unit-printf.c @@ -17,7 +17,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "core/unit-printf.h" #include "core/unit.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" @@ -29,6 +28,8 @@ #include "systemd-basic/user-util.h" #include "systemd-shared/specifier.h" +#include "unit-printf.h" + static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) { Unit *u = userdata; diff --git a/src/grp-system/libcore/include/core/unit-printf.h b/src/grp-system/libcore/src/unit-printf.h index 4fc8531228..7ef76e5bb9 100644 --- a/src/grp-system/libcore/include/core/unit-printf.h +++ b/src/grp-system/libcore/src/unit-printf.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "unit.h" +#include "core/unit.h" int unit_name_printf(Unit *u, const char* text, char **ret); int unit_full_printf(Unit *u, const char *text, char **ret); diff --git a/src/grp-system/libcore/src/unit.c b/src/grp-system/libcore/src/unit.c index f17f18c679..7ad20bd60d 100644 --- a/src/grp-system/libcore/src/unit.c +++ b/src/grp-system/libcore/src/unit.c @@ -27,7 +27,6 @@ #include <systemd/sd-messages.h> #include "core/execute.h" -#include "core/load-dropin.h" #include "core/load-fragment.h" #include "core/unit.h" #include "sd-bus/bus-common-errors.h" @@ -59,6 +58,7 @@ #include "dbus-unit.h" #include "dbus.h" +#include "load-dropin.h" const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = { [UNIT_SERVICE] = &service_vtable, diff --git a/src/grp-system/systemd/main.c b/src/grp-system/systemd/main.c index 8f88e1e119..4877aeeb30 100644 --- a/src/grp-system/systemd/main.c +++ b/src/grp-system/systemd/main.c @@ -38,6 +38,7 @@ #include <systemd/sd-bus.h> #include <systemd/sd-daemon.h> +#include "core/dbus-manager.h" #include "core/hostname-setup.h" #include "core/ima-setup.h" #include "core/killall.h" @@ -49,7 +50,6 @@ #include "core/mount-setup.h" #include "core/selinux-setup.h" #include "core/smack-setup.h" -#include "dbus-manager.h" #include "sd-bus/bus-error.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/architecture.h" diff --git a/src/grp-machine/systemd-machined/image-dbus.h b/src/libmachine-core/include/machine-core/image-dbus.h index b62da996c6..b62da996c6 100644 --- a/src/grp-machine/systemd-machined/image-dbus.h +++ b/src/libmachine-core/include/machine-core/image-dbus.h diff --git a/src/grp-machine/systemd-machined/machine-dbus.h b/src/libmachine-core/include/machine-core/machine-dbus.h index d3faf5cb07..d3faf5cb07 100644 --- a/src/grp-machine/systemd-machined/machine-dbus.h +++ b/src/libmachine-core/include/machine-core/machine-dbus.h diff --git a/src/grp-machine/systemd-machined/machine.h b/src/libmachine-core/include/machine-core/machine.h index 361451b1c8..361451b1c8 100644 --- a/src/grp-machine/systemd-machined/machine.h +++ b/src/libmachine-core/include/machine-core/machine.h diff --git a/src/grp-machine/systemd-machined/machined.h b/src/libmachine-core/include/machine-core/machined.h index 8994097db0..8994097db0 100644 --- a/src/grp-machine/systemd-machined/machined.h +++ b/src/libmachine-core/include/machine-core/machined.h diff --git a/src/grp-machine/systemd-machined/operation.h b/src/libmachine-core/include/machine-core/operation.h index 5eed62bd6f..5eed62bd6f 100644 --- a/src/grp-machine/systemd-machined/operation.h +++ b/src/libmachine-core/include/machine-core/operation.h diff --git a/src/grp-machine/systemd-machined/image-dbus.c b/src/libmachine-core/src/image-dbus.c index e34b2578f6..cee2d2d7f2 100644 --- a/src/grp-machine/systemd-machined/image-dbus.c +++ b/src/libmachine-core/src/image-dbus.c @@ -17,6 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "machine-core/image-dbus.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/bus-label.h" #include "systemd-basic/fd-util.h" @@ -27,8 +28,6 @@ #include "systemd-shared/bus-util.h" #include "systemd-shared/machine-image.h" -#include "image-dbus.h" - static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, image_type, ImageType); int bus_image_method_remove( diff --git a/src/grp-machine/systemd-machined/machine-dbus.c b/src/libmachine-core/src/machine-dbus.c index 769101ab42..b18d851898 100644 --- a/src/grp-machine/systemd-machined/machine-dbus.c +++ b/src/libmachine-core/src/machine-dbus.c @@ -28,6 +28,8 @@ #include <libgen.h> #undef basename +#include "machine-core/machine-dbus.h" +#include "machine-core/machine.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-internal.h" #include "sd-netlink/local-addresses.h" @@ -49,9 +51,6 @@ #include "systemd-basic/user-util.h" #include "systemd-shared/bus-util.h" -#include "machine-dbus.h" -#include "machine.h" - static int property_get_id( sd_bus *bus, const char *path, diff --git a/src/grp-machine/systemd-machined/machine.c b/src/libmachine-core/src/machine.c index 75d1c98023..9eca08948f 100644 --- a/src/grp-machine/systemd-machined/machine.c +++ b/src/libmachine-core/src/machine.c @@ -23,6 +23,8 @@ #include <systemd/sd-messages.h> +#include "machine-core/machine-dbus.h" +#include "machine-core/machine.h" #include "sd-bus/bus-error.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/escape.h" @@ -41,9 +43,6 @@ #include "systemd-basic/util.h" #include "systemd-shared/bus-util.h" -#include "machine-dbus.h" -#include "machine.h" - Machine* machine_new(Manager *manager, MachineClass class, const char *name) { Machine *m; diff --git a/src/grp-machine/systemd-machined/machined-dbus.c b/src/libmachine-core/src/machined-dbus.c index 0a836fb5fd..9a50dcbaa8 100644 --- a/src/grp-machine/systemd-machined/machined-dbus.c +++ b/src/libmachine-core/src/machined-dbus.c @@ -23,6 +23,9 @@ #include <systemd/sd-id128.h> +#include "machine-core/image-dbus.h" +#include "machine-core/machine-dbus.h" +#include "machine-core/machined.h" #include "sd-bus/bus-common-errors.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/btrfs-util.h" @@ -42,10 +45,6 @@ #include "systemd-shared/machine-image.h" #include "systemd-shared/machine-pool.h" -#include "image-dbus.h" -#include "machine-dbus.h" -#include "machined.h" - static int property_get_pool_path( sd_bus *bus, const char *path, diff --git a/src/grp-machine/systemd-machined/operation.c b/src/libmachine-core/src/operation.c index 9732be95fb..715e867e4f 100644 --- a/src/grp-machine/systemd-machined/operation.c +++ b/src/libmachine-core/src/operation.c @@ -17,12 +17,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "machine-core/operation.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/process-util.h" -#include "operation.h" - static int operation_done(sd_event_source *s, const siginfo_t *si, void *userdata) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; Operation *o = userdata; diff --git a/src/grp-machine/systemd-machined/test-machine-tables.c b/src/libmachine-core/test/test-machine-tables.c index 8f9ce8d385..5f50c3856b 100644 --- a/src/grp-machine/systemd-machined/test-machine-tables.c +++ b/src/libmachine-core/test/test-machine-tables.c @@ -17,10 +17,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "machine-core/machine.h" #include "systemd-shared/test-tables.h" -#include "machine.h" - int main(int argc, char **argv) { test_table(machine_class, MACHINE_CLASS); test_table(machine_state, MACHINE_STATE); diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index b144c44220..b2e833116a 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -25,7 +25,6 @@ #include <string.h> #include "core/manager.h" -#include "core/unit-printf.h" #include "core/unit.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/glob-util.h" @@ -37,6 +36,7 @@ #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" #include "systemd-shared/specifier.h" +#include "unit-printf.h" #include "test-helper.h" diff --git a/tools/notsd-move b/tools/notsd-move index a861d98c99..a62c9d138f 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -137,6 +137,14 @@ move_files() ( mv -t src/libcore/src \ src/libcore/linux \ src/libcore/include/core/dbus*.h + mv -T src/libcore/{src,include/core}/dbus-manager.h + mv -T src/libcore/{include/core,src}/audit-fd.h + mv -T src/libcore/{include/core,src}/load-dropin.h + mv -T src/libcore/{include/core,src}/locale-setup.h + mv -T src/libcore/{include/core,src}/selinux-access.h + mv -T src/libcore/{include/core,src}/transaction.h + mv -T src/libcore/{include/core,src}/unit-printf.h + mv -T src/libcore/{,src}/load-fragment-gperf.gperf.m4 mv src/libsystemd-shared/{test,include/systemd-shared}/test-tables.h rmdir src/libsystemd-shared/test @@ -251,15 +259,17 @@ move_files() ( src/network/test-* rmdir src/network - # src/machine => src/{machinectl,systemd-machined} - mkdir src/machinectl - mv -t src/machinectl \ - src/machine/machinectl* - mkdir src/systemd-machined + # src/machine => src/{machinectl,systemd-machined,libmachine-core} + mkdir src/machinectl src/systemd-machined src/libmachine-core + mv -T src/{machine,machinectl}/machinectl.c + mv -T src/{machine,systemd-machined}/machined.c mv -t src/systemd-machined \ src/machine/.gitignore \ + src/machine/org.* + mv -t src/libmachine-core \ src/machine/* rmdir src/machine + split_lib src/libmachine-core # src/coredump => src/{coredumpctl,systemd-coredump} mkdir src/coredumpctl @@ -469,7 +479,7 @@ move_files() ( mkdir src/libudev/include mv -T src/libudev/{src,include}/libudev.h mv -T src/{systemd-networkd,libnetworkd-core}/networkd.h - mv -T src/{systemd-resolved,libbasic-dns}/resolved-def.h + mv -T src/{systemd-resolved,libbasic-dns/include/basic-dns}/resolved-def.h mv -t src/cdrom_id rules/*cdrom* mv -t src/mtd_probe rules/*mtd* mv -t src/v4l_id rules/*v4l* |