diff --git a/src/basic/string-table.h b/src/basic/string-table.h
index 9bd7879355..228c12ad00 100644
--- a/src/basic/string-table.h
+++ b/src/basic/string-table.h
@@ -58,7 +58,7 @@ ssize_t string_table_lookup(const char * const *table, size_t len, const char *k
         }
 
 #define _DEFINE_STRING_TABLE_LOOKUP_FROM_STRING_FALLBACK(name,type,max,scope) \
-        type name##_from_string(const char *s) {                        \
+        scope type name##_from_string(const char *s) {                  \
                 type i;                                                 \
                 unsigned u = 0;                                         \
                 if (!s)                                                 \
diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h
index ee57e0de72..3baec8cd41 100644
--- a/src/boot/efi/util.h
+++ b/src/boot/efi/util.h
@@ -32,7 +32,6 @@ CHAR16 *stra_to_path(CHAR8 *stra);
 CHAR16 *stra_to_str(CHAR8 *stra);
 
 EFI_STATUS file_read(EFI_FILE_HANDLE dir, CHAR16 *name, UINTN off, UINTN size, CHAR8 **content, UINTN *content_size);
-#endif
 
 static inline void FreePoolp(void *p) {
         FreePool(*(void**) p);
@@ -40,3 +39,5 @@ static inline void FreePoolp(void *p) {
 
 #define _cleanup_(x) __attribute__((cleanup(x)))
 #define _cleanup_freepool_ _cleanup_(FreePoolp)
+
+#endif
diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c
index 824ad06ab0..c627027aae 100644
--- a/src/core/dynamic-user.c
+++ b/src/core/dynamic-user.c
@@ -34,7 +34,7 @@ static DynamicUser* dynamic_user_free(DynamicUser *d) {
 }
 
 static int dynamic_user_add(Manager *m, const char *name, int storage_socket[2], DynamicUser **ret) {
-        DynamicUser *d = NULL;
+        DynamicUser *d;
         int r;
 
         assert(m);