6 files changed, 7 insertions, 1 deletions
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index d5f971b18..9fb7e34dd 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -21,10 +21,12 @@
 #include <sys/socket.h>
 
 #include "fd-util.h"
-#include "musl_missing.h"
 #include "log.h"
 #include "socket-util.h"
 
+/// Additional includes needed by elogind
+#include "musl_missing.h"
+
 int main(int argc, char *argv[]) {
 
         static const union sockaddr_union sa = {
diff --git a/src/libelogind/sd-login/test-login.c b/src/libelogind/sd-login/test-login.c
index c1fd7dd33..e0a838d3f 100644
--- a/src/libelogind/sd-login/test-login.c
+++ b/src/libelogind/sd-login/test-login.c
@@ -29,6 +29,9 @@
 #include "strv.h"
 #include "util.h"
 
+/// Additional includes needed by elogind
+#include "musl_missing.h"
+
 static void test_login(void) {
         _cleanup_close_pair_ int pair[2] = { -1, -1 };
         _cleanup_free_ char *pp = NULL, *qq = NULL;
@@ -255,6 +258,7 @@ static void test_login(void) {
 }
 
 int main(int argc, char* argv[]) {
+        elogind_set_program_name(argv[0]);
         log_parse_environment();
         log_open();
 
diff --git a/src/basic/musl_missing.c b/src/shared/musl_missing.c
index 5ce787beb..5ce787beb 100644
--- a/src/basic/musl_missing.c
+++ b/src/shared/musl_missing.c
diff --git a/src/basic/musl_missing.h b/src/shared/musl_missing.h
index 37a7005c9..37a7005c9 100644
--- a/src/basic/musl_missing.h
+++ b/src/shared/musl_missing.h
diff --git a/src/basic/parse-printf-format.c b/src/shared/parse-printf-format.c
index a99952b70..a99952b70 100644
--- a/src/basic/parse-printf-format.c
+++ b/src/shared/parse-printf-format.c
diff --git a/src/basic/parse-printf-format.h b/src/shared/parse-printf-format.h
index 5ca0fdf56..5ca0fdf56 100644
--- a/src/basic/parse-printf-format.h
+++ b/src/shared/parse-printf-format.h