diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 1a6b6aec1b575..a35c6c70670da 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -156,6 +156,9 @@ PHP 8.4 INTERNALS UPGRADE NOTES
    - Unused symbols CONFIGURATION_FILE_PATH, DISCARD_PATH, HAVE_ERRMSG_H,
      HAVE_REGCOMP, HAVE_RINT, NEED_ISBLANK, PHP_URL_FOPEN, REGEX, HSREGEX,
      USE_CONFIG_FILE have been removed.
+   - The HAVE_OPENSSL symbol has been removed.
+   - The HAVE_OPENSSL_EXT symbol is now consistently defined to value 1 whether
+     the openssl extension is available either as shared or built statically.
 
 ========================
 3. Module changes
diff --git a/ext/openssl/config.w32 b/ext/openssl/config.w32
index 9187d6bfc28f1..76e3079e503ff 100644
--- a/ext/openssl/config.w32
+++ b/ext/openssl/config.w32
@@ -7,7 +7,6 @@ if (PHP_OPENSSL != "no") {
 
 	if (ret > 0) {
 		EXTENSION("openssl", "openssl.c xp_ssl.c");
-		AC_DEFINE("HAVE_OPENSSL_EXT", PHP_OPENSSL_SHARED ? 0 : 1, "Have openssl");
-		AC_DEFINE("HAVE_OPENSSL", 1);
+		AC_DEFINE("HAVE_OPENSSL_EXT", 1, "Define to 1 if the openssl extension is available.");
 	}
 }
diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
index ee59b6c5bb1d4..153f933e024d4 100644
--- a/ext/openssl/config0.m4
+++ b/ext/openssl/config0.m4
@@ -21,7 +21,8 @@ if test "$PHP_OPENSSL" != "no"; then
   PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
   PHP_SUBST(OPENSSL_SHARED_LIBADD)
   PHP_SETUP_OPENSSL([OPENSSL_SHARED_LIBADD],
-    [AC_DEFINE([HAVE_OPENSSL_EXT], [1], [ ])])
+    [AC_DEFINE([HAVE_OPENSSL_EXT], [1],
+      [Define to 1 if the openssl extension is available.])])
 
   AC_CHECK_FUNCS([RAND_egd])
 
diff --git a/ext/openssl/php_openssl.h b/ext/openssl/php_openssl.h
index 3cf83b3d02bde..3eeb7eec35238 100644
--- a/ext/openssl/php_openssl.h
+++ b/ext/openssl/php_openssl.h
@@ -17,7 +17,7 @@
 
 #ifndef PHP_OPENSSL_H
 #define PHP_OPENSSL_H
-/* HAVE_OPENSSL would include SSL MySQL stuff */
+
 #ifdef HAVE_OPENSSL_EXT
 extern zend_module_entry openssl_module_entry;
 #define phpext_openssl_ptr &openssl_module_entry
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index b6f28cc3dc26b..38059bca31eff 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -87,7 +87,7 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
 #include "fastcgi.h"
 #include "cgi_main_arginfo.h"
 
-#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
+#if defined(PHP_WIN32) && defined(HAVE_OPENSSL_EXT)
 # include "openssl/applink.c"
 #endif
 
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 683a01b091a13..e977c32081025 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -88,7 +88,7 @@
 # include "win32/select.h"
 #endif
 
-#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
+#if defined(PHP_WIN32) && defined(HAVE_OPENSSL_EXT)
 # include "openssl/applink.c"
 #endif
 
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 0b526d5f27712..29a3707750366 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -33,7 +33,7 @@
 
 #include "ext/standard/basic_functions.h"
 
-#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
+#if defined(PHP_WIN32) && defined(HAVE_OPENSSL_EXT)
 # include "openssl/applink.c"
 #endif