diff --git a/UPGRADING b/UPGRADING
index 4450aeac8e7c7..e2382a8d40fb8 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -408,10 +408,12 @@ PHP 8.4 UPGRADE NOTES
     IntlGregorianCalendar::createFromDateTime() instead.
 
 - LDAP:
-  . Calling ldap_connect() with more than 2 arguments is deprecated. Use
-    ldap_connect_wallet() instead.
+  . Calling ldap_connect() with more than 2 arguments is deprecated.
   . Calling ldap_exop() with more than 4 arguments is deprecated. Use
     ldap_exop_sync() instead.
+  . The ldap_connect_wallet() has been removed.
+  . Constants GSLC_SSL_NO_AUTH, GSLC_SSL_ONEWAY_AUTH, and GSLC_SSL_TWOWAY_AUTH
+    have been removed.
 
 - PDO_PGSQL:
   . Using escaped question marks (??) inside dollar-quoted strings is deprecated.
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 87c3d5ac33d9f..636768720b3e3 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -124,6 +124,8 @@ PHP 8.4 INTERNALS UPGRADE NOTES
      ext/ftp and ext/mysqlnd is enabled implicitly, when building with
      ext/openssl (--with-openssl), or explicitly by using new configure options
      --with-ftp-ssl and --with-mysqlnd-ssl.
+   - The configure option --with-ldap doesn't accept the path to Oracle Instant
+     Client anymore in favor of optional OpenLDAP paths only.
    - New configure option --with-openssl-legacy-provider to enable OpenSSL
      legacy provider.
    - COOKIE_IO_FUNCTIONS_T symbol has been removed (use cookie_io_functions_t).
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 22ee6afe81cf2..16f305f25bf54 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -7,33 +7,6 @@ AC_DEFUN([PHP_LDAP_CHECKS], [
     LDAP_DIR=$1
     LDAP_INCDIR=$1/ldap/public
     LDAP_LIBDIR=$1/$PHP_LIBDIR
-  else
-
-    dnl Find Oracle Instant Client RPM header location corresponding to the
-    dnl given lib path e.g. for --with-ldap=/usr/lib/oracle/12.1/client64/lib
-    AC_CHECK_SIZEOF([long])
-    AC_MSG_CHECKING([if we're at 64-bit platform])
-    AS_IF([test "$ac_cv_sizeof_long" -eq 4],[
-      AC_MSG_RESULT([no])
-      PHP_OCI8_IC_LIBDIR_SUFFIX=""
-    ],[
-      AC_MSG_RESULT([yes])
-      PHP_OCI8_IC_LIBDIR_SUFFIX=64
-    ])
-
-    OCISDKRPMINC=`echo "$1" | $SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'`
-
-    dnl Check for Oracle Instant Client RPM install
-    if test -f $OCISDKRPMINC/ldap.h; then
-      LDAP_DIR=$1
-      LDAP_INCDIR=$OCISDKRPMINC
-      LDAP_LIBDIR=$1
-    dnl Check for Oracle Instant Client ZIP install
-    elif test -f $1/sdk/include/ldap.h; then
-      LDAP_DIR=$1
-      LDAP_INCDIR=$1/sdk/include
-      LDAP_LIBDIR=$1
-    fi
   fi
 ])
 
@@ -75,18 +48,6 @@ if test "$PHP_LDAP" != "no"; then
   elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then
     PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 
-  elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then
-    PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-    AC_DEFINE(HAVE_ORALDAP,1,[ ])
-
-  elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
-    PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-    AC_DEFINE(HAVE_ORALDAP,1,[ ])
-
-  elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME; then
-     PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-     AC_DEFINE(HAVE_ORALDAP,1,[ ])
-
   else
     AC_MSG_ERROR([Cannot find ldap libraries in $LDAP_LIBDIR.])
   fi
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index e15635ffe628e..c19e538230f8b 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -916,15 +916,10 @@ PHP_FUNCTION(ldap_connect)
 	char *host = NULL;
 	size_t hostlen = 0;
 	zend_long port = LDAP_PORT;
-#ifdef HAVE_ORALDAP
-	char *wallet = NULL, *walletpasswd = NULL;
-	size_t walletlen = 0, walletpasswdlen = 0;
-	zend_long authmode = GSLC_SSL_NO_AUTH;
-	int ssl=0;
-#endif
 	ldap_linkdata *ld;
 	LDAP *ldap = NULL;
 
+	// TODO: Remove this.
 	if (ZEND_NUM_ARGS() > 2) {
 	    zend_error(E_DEPRECATED, "Calling ldap_connect() with Oracle-specific arguments is deprecated, "
 			"use ldap_connect_wallet() instead");
@@ -932,23 +927,9 @@ PHP_FUNCTION(ldap_connect)
 		zend_error(E_DEPRECATED, "Usage of ldap_connect with two arguments is deprecated");
 	}
 
-#ifdef HAVE_ORALDAP
-	if (ZEND_NUM_ARGS() == 3 || ZEND_NUM_ARGS() == 4) {
-		WRONG_PARAM_COUNT;
-	}
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!lssl", &host, &hostlen, &port, &wallet, &walletlen, &walletpasswd, &walletpasswdlen, &authmode) != SUCCESS) {
-		RETURN_THROWS();
-	}
-
-	if (ZEND_NUM_ARGS() == 5) {
-		ssl = 1;
-	}
-#else
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!l", &host, &hostlen, &port) != SUCCESS) {
 		RETURN_THROWS();
 	}
-#endif
 
 	if (LDAPG(max_links) != -1 && LDAPG(num_links) >= LDAPG(max_links)) {
 		php_error_docref(NULL, E_WARNING, "Too many open links (" ZEND_LONG_FMT ")", LDAPG(num_links));
@@ -1002,15 +983,6 @@ PHP_FUNCTION(ldap_connect)
 		zval_ptr_dtor(return_value);
 		RETURN_FALSE;
 	} else {
-#ifdef HAVE_ORALDAP
-		if (ssl) {
-			if (ldap_init_SSL(&ldap->ld_sb, wallet, walletpasswd, authmode)) {
-				zval_ptr_dtor(return_value);
-				php_error_docref(NULL, E_WARNING, "SSL init failed");
-				RETURN_FALSE;
-			}
-		}
-#endif
 		LDAPG(num_links)++;
 		ld->link = ldap;
 	}
@@ -1018,79 +990,10 @@ PHP_FUNCTION(ldap_connect)
 }
 /* }}} */
 
-#if defined(HAVE_ORALDAP) && defined(LDAP_API_FEATURE_X_OPENLDAP)
-PHP_FUNCTION(ldap_connect_wallet) {
-	char *host = NULL;
-	size_t hostlen = 0;
-	char *wallet = NULL, *walletpasswd = NULL;
-	size_t walletlen = 0, walletpasswdlen = 0;
-	zend_long authmode = GSLC_SSL_NO_AUTH;
-	bool ssl = false;
-
-	ldap_linkdata *ld;
-	LDAP *ldap = NULL;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!ss|l",
-		&host, &hostlen, &wallet, &walletlen, &walletpasswd, &walletpasswdlen, &authmode) != SUCCESS
-	) {
-		RETURN_THROWS();
-	}
-
-	if (authmode != 0) {
-		ssl = true;
-	}
-
-	if (LDAPG(max_links) != -1 && LDAPG(num_links) >= LDAPG(max_links)) {
-		php_error_docref(NULL, E_WARNING, "Too many open links (" ZEND_LONG_FMT ")", LDAPG(num_links));
-		RETURN_FALSE;
-	}
-
-	object_init_ex(return_value, ldap_link_ce);
-	ld = Z_LDAP_LINK_P(return_value);
-
-	{
-		int rc = LDAP_SUCCESS;
-		char *url = host;
-		if (url && !ldap_is_ldap_url(url)) {
-			size_t urllen = hostlen + sizeof( "ldap://:65535" );
-
-			url = emalloc(urllen);
-			snprintf( url, urllen, "ldap://%s", host );
-		}
-
-		/* ldap_init() is deprecated, use ldap_initialize() instead. */
-		rc = ldap_initialize(&ldap, url);
-		if (url != host) {
-			efree(url);
-		}
-		if (rc != LDAP_SUCCESS) {
-			zval_ptr_dtor(return_value);
-			php_error_docref(NULL, E_WARNING, "Could not create session handle: %s", ldap_err2string(rc));
-			RETURN_FALSE;
-		}
-	}
-
-	if (ldap == NULL) {
-		zval_ptr_dtor(return_value);
-		RETURN_FALSE;
-	} else {
-		if (ssl) {
-			if (ldap_init_SSL(&ldap->ld_sb, wallet, walletpasswd, authmode)) {
-				zval_ptr_dtor(return_value);
-				php_error_docref(NULL, E_WARNING, "SSL init failed");
-				RETURN_FALSE;
-			}
-		}
-		LDAPG(num_links)++;
-		ld->link = ldap;
-	}
-}
-#endif
-
 /* {{{ _get_lderrno */
 static int _get_lderrno(LDAP *ldap)
 {
-#if LDAP_API_VERSION > 2000 || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 	int lderr;
 
 	/* New versions of OpenLDAP do it this way */
@@ -1105,7 +1008,7 @@ static int _get_lderrno(LDAP *ldap)
 /* {{{ _set_lderrno */
 static void _set_lderrno(LDAP *ldap, int lderr)
 {
-#if LDAP_API_VERSION > 2000 || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 	/* New versions of OpenLDAP do it this way */
 	ldap_set_option(ldap, LDAP_OPT_ERROR_NUMBER, &lderr);
 #else
@@ -1391,7 +1294,7 @@ static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref, in
 {
 	/* sizelimit */
 	if (sizelimit > -1) {
-#if (LDAP_API_VERSION >= 2004) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION >= 2004
 		ldap_get_option(ldap, LDAP_OPT_SIZELIMIT, old_sizelimit);
 		ldap_set_option(ldap, LDAP_OPT_SIZELIMIT, &sizelimit);
 #else
@@ -1402,7 +1305,7 @@ static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref, in
 
 	/* timelimit */
 	if (timelimit > -1) {
-#if (LDAP_API_VERSION >= 2004) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION >= 2004
 		ldap_get_option(ldap, LDAP_OPT_TIMELIMIT, old_timelimit);
 		ldap_set_option(ldap, LDAP_OPT_TIMELIMIT, &timelimit);
 #else
@@ -1413,7 +1316,7 @@ static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref, in
 
 	/* deref */
 	if (deref > -1) {
-#if (LDAP_API_VERSION >= 2004) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION >= 2004
 		ldap_get_option(ldap, LDAP_OPT_DEREF, old_deref);
 		ldap_set_option(ldap, LDAP_OPT_DEREF, &deref);
 #else
@@ -1891,12 +1794,12 @@ PHP_FUNCTION(ldap_get_entries)
 			add_index_string(&tmp1, num_attrib, attribute);
 
 			num_attrib++;
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 			ldap_memfree(attribute);
 #endif
 			attribute = ldap_next_attribute(ldap, ldap_result_entry, ber);
 		}
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 		if (ber != NULL) {
 			ber_free(ber, 0);
 		}
@@ -1909,7 +1812,7 @@ PHP_FUNCTION(ldap_get_entries)
 		} else {
 			add_assoc_null(&tmp1, "dn");
 		}
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 		ldap_memfree(dn);
 #else
 		free(dn);
@@ -1947,7 +1850,7 @@ PHP_FUNCTION(ldap_first_attribute)
 		RETURN_FALSE;
 	} else {
 		RETVAL_STRING(attribute);
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 		ldap_memfree(attribute);
 #endif
 	}
@@ -1977,7 +1880,7 @@ PHP_FUNCTION(ldap_next_attribute)
 	}
 
 	if ((attribute = ldap_next_attribute(ld->link, resultentry->data, resultentry->ber)) == NULL) {
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 		if (resultentry->ber != NULL) {
 			ber_free(resultentry->ber, 0);
 			resultentry->ber = NULL;
@@ -1986,7 +1889,7 @@ PHP_FUNCTION(ldap_next_attribute)
 		RETURN_FALSE;
 	} else {
 		RETVAL_STRING(attribute);
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 		ldap_memfree(attribute);
 #endif
 	}
@@ -2033,12 +1936,12 @@ PHP_FUNCTION(ldap_get_attributes)
 		add_index_string(return_value, num_attrib, attribute);
 
 		num_attrib++;
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 		ldap_memfree(attribute);
 #endif
 		attribute = ldap_next_attribute(ld->link, resultentry->data, ber);
 	}
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 	if (ber != NULL) {
 		ber_free(ber, 0);
 	}
@@ -2106,7 +2009,7 @@ PHP_FUNCTION(ldap_get_dn)
 	text = ldap_get_dn(ld->link, resultentry->data);
 	if (text != NULL) {
 		RETVAL_STRING(text);
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 		ldap_memfree(text);
 #else
 		free(text);
@@ -2163,7 +2066,7 @@ PHP_FUNCTION(ldap_dn2ufn)
 
 	if (ufn != NULL) {
 		RETVAL_STRING(ufn);
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 		ldap_memfree(ufn);
 #endif
 	} else {
@@ -2952,7 +2855,7 @@ PHP_FUNCTION(ldap_compare)
 }
 /* }}} */
 
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 /* {{{ Get the current value of various session-wide parameters */
 PHP_FUNCTION(ldap_get_option)
 {
@@ -3583,7 +3486,7 @@ static void php_ldap_do_rename(INTERNAL_FUNCTION_PARAMETERS, int ext)
 		newparent = NULL;
 	}
 
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 	if (serverctrls) {
 		lserverctrls = _php_ldap_controls_from_array(ld->link, serverctrls, 6);
 		if (lserverctrls == NULL) {
@@ -3681,7 +3584,7 @@ PHP_FUNCTION(ldap_start_tls)
 }
 /* }}} */
 #endif
-#endif /* (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) */
+#endif /* LDAP_API_VERSION > 2000 */
 
 #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC)
 /* {{{ _ldap_rebind_proc() */
diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php
index f3615e4d42cc0..e35e7d3db1210 100644
--- a/ext/ldap/ldap.stub.php
+++ b/ext/ldap/ldap.stub.php
@@ -60,7 +60,7 @@
      */
     const LDAP_MODIFY_BATCH_VALUES = UNKNOWN;
 
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP))
+#if LDAP_API_VERSION > 2000
     /**
      * @var int
      * @cvalue LDAP_OPT_DEREF
@@ -203,24 +203,6 @@
     const LDAP_OPT_X_SASL_USERNAME = UNKNOWN;
 #endif
 
-#ifdef HAVE_ORALDAP
-    /**
-     * @var int
-     * @cvalue GSLC_SSL_NO_AUTH
-     */
-    const GSLC_SSL_NO_AUTH = UNKNOWN;
-    /**
-     * @var int
-     * @cvalue GSLC_SSL_ONEWAY_AUTH
-     */
-    const GSLC_SSL_ONEWAY_AUTH = UNKNOWN;
-    /**
-     * @var int
-     * @cvalue GSLC_SSL_TWOWAY_AUTH
-     */
-    const GSLC_SSL_TWOWAY_AUTH = UNKNOWN;
-#endif
-
 #if (LDAP_API_VERSION > 2000)
     /**
      * @var int
@@ -623,14 +605,7 @@
     const LDAP_CONTROL_VLVRESPONSE = UNKNOWN;
 #endif
 
-#ifdef HAVE_ORALDAP
-    function ldap_connect(?string $uri = null, int $port = 389, string $wallet = UNKNOWN, #[\SensitiveParameter] string $password = UNKNOWN, int $auth_mode = GSLC_SSL_NO_AUTH): LDAP\Connection|false {}
-#ifdef LDAP_API_FEATURE_X_OPENLDAP
-    function ldap_connect_wallet(?string $uri = null, string $wallet, #[\SensitiveParameter] string $password, int $auth_mode = GSLC_SSL_NO_AUTH): LDAP\Connection|false {}
-#endif
-#else
     function ldap_connect(?string $uri = null, int $port = 389): LDAP\Connection|false {}
-#endif
 
     function ldap_unbind(LDAP\Connection $ldap): bool {}
 
@@ -734,7 +709,7 @@ function ldap_err2str(int $errno): string {}
 
     function ldap_compare(LDAP\Connection $ldap, string $dn, string $attribute, string $value, ?array $controls = null): bool|int {}
 
-    #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+    #if LDAP_API_VERSION > 2000
     function ldap_rename(LDAP\Connection $ldap, string $dn, string $new_rdn, string $new_parent, bool $delete_old_rdn, ?array $controls = null): bool {}
 
     function ldap_rename_ext(LDAP\Connection $ldap, string $dn, string $new_rdn, string $new_parent, bool $delete_old_rdn, ?array $controls = null): LDAP\Result|false {}
diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h
index 369909889be90..6a1888a060a8e 100644
--- a/ext/ldap/ldap_arginfo.h
+++ b/ext/ldap/ldap_arginfo.h
@@ -1,31 +1,10 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 7415695a7ae90e6abd45617baf8a9ecf9232b801 */
+ * Stub hash: 6e88a67f86cd0a445e6d1534740304e18f891d5e */
 
-#if defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_connect, 0, 0, LDAP\\Connection, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "389")
-	ZEND_ARG_TYPE_INFO(0, wallet, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, auth_mode, IS_LONG, 0, "GSLC_SSL_NO_AUTH")
 ZEND_END_ARG_INFO()
-#endif
-
-#if defined(HAVE_ORALDAP) && defined(LDAP_API_FEATURE_X_OPENLDAP)
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_connect_wallet, 0, 3, LDAP\\Connection, MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 1, "null")
-	ZEND_ARG_TYPE_INFO(0, wallet, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, auth_mode, IS_LONG, 0, "GSLC_SSL_NO_AUTH")
-ZEND_END_ARG_INFO()
-#endif
-
-#if !(defined(HAVE_ORALDAP))
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_connect, 0, 0, LDAP\\Connection, MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "389")
-ZEND_END_ARG_INFO()
-#endif
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_unbind, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, ldap, LDAP\\Connection, 0)
@@ -197,7 +176,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_compare, 0, 4, MAY_BE_BOOL|
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_rename, 0, 5, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, ldap, LDAP\\Connection, 0)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
@@ -208,7 +187,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_rename, 0, 5, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_rename_ext, 0, 5, LDAP\\Result, MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, ldap, LDAP\\Connection, 0)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
@@ -219,7 +198,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_rename_ext, 0, 5, LDAP\
 ZEND_END_ARG_INFO()
 #endif
 
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_option, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, ldap, LDAP\\Connection, 0)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
@@ -227,7 +206,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_option, 0, 2, _IS_BOOL,
 ZEND_END_ARG_INFO()
 #endif
 
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_set_option, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, ldap, LDAP\\Connection, 1)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
@@ -235,28 +214,28 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_set_option, 0, 3, _IS_BOOL,
 ZEND_END_ARG_INFO()
 #endif
 
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_count_references, 0, 2, IS_LONG, 0)
 	ZEND_ARG_OBJ_INFO(0, ldap, LDAP\\Connection, 0)
 	ZEND_ARG_OBJ_INFO(0, result, LDAP\\Result, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_first_reference, 0, 2, LDAP\\ResultEntry, MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, ldap, LDAP\\Connection, 0)
 	ZEND_ARG_OBJ_INFO(0, result, LDAP\\Result, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_next_reference, 0, 2, LDAP\\ResultEntry, MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, ldap, LDAP\\Connection, 0)
 	ZEND_ARG_OBJ_INFO(0, entry, LDAP\\ResultEntry, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) && defined(HAVE_LDAP_PARSE_REFERENCE)
+#if LDAP_API_VERSION > 2000 && defined(HAVE_LDAP_PARSE_REFERENCE)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_reference, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, ldap, LDAP\\Connection, 0)
 	ZEND_ARG_OBJ_INFO(0, entry, LDAP\\ResultEntry, 0)
@@ -264,7 +243,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_reference, 0, 3, _IS_
 ZEND_END_ARG_INFO()
 #endif
 
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) && defined(HAVE_LDAP_PARSE_RESULT)
+#if LDAP_API_VERSION > 2000 && defined(HAVE_LDAP_PARSE_RESULT)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_result, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, ldap, LDAP\\Connection, 0)
 	ZEND_ARG_OBJ_INFO(0, result, LDAP\\Result, 0)
@@ -360,15 +339,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_exop, 0, 2, _IS_BOOL,
 ZEND_END_ARG_INFO()
 #endif
 
-#if defined(HAVE_ORALDAP)
-ZEND_FUNCTION(ldap_connect);
-#endif
-#if defined(HAVE_ORALDAP) && defined(LDAP_API_FEATURE_X_OPENLDAP)
-ZEND_FUNCTION(ldap_connect_wallet);
-#endif
-#if !(defined(HAVE_ORALDAP))
 ZEND_FUNCTION(ldap_connect);
-#endif
 ZEND_FUNCTION(ldap_unbind);
 ZEND_FUNCTION(ldap_bind);
 ZEND_FUNCTION(ldap_bind_ext);
@@ -405,31 +376,31 @@ ZEND_FUNCTION(ldap_errno);
 ZEND_FUNCTION(ldap_error);
 ZEND_FUNCTION(ldap_err2str);
 ZEND_FUNCTION(ldap_compare);
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_FUNCTION(ldap_rename);
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_FUNCTION(ldap_rename_ext);
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_FUNCTION(ldap_get_option);
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_FUNCTION(ldap_set_option);
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_FUNCTION(ldap_count_references);
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_FUNCTION(ldap_first_reference);
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 ZEND_FUNCTION(ldap_next_reference);
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) && defined(HAVE_LDAP_PARSE_REFERENCE)
+#if LDAP_API_VERSION > 2000 && defined(HAVE_LDAP_PARSE_REFERENCE)
 ZEND_FUNCTION(ldap_parse_reference);
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) && defined(HAVE_LDAP_PARSE_RESULT)
+#if LDAP_API_VERSION > 2000 && defined(HAVE_LDAP_PARSE_RESULT)
 ZEND_FUNCTION(ldap_parse_result);
 #endif
 #if (defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC))
@@ -465,15 +436,7 @@ ZEND_FUNCTION(ldap_parse_exop);
 #endif
 
 static const zend_function_entry ext_functions[] = {
-#if defined(HAVE_ORALDAP)
 	ZEND_FE(ldap_connect, arginfo_ldap_connect)
-#endif
-#if defined(HAVE_ORALDAP) && defined(LDAP_API_FEATURE_X_OPENLDAP)
-	ZEND_FE(ldap_connect_wallet, arginfo_ldap_connect_wallet)
-#endif
-#if !(defined(HAVE_ORALDAP))
-	ZEND_FE(ldap_connect, arginfo_ldap_connect)
-#endif
 	ZEND_FE(ldap_unbind, arginfo_ldap_unbind)
 	ZEND_RAW_FENTRY("ldap_close", zif_ldap_unbind, arginfo_ldap_close, 0, NULL, NULL)
 	ZEND_FE(ldap_bind, arginfo_ldap_bind)
@@ -513,31 +476,31 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(ldap_error, arginfo_ldap_error)
 	ZEND_FE(ldap_err2str, arginfo_ldap_err2str)
 	ZEND_FE(ldap_compare, arginfo_ldap_compare)
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 	ZEND_FE(ldap_rename, arginfo_ldap_rename)
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 	ZEND_FE(ldap_rename_ext, arginfo_ldap_rename_ext)
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 	ZEND_FE(ldap_get_option, arginfo_ldap_get_option)
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 	ZEND_FE(ldap_set_option, arginfo_ldap_set_option)
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 	ZEND_FE(ldap_count_references, arginfo_ldap_count_references)
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 	ZEND_FE(ldap_first_reference, arginfo_ldap_first_reference)
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
+#if LDAP_API_VERSION > 2000
 	ZEND_FE(ldap_next_reference, arginfo_ldap_next_reference)
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) && defined(HAVE_LDAP_PARSE_REFERENCE)
+#if LDAP_API_VERSION > 2000 && defined(HAVE_LDAP_PARSE_REFERENCE)
 	ZEND_FE(ldap_parse_reference, arginfo_ldap_parse_reference)
 #endif
-#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) && defined(HAVE_LDAP_PARSE_RESULT)
+#if LDAP_API_VERSION > 2000 && defined(HAVE_LDAP_PARSE_RESULT)
 	ZEND_FE(ldap_parse_result, arginfo_ldap_parse_result)
 #endif
 #if (defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC))
@@ -599,49 +562,49 @@ static void register_ldap_symbols(int module_number)
 	REGISTER_STRING_CONSTANT("LDAP_MODIFY_BATCH_ATTRIB", LDAP_MODIFY_BATCH_ATTRIB, CONST_PERSISTENT);
 	REGISTER_STRING_CONSTANT("LDAP_MODIFY_BATCH_MODTYPE", LDAP_MODIFY_BATCH_MODTYPE, CONST_PERSISTENT);
 	REGISTER_STRING_CONSTANT("LDAP_MODIFY_BATCH_VALUES", LDAP_MODIFY_BATCH_VALUES, CONST_PERSISTENT);
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP))
+#if LDAP_API_VERSION > 2000
 	REGISTER_LONG_CONSTANT("LDAP_OPT_DEREF", LDAP_OPT_DEREF, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP))
+#if LDAP_API_VERSION > 2000
 	REGISTER_LONG_CONSTANT("LDAP_OPT_SIZELIMIT", LDAP_OPT_SIZELIMIT, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP))
+#if LDAP_API_VERSION > 2000
 	REGISTER_LONG_CONSTANT("LDAP_OPT_TIMELIMIT", LDAP_OPT_TIMELIMIT, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)) && defined(LDAP_OPT_NETWORK_TIMEOUT)
+#if LDAP_API_VERSION > 2000 && defined(LDAP_OPT_NETWORK_TIMEOUT)
 	REGISTER_LONG_CONSTANT("LDAP_OPT_NETWORK_TIMEOUT", LDAP_OPT_NETWORK_TIMEOUT, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)) && (!defined(LDAP_OPT_NETWORK_TIMEOUT) && defined(LDAP_X_OPT_CONNECT_TIMEOUT))
+#if LDAP_API_VERSION > 2000 && (!defined(LDAP_OPT_NETWORK_TIMEOUT) && defined(LDAP_X_OPT_CONNECT_TIMEOUT))
 	REGISTER_LONG_CONSTANT("LDAP_OPT_NETWORK_TIMEOUT", LDAP_X_OPT_CONNECT_TIMEOUT, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)) && defined(LDAP_OPT_TIMEOUT)
+#if LDAP_API_VERSION > 2000 && defined(LDAP_OPT_TIMEOUT)
 	REGISTER_LONG_CONSTANT("LDAP_OPT_TIMEOUT", LDAP_OPT_TIMEOUT, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP))
+#if LDAP_API_VERSION > 2000
 	REGISTER_LONG_CONSTANT("LDAP_OPT_PROTOCOL_VERSION", LDAP_OPT_PROTOCOL_VERSION, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP))
+#if LDAP_API_VERSION > 2000
 	REGISTER_LONG_CONSTANT("LDAP_OPT_ERROR_NUMBER", LDAP_OPT_ERROR_NUMBER, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP))
+#if LDAP_API_VERSION > 2000
 	REGISTER_LONG_CONSTANT("LDAP_OPT_REFERRALS", LDAP_OPT_REFERRALS, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)) && defined(LDAP_OPT_RESTART)
+#if LDAP_API_VERSION > 2000 && defined(LDAP_OPT_RESTART)
 	REGISTER_LONG_CONSTANT("LDAP_OPT_RESTART", LDAP_OPT_RESTART, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)) && defined(LDAP_OPT_HOST_NAME)
+#if LDAP_API_VERSION > 2000 && defined(LDAP_OPT_HOST_NAME)
 	REGISTER_LONG_CONSTANT("LDAP_OPT_HOST_NAME", LDAP_OPT_HOST_NAME, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP))
+#if LDAP_API_VERSION > 2000
 	REGISTER_LONG_CONSTANT("LDAP_OPT_ERROR_STRING", LDAP_OPT_ERROR_STRING, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)) && defined(LDAP_OPT_MATCHED_DN)
+#if LDAP_API_VERSION > 2000 && defined(LDAP_OPT_MATCHED_DN)
 	REGISTER_LONG_CONSTANT("LDAP_OPT_MATCHED_DN", LDAP_OPT_MATCHED_DN, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP))
+#if LDAP_API_VERSION > 2000
 	REGISTER_LONG_CONSTANT("LDAP_OPT_SERVER_CONTROLS", LDAP_OPT_SERVER_CONTROLS, CONST_PERSISTENT);
 #endif
-#if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP))
+#if LDAP_API_VERSION > 2000
 	REGISTER_LONG_CONSTANT("LDAP_OPT_CLIENT_CONTROLS", LDAP_OPT_CLIENT_CONTROLS, CONST_PERSISTENT);
 #endif
 #if defined(LDAP_OPT_DEBUG_LEVEL)
@@ -668,15 +631,6 @@ static void register_ldap_symbols(int module_number)
 #if defined(LDAP_OPT_X_SASL_USERNAME)
 	REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_USERNAME", LDAP_OPT_X_SASL_USERNAME, CONST_PERSISTENT);
 #endif
-#if defined(HAVE_ORALDAP)
-	REGISTER_LONG_CONSTANT("GSLC_SSL_NO_AUTH", GSLC_SSL_NO_AUTH, CONST_PERSISTENT);
-#endif
-#if defined(HAVE_ORALDAP)
-	REGISTER_LONG_CONSTANT("GSLC_SSL_ONEWAY_AUTH", GSLC_SSL_ONEWAY_AUTH, CONST_PERSISTENT);
-#endif
-#if defined(HAVE_ORALDAP)
-	REGISTER_LONG_CONSTANT("GSLC_SSL_TWOWAY_AUTH", GSLC_SSL_TWOWAY_AUTH, CONST_PERSISTENT);
-#endif
 #if (LDAP_API_VERSION > 2000)
 	REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_REQUIRE_CERT", LDAP_OPT_X_TLS_REQUIRE_CERT, CONST_PERSISTENT);
 #endif
@@ -863,14 +817,6 @@ static void register_ldap_symbols(int module_number)
 	REGISTER_STRING_CONSTANT("LDAP_CONTROL_VLVRESPONSE", LDAP_CONTROL_VLVRESPONSE, CONST_PERSISTENT);
 #endif
 
-#if defined(HAVE_ORALDAP)
-
-	zend_add_parameter_attribute(zend_hash_str_find_ptr(CG(function_table), "ldap_connect", sizeof("ldap_connect") - 1), 3, ZSTR_KNOWN(ZEND_STR_SENSITIVEPARAMETER), 0);
-#endif
-#if defined(HAVE_ORALDAP) && defined(LDAP_API_FEATURE_X_OPENLDAP)
-
-	zend_add_parameter_attribute(zend_hash_str_find_ptr(CG(function_table), "ldap_connect_wallet", sizeof("ldap_connect_wallet") - 1), 2, ZSTR_KNOWN(ZEND_STR_SENSITIVEPARAMETER), 0);
-#endif
 
 	zend_add_parameter_attribute(zend_hash_str_find_ptr(CG(function_table), "ldap_bind", sizeof("ldap_bind") - 1), 2, ZSTR_KNOWN(ZEND_STR_SENSITIVEPARAMETER), 0);
 
diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h
index 5581f5b7671a8..dcde3fee820a0 100644
--- a/ext/ldap/php_ldap.h
+++ b/ext/ldap/php_ldap.h
@@ -19,10 +19,7 @@
 #ifndef PHP_LDAP_H
 #define PHP_LDAP_H
 
-#ifndef HAVE_ORALDAP
 #include <lber.h>
-#endif
-
 #include <ldap.h>
 
 extern zend_module_entry ldap_module_entry;