diff --git a/src/core/device.c b/src/core/device.c
index 7ce971ff3b..a43664d3bd 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -796,7 +796,6 @@ static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
         }
 
         if (streq(action, "change"))  {
-                _cleanup_free_ char *e = NULL;
                 Unit *u;
                 Device *d, *l, *n;
 
diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index b6feddba98..2067dd5182 100644
--- a/src/resolve/resolved-dns-packet.c
+++ b/src/resolve/resolved-dns-packet.c
@@ -756,7 +756,7 @@ int dns_packet_append_opt(DnsPacket *p, uint16_t max_udp_size, bool edns0_do, in
                 static const uint8_t rfc6975[] = {
 
                         0, 5, /* OPTION_CODE: DAU */
-#if GCRYPT_VERSION_NUMBER >= 0x010600
+#if HAVE_GCRYPT && GCRYPT_VERSION_NUMBER >= 0x010600
                         0, 7, /* LIST_LENGTH */
 #else
                         0, 6, /* LIST_LENGTH */
@@ -767,7 +767,7 @@ int dns_packet_append_opt(DnsPacket *p, uint16_t max_udp_size, bool edns0_do, in
                         DNSSEC_ALGORITHM_RSASHA512,
                         DNSSEC_ALGORITHM_ECDSAP256SHA256,
                         DNSSEC_ALGORITHM_ECDSAP384SHA384,
-#if GCRYPT_VERSION_NUMBER >= 0x010600
+#if HAVE_GCRYPT && GCRYPT_VERSION_NUMBER >= 0x010600
                         DNSSEC_ALGORITHM_ED25519,
 #endif
 
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index e5e3803f84..adfb1f01fe 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6247,7 +6247,6 @@ static int normalize_names(char **names, bool warn_if_path) {
 }
 
 static int unit_exists(LookupPaths *lp, const char *unit) {
-        _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_free_ char *path = NULL;
         static const struct bus_properties_map property_map[] = {