diff --git a/lib/cf-h2-proxy.h b/lib/cf-h2-proxy.h
index c01bf62133..1b3f85aaaf 100644
--- a/lib/cf-h2-proxy.h
+++ b/lib/cf-h2-proxy.h
@@ -33,7 +33,6 @@ CURLcode Curl_cf_h2_proxy_insert_after(struct Curl_cfilter *cf,
 
 extern struct Curl_cftype Curl_cft_h2_proxy;
 
-
-#endif /* defined(USE_NGHTTP2) && !defined(CURL_DISABLE_PROXY) */
+#endif /* USE_NGHTTP2 && !CURL_DISABLE_PROXY */
 
 #endif /* HEADER_CURL_H2_PROXY_H */
diff --git a/lib/connect.c b/lib/connect.c
index c4b9564a88..ef65eb9c48 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -1510,7 +1510,7 @@ CURLcode Curl_conn_setup(struct Curl_easy *data,
     if(result)
       goto out;
   }
-#endif /* !defined(CURL_DISABLE_HTTP) */
+#endif /* !CURL_DISABLE_HTTP */
 
   /* Still no cfilter set, apply default. */
   if(!conn->cfilter[sockindex]) {
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 310a5b6ab8..8600f90778 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -513,7 +513,7 @@ curl_dbg_freeaddrinfo(struct addrinfo *freethis,
   freeaddrinfo(freethis);
 #endif
 }
-#endif /* defined(CURLDEBUG) && defined(HAVE_FREEADDRINFO) */
+#endif /* CURLDEBUG && HAVE_FREEADDRINFO */
 
 
 #if defined(CURLDEBUG) && defined(HAVE_GETADDRINFO)
@@ -553,7 +553,7 @@ curl_dbg_getaddrinfo(const char *hostname,
                  source, line);
   return res;
 }
-#endif /* defined(CURLDEBUG) && defined(HAVE_GETADDRINFO) */
+#endif /* CURLDEBUG && HAVE_GETADDRINFO */
 
 #if defined(HAVE_GETADDRINFO) && defined(USE_RESOLVE_ON_IPS)
 /*
diff --git a/lib/curl_md4.h b/lib/curl_md4.h
index a6539e0b12..f103d38b41 100644
--- a/lib/curl_md4.h
+++ b/lib/curl_md4.h
@@ -34,6 +34,6 @@
 CURLcode Curl_md4it(unsigned char *output, const unsigned char *input,
                     const size_t len);
 
-#endif /* defined(USE_CURL_NTLM_CORE) */
+#endif /* USE_CURL_NTLM_CORE */
 
 #endif /* HEADER_CURL_MD4_H */
diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
index d1ab3cb561..b2b94a3a9b 100644
--- a/lib/curl_ntlm_core.c
+++ b/lib/curl_ntlm_core.c
@@ -277,7 +277,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
   return TRUE;
 }
 
-#endif /* defined(USE_WIN32_CRYPTO) */
+#endif /* USE_WIN32_CRYPTO */
 
  /*
   * takes a 21 byte array and treats it as 3 56-bit DES keys. The
diff --git a/lib/http_aws_sigv4.c b/lib/http_aws_sigv4.c
index 92c0c1ff4c..850b7ae112 100644
--- a/lib/http_aws_sigv4.c
+++ b/lib/http_aws_sigv4.c
@@ -1149,4 +1149,4 @@ static bool should_urlencode(struct Curl_str *service_name)
   return true;
 }
 
-#endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */
+#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */
diff --git a/lib/ldap.c b/lib/ldap.c
index 7fc0da0b2d..bcf53856b6 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -273,7 +273,7 @@ static int ldap_win_bind_auth(LDAP *server, const char *user,
   }
   return rc;
 }
-#endif /* #if defined(USE_WINDOWS_SSPI) */
+#endif /* USE_WINDOWS_SSPI */
 
 static int ldap_win_bind(struct Curl_easy *data, LDAP *server,
                          const char *user, const char *passwd)
@@ -300,7 +300,7 @@ static int ldap_win_bind(struct Curl_easy *data, LDAP *server,
 
   return rc;
 }
-#endif /* #if defined(USE_WIN32_LDAP) */
+#endif /* USE_WIN32_LDAP */
 
 #ifdef USE_WIN32_LDAP
 #define FREE_ON_WINLDAP(x) curlx_unicodefree(x)
diff --git a/lib/url.c b/lib/url.c
index 0e90af429b..f25a58eb7f 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3202,8 +3202,8 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data,
                                &as /* to */,
                                allowed_alpns);
     }
- #endif
- #ifdef USE_HTTP2
+#endif
+#ifdef USE_HTTP2
     if(!hit && (neg->wanted & CURL_HTTP_V2x) &&
        !neg->h2_prior_knowledge) {
       srcalpnid = ALPN_h2;
@@ -3212,7 +3212,7 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data,
                                &as /* to */,
                                allowed_alpns);
     }
- #endif
+#endif
     if(!hit && (neg->wanted & CURL_HTTP_V1x) &&
        !neg->only_10) {
       srcalpnid = ALPN_h1;
@@ -4089,7 +4089,7 @@ void Curl_data_priority_clear_state(struct Curl_easy *data)
   memset(&data->state.priority, 0, sizeof(data->state.priority));
 }
 
-#endif /* defined(USE_HTTP2) || defined(USE_HTTP3) */
+#endif /* USE_HTTP2 || USE_HTTP3 */
 
 
 CURLcode Curl_conn_meta_set(struct connectdata *conn, const char *key,
diff --git a/lib/url.h b/lib/url.h
index bd4060c884..92747335d8 100644
--- a/lib/url.h
+++ b/lib/url.h
@@ -118,7 +118,7 @@ CURLcode Curl_1st_fatal(CURLcode r1, CURLcode r2);
 void Curl_data_priority_clear_state(struct Curl_easy *data);
 #else
 #define Curl_data_priority_clear_state(x)
-#endif /* !(defined(USE_HTTP2) || defined(USE_HTTP3)) */
+#endif /* USE_HTTP2 || USE_HTTP3 */
 
 #ifdef USE_NGHTTP2
 CURLcode Curl_data_priority_add_child(struct Curl_easy *parent,
diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
index f6e1e6446a..15bf704cea 100644
--- a/lib/vtls/wolfssl.c
+++ b/lib/vtls/wolfssl.c
@@ -178,7 +178,7 @@ wssl_tls13_secret_callback(SSL *ssl, int id, const unsigned char *secret,
   Curl_tls_keylog_write(label, client_random, secret, secretSz);
   return 0;
 }
-#endif /* defined(HAVE_SECRET_CALLBACK) && defined(WOLFSSL_TLS13) */
+#endif /* HAVE_SECRET_CALLBACK && WOLFSSL_TLS13 */
 
 static void wssl_log_tls12_secret(WOLFSSL *ssl)
 {
diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c
index 79ada45e54..e99bb9c388 100644
--- a/tests/libtest/lib518.c
+++ b/tests/libtest/lib518.c
@@ -471,7 +471,7 @@ test_cleanup:
   return res;
 }
 
-#else /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
+#else /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */
 
 static CURLcode test_lib518(char *URL)
 {
@@ -480,4 +480,4 @@ static CURLcode test_lib518(char *URL)
   return TEST_ERR_MAJOR_BAD; /* skip test */
 }
 
-#endif /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
+#endif /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */
diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c
index ab3f01dd3d..ddd8b1253e 100644
--- a/tests/libtest/lib537.c
+++ b/tests/libtest/lib537.c
@@ -485,7 +485,7 @@ test_cleanup:
   return res;
 }
 
-#else /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
+#else /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */
 
 static CURLcode test_lib537(char *URL)
 {
@@ -494,4 +494,4 @@ static CURLcode test_lib537(char *URL)
   return TEST_ERR_MAJOR_BAD; /* skip test */
 }
 
-#endif /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
+#endif /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */
diff --git a/tests/unit/unit1979.c b/tests/unit/unit1979.c
index eb46f65619..48bb24c060 100644
--- a/tests/unit/unit1979.c
+++ b/tests/unit/unit1979.c
@@ -131,7 +131,7 @@ static CURLcode test_unit1979(char *arg)
                 buffer);
     curlx_dyn_free(&canonical_path);
   }
-#endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */
+#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */
 
   UNITTEST_END_SIMPLE
 }
diff --git a/tests/unit/unit1980.c b/tests/unit/unit1980.c
index 836b80ae52..347ae2e7dd 100644
--- a/tests/unit/unit1980.c
+++ b/tests/unit/unit1980.c
@@ -102,7 +102,7 @@ static CURLcode test_unit1980(char *arg)
                 buffer);
     curlx_dyn_free(&canonical_query);
   }
-#endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */
+#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */
 
   UNITTEST_END_SIMPLE
 }
diff --git a/tests/unit/unit3205.c b/tests/unit/unit3205.c
index f4fe0aa788..13ee8cceab 100644
--- a/tests/unit/unit3205.c
+++ b/tests/unit/unit3205.c
@@ -605,7 +605,7 @@ static CURLcode test_unit3205(char *arg)
       j++;
     }
   }
-#endif /* defined(USE_MBEDTLS) || defined(USE_RUSTLS) */
+#endif /* USE_MBEDTLS || USE_RUSTLS */
 
   UNITTEST_END_SIMPLE
 }