diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c
index d6cc36d7529..6525bf5cfb1 100644
--- a/dlls/wldap32/option.c
+++ b/dlls/wldap32/option.c
@@ -56,7 +56,7 @@ ULONG CDECL ldap_get_optionA( WLDAP32_LDAP *ld, int option, void *value )
 
     switch (option)
     {
-    case LDAP_OPT_API_FEATURE_INFO:
+    case WLDAP32_LDAP_OPT_API_FEATURE_INFO:
     {
         LDAPAPIFeatureInfoW featureW;
         LDAPAPIFeatureInfoA *featureA = value;
@@ -75,7 +75,7 @@ ULONG CDECL ldap_get_optionA( WLDAP32_LDAP *ld, int option, void *value )
         strfreeW( featureW.ldapaif_name );
         return ret;
     }
-    case LDAP_OPT_API_INFO:
+    case WLDAP32_LDAP_OPT_API_INFO:
     {
         LDAPAPIInfoW infoW;
         LDAPAPIInfoA *infoA = value;
@@ -109,55 +109,55 @@ ULONG CDECL ldap_get_optionA( WLDAP32_LDAP *ld, int option, void *value )
         return ret;
     }
 
-    case LDAP_OPT_DEREF:
-    case LDAP_OPT_DESC:
-    case LDAP_OPT_ERROR_NUMBER:
-    case LDAP_OPT_PROTOCOL_VERSION:
-    case LDAP_OPT_REFERRALS:
-    case LDAP_OPT_SIZELIMIT:
-    case LDAP_OPT_TIMELIMIT:
+    case WLDAP32_LDAP_OPT_DEREF:
+    case WLDAP32_LDAP_OPT_DESC:
+    case WLDAP32_LDAP_OPT_ERROR_NUMBER:
+    case WLDAP32_LDAP_OPT_PROTOCOL_VERSION:
+    case WLDAP32_LDAP_OPT_REFERRALS:
+    case WLDAP32_LDAP_OPT_SIZELIMIT:
+    case WLDAP32_LDAP_OPT_TIMELIMIT:
         return ldap_get_optionW( ld, option, value );
 
-    case LDAP_OPT_CACHE_ENABLE:
-    case LDAP_OPT_CACHE_FN_PTRS:
-    case LDAP_OPT_CACHE_STRATEGY:
-    case LDAP_OPT_IO_FN_PTRS:
-    case LDAP_OPT_REBIND_ARG:
-    case LDAP_OPT_REBIND_FN:
-    case LDAP_OPT_RESTART:
-    case LDAP_OPT_THREAD_FN_PTRS:
+    case WLDAP32_LDAP_OPT_CACHE_ENABLE:
+    case WLDAP32_LDAP_OPT_CACHE_FN_PTRS:
+    case WLDAP32_LDAP_OPT_CACHE_STRATEGY:
+    case WLDAP32_LDAP_OPT_IO_FN_PTRS:
+    case WLDAP32_LDAP_OPT_REBIND_ARG:
+    case WLDAP32_LDAP_OPT_REBIND_FN:
+    case WLDAP32_LDAP_OPT_RESTART:
+    case WLDAP32_LDAP_OPT_THREAD_FN_PTRS:
         return LDAP_LOCAL_ERROR;
 
-    case LDAP_OPT_AREC_EXCLUSIVE:
-    case LDAP_OPT_AUTO_RECONNECT:
-    case LDAP_OPT_CLIENT_CERTIFICATE:
-    case LDAP_OPT_DNSDOMAIN_NAME:
-    case LDAP_OPT_ENCRYPT:
-    case LDAP_OPT_ERROR_STRING:
-    case LDAP_OPT_FAST_CONCURRENT_BIND:
-    case LDAP_OPT_GETDSNAME_FLAGS:
-    case LDAP_OPT_HOST_NAME:
-    case LDAP_OPT_HOST_REACHABLE:
-    case LDAP_OPT_PING_KEEP_ALIVE:
-    case LDAP_OPT_PING_LIMIT:
-    case LDAP_OPT_PING_WAIT_TIME:
-    case LDAP_OPT_PROMPT_CREDENTIALS:
-    case LDAP_OPT_REF_DEREF_CONN_PER_MSG:
-    case LDAP_OPT_REFERRAL_CALLBACK:
-    case LDAP_OPT_REFERRAL_HOP_LIMIT:
-    case LDAP_OPT_ROOTDSE_CACHE:
-    case LDAP_OPT_SASL_METHOD:
-    case LDAP_OPT_SECURITY_CONTEXT:
-    case LDAP_OPT_SEND_TIMEOUT:
-    case LDAP_OPT_SERVER_CERTIFICATE:
-    case LDAP_OPT_SERVER_CONTROLS:
-    case LDAP_OPT_SERVER_ERROR:
-    case LDAP_OPT_SERVER_EXT_ERROR:
-    case LDAP_OPT_SIGN:
-    case LDAP_OPT_SSL:
-    case LDAP_OPT_SSL_INFO:
-    case LDAP_OPT_SSPI_FLAGS:
-    case LDAP_OPT_TCP_KEEPALIVE:
+    case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE:
+    case WLDAP32_LDAP_OPT_AUTO_RECONNECT:
+    case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE:
+    case WLDAP32_LDAP_OPT_DNSDOMAIN_NAME:
+    case WLDAP32_LDAP_OPT_ENCRYPT:
+    case WLDAP32_LDAP_OPT_ERROR_STRING:
+    case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND:
+    case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS:
+    case WLDAP32_LDAP_OPT_HOST_NAME:
+    case WLDAP32_LDAP_OPT_HOST_REACHABLE:
+    case WLDAP32_LDAP_OPT_PING_KEEP_ALIVE:
+    case WLDAP32_LDAP_OPT_PING_LIMIT:
+    case WLDAP32_LDAP_OPT_PING_WAIT_TIME:
+    case WLDAP32_LDAP_OPT_PROMPT_CREDENTIALS:
+    case WLDAP32_LDAP_OPT_REF_DEREF_CONN_PER_MSG:
+    case WLDAP32_LDAP_OPT_REFERRAL_CALLBACK:
+    case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT:
+    case WLDAP32_LDAP_OPT_ROOTDSE_CACHE:
+    case WLDAP32_LDAP_OPT_SASL_METHOD:
+    case WLDAP32_LDAP_OPT_SECURITY_CONTEXT:
+    case WLDAP32_LDAP_OPT_SEND_TIMEOUT:
+    case WLDAP32_LDAP_OPT_SERVER_CERTIFICATE:
+    case WLDAP32_LDAP_OPT_SERVER_CONTROLS:
+    case WLDAP32_LDAP_OPT_SERVER_ERROR:
+    case WLDAP32_LDAP_OPT_SERVER_EXT_ERROR:
+    case WLDAP32_LDAP_OPT_SIGN:
+    case WLDAP32_LDAP_OPT_SSL:
+    case WLDAP32_LDAP_OPT_SSL_INFO:
+    case WLDAP32_LDAP_OPT_SSPI_FLAGS:
+    case WLDAP32_LDAP_OPT_TCP_KEEPALIVE:
         FIXME( "Unsupported option: 0x%02x\n", option );
         return LDAP_NOT_SUPPORTED;
 
@@ -195,7 +195,7 @@ ULONG CDECL ldap_get_optionW( WLDAP32_LDAP *ld, int option, void *value )
 
     switch (option)
     {
-    case LDAP_OPT_API_FEATURE_INFO:
+    case WLDAP32_LDAP_OPT_API_FEATURE_INFO:
     {
         LDAPAPIFeatureInfo featureU;
         LDAPAPIFeatureInfoW *featureW = value;
@@ -214,7 +214,7 @@ ULONG CDECL ldap_get_optionW( WLDAP32_LDAP *ld, int option, void *value )
         strfreeU( featureU.ldapaif_name );
         return ret;
     }
-    case LDAP_OPT_API_INFO:
+    case WLDAP32_LDAP_OPT_API_INFO:
     {
         LDAPAPIInfo infoU;
         LDAPAPIInfoW *infoW = value;
@@ -248,55 +248,55 @@ ULONG CDECL ldap_get_optionW( WLDAP32_LDAP *ld, int option, void *value )
         return ret;
     }
 
-    case LDAP_OPT_DEREF:
-    case LDAP_OPT_DESC:
-    case LDAP_OPT_ERROR_NUMBER:
-    case LDAP_OPT_PROTOCOL_VERSION:
-    case LDAP_OPT_REFERRALS:
-    case LDAP_OPT_SIZELIMIT:
-    case LDAP_OPT_TIMELIMIT:
+    case WLDAP32_LDAP_OPT_DEREF:
+    case WLDAP32_LDAP_OPT_DESC:
+    case WLDAP32_LDAP_OPT_ERROR_NUMBER:
+    case WLDAP32_LDAP_OPT_PROTOCOL_VERSION:
+    case WLDAP32_LDAP_OPT_REFERRALS:
+    case WLDAP32_LDAP_OPT_SIZELIMIT:
+    case WLDAP32_LDAP_OPT_TIMELIMIT:
         return ldap_get_option( ld, option, value );
 
-    case LDAP_OPT_CACHE_ENABLE:
-    case LDAP_OPT_CACHE_FN_PTRS:
-    case LDAP_OPT_CACHE_STRATEGY:
-    case LDAP_OPT_IO_FN_PTRS:
-    case LDAP_OPT_REBIND_ARG:
-    case LDAP_OPT_REBIND_FN:
-    case LDAP_OPT_RESTART:
-    case LDAP_OPT_THREAD_FN_PTRS:
+    case WLDAP32_LDAP_OPT_CACHE_ENABLE:
+    case WLDAP32_LDAP_OPT_CACHE_FN_PTRS:
+    case WLDAP32_LDAP_OPT_CACHE_STRATEGY:
+    case WLDAP32_LDAP_OPT_IO_FN_PTRS:
+    case WLDAP32_LDAP_OPT_REBIND_ARG:
+    case WLDAP32_LDAP_OPT_REBIND_FN:
+    case WLDAP32_LDAP_OPT_RESTART:
+    case WLDAP32_LDAP_OPT_THREAD_FN_PTRS:
         return LDAP_LOCAL_ERROR;
 
-    case LDAP_OPT_AREC_EXCLUSIVE:
-    case LDAP_OPT_AUTO_RECONNECT:
-    case LDAP_OPT_CLIENT_CERTIFICATE:
-    case LDAP_OPT_DNSDOMAIN_NAME:
-    case LDAP_OPT_ENCRYPT:
-    case LDAP_OPT_ERROR_STRING:
-    case LDAP_OPT_FAST_CONCURRENT_BIND:
-    case LDAP_OPT_GETDSNAME_FLAGS:
-    case LDAP_OPT_HOST_NAME:
-    case LDAP_OPT_HOST_REACHABLE:
-    case LDAP_OPT_PING_KEEP_ALIVE:
-    case LDAP_OPT_PING_LIMIT:
-    case LDAP_OPT_PING_WAIT_TIME:
-    case LDAP_OPT_PROMPT_CREDENTIALS:
-    case LDAP_OPT_REF_DEREF_CONN_PER_MSG:
-    case LDAP_OPT_REFERRAL_CALLBACK:
-    case LDAP_OPT_REFERRAL_HOP_LIMIT:
-    case LDAP_OPT_ROOTDSE_CACHE:
-    case LDAP_OPT_SASL_METHOD:
-    case LDAP_OPT_SECURITY_CONTEXT:
-    case LDAP_OPT_SEND_TIMEOUT:
-    case LDAP_OPT_SERVER_CERTIFICATE:
-    case LDAP_OPT_SERVER_CONTROLS:
-    case LDAP_OPT_SERVER_ERROR:
-    case LDAP_OPT_SERVER_EXT_ERROR:
-    case LDAP_OPT_SIGN:
-    case LDAP_OPT_SSL:
-    case LDAP_OPT_SSL_INFO:
-    case LDAP_OPT_SSPI_FLAGS:
-    case LDAP_OPT_TCP_KEEPALIVE:
+    case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE:
+    case WLDAP32_LDAP_OPT_AUTO_RECONNECT:
+    case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE:
+    case WLDAP32_LDAP_OPT_DNSDOMAIN_NAME:
+    case WLDAP32_LDAP_OPT_ENCRYPT:
+    case WLDAP32_LDAP_OPT_ERROR_STRING:
+    case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND:
+    case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS:
+    case WLDAP32_LDAP_OPT_HOST_NAME:
+    case WLDAP32_LDAP_OPT_HOST_REACHABLE:
+    case WLDAP32_LDAP_OPT_PING_KEEP_ALIVE:
+    case WLDAP32_LDAP_OPT_PING_LIMIT:
+    case WLDAP32_LDAP_OPT_PING_WAIT_TIME:
+    case WLDAP32_LDAP_OPT_PROMPT_CREDENTIALS:
+    case WLDAP32_LDAP_OPT_REF_DEREF_CONN_PER_MSG:
+    case WLDAP32_LDAP_OPT_REFERRAL_CALLBACK:
+    case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT:
+    case WLDAP32_LDAP_OPT_ROOTDSE_CACHE:
+    case WLDAP32_LDAP_OPT_SASL_METHOD:
+    case WLDAP32_LDAP_OPT_SECURITY_CONTEXT:
+    case WLDAP32_LDAP_OPT_SEND_TIMEOUT:
+    case WLDAP32_LDAP_OPT_SERVER_CERTIFICATE:
+    case WLDAP32_LDAP_OPT_SERVER_CONTROLS:
+    case WLDAP32_LDAP_OPT_SERVER_ERROR:
+    case WLDAP32_LDAP_OPT_SERVER_EXT_ERROR:
+    case WLDAP32_LDAP_OPT_SIGN:
+    case WLDAP32_LDAP_OPT_SSL:
+    case WLDAP32_LDAP_OPT_SSL_INFO:
+    case WLDAP32_LDAP_OPT_SSPI_FLAGS:
+    case WLDAP32_LDAP_OPT_TCP_KEEPALIVE:
         FIXME( "Unsupported option: 0x%02x\n", option );
         return LDAP_NOT_SUPPORTED;
 
@@ -325,7 +325,7 @@ ULONG CDECL ldap_set_optionA( WLDAP32_LDAP *ld, int option, void *value )
 
     switch (option)
     {
-    case LDAP_OPT_SERVER_CONTROLS:
+    case WLDAP32_LDAP_OPT_SERVER_CONTROLS:
     {
         LDAPControlW **ctrlsW;
 
@@ -336,58 +336,58 @@ ULONG CDECL ldap_set_optionA( WLDAP32_LDAP *ld, int option, void *value )
         controlarrayfreeW( ctrlsW );
         return ret;
     }
-    case LDAP_OPT_DEREF:
-    case LDAP_OPT_DESC:
-    case LDAP_OPT_ERROR_NUMBER:
-    case LDAP_OPT_PROTOCOL_VERSION:
-    case LDAP_OPT_REFERRALS:
-    case LDAP_OPT_SIZELIMIT:
-    case LDAP_OPT_TIMELIMIT:
+    case WLDAP32_LDAP_OPT_DEREF:
+    case WLDAP32_LDAP_OPT_DESC:
+    case WLDAP32_LDAP_OPT_ERROR_NUMBER:
+    case WLDAP32_LDAP_OPT_PROTOCOL_VERSION:
+    case WLDAP32_LDAP_OPT_REFERRALS:
+    case WLDAP32_LDAP_OPT_SIZELIMIT:
+    case WLDAP32_LDAP_OPT_TIMELIMIT:
         return ldap_set_optionW( ld, option, value );
 
-    case LDAP_OPT_CACHE_ENABLE:
-    case LDAP_OPT_CACHE_FN_PTRS:
-    case LDAP_OPT_CACHE_STRATEGY:
-    case LDAP_OPT_IO_FN_PTRS:
-    case LDAP_OPT_REBIND_ARG:
-    case LDAP_OPT_REBIND_FN:
-    case LDAP_OPT_RESTART:
-    case LDAP_OPT_THREAD_FN_PTRS:
+    case WLDAP32_LDAP_OPT_CACHE_ENABLE:
+    case WLDAP32_LDAP_OPT_CACHE_FN_PTRS:
+    case WLDAP32_LDAP_OPT_CACHE_STRATEGY:
+    case WLDAP32_LDAP_OPT_IO_FN_PTRS:
+    case WLDAP32_LDAP_OPT_REBIND_ARG:
+    case WLDAP32_LDAP_OPT_REBIND_FN:
+    case WLDAP32_LDAP_OPT_RESTART:
+    case WLDAP32_LDAP_OPT_THREAD_FN_PTRS:
         return LDAP_LOCAL_ERROR;
 
-    case LDAP_OPT_API_FEATURE_INFO:
-    case LDAP_OPT_API_INFO:
+    case WLDAP32_LDAP_OPT_API_FEATURE_INFO:
+    case WLDAP32_LDAP_OPT_API_INFO:
         return LDAP_UNWILLING_TO_PERFORM;
 
-    case LDAP_OPT_AREC_EXCLUSIVE:
-    case LDAP_OPT_AUTO_RECONNECT:
-    case LDAP_OPT_CLIENT_CERTIFICATE:
-    case LDAP_OPT_DNSDOMAIN_NAME:
-    case LDAP_OPT_ENCRYPT:
-    case LDAP_OPT_ERROR_STRING:
-    case LDAP_OPT_FAST_CONCURRENT_BIND:
-    case LDAP_OPT_GETDSNAME_FLAGS:
-    case LDAP_OPT_HOST_NAME:
-    case LDAP_OPT_HOST_REACHABLE:
-    case LDAP_OPT_PING_KEEP_ALIVE:
-    case LDAP_OPT_PING_LIMIT:
-    case LDAP_OPT_PING_WAIT_TIME:
-    case LDAP_OPT_PROMPT_CREDENTIALS:
-    case LDAP_OPT_REF_DEREF_CONN_PER_MSG:
-    case LDAP_OPT_REFERRAL_CALLBACK:
-    case LDAP_OPT_REFERRAL_HOP_LIMIT:
-    case LDAP_OPT_ROOTDSE_CACHE:
-    case LDAP_OPT_SASL_METHOD:
-    case LDAP_OPT_SECURITY_CONTEXT:
-    case LDAP_OPT_SEND_TIMEOUT:
-    case LDAP_OPT_SERVER_CERTIFICATE:
-    case LDAP_OPT_SERVER_ERROR:
-    case LDAP_OPT_SERVER_EXT_ERROR:
-    case LDAP_OPT_SIGN:
-    case LDAP_OPT_SSL:
-    case LDAP_OPT_SSL_INFO:
-    case LDAP_OPT_SSPI_FLAGS:
-    case LDAP_OPT_TCP_KEEPALIVE:
+    case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE:
+    case WLDAP32_LDAP_OPT_AUTO_RECONNECT:
+    case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE:
+    case WLDAP32_LDAP_OPT_DNSDOMAIN_NAME:
+    case WLDAP32_LDAP_OPT_ENCRYPT:
+    case WLDAP32_LDAP_OPT_ERROR_STRING:
+    case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND:
+    case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS:
+    case WLDAP32_LDAP_OPT_HOST_NAME:
+    case WLDAP32_LDAP_OPT_HOST_REACHABLE:
+    case WLDAP32_LDAP_OPT_PING_KEEP_ALIVE:
+    case WLDAP32_LDAP_OPT_PING_LIMIT:
+    case WLDAP32_LDAP_OPT_PING_WAIT_TIME:
+    case WLDAP32_LDAP_OPT_PROMPT_CREDENTIALS:
+    case WLDAP32_LDAP_OPT_REF_DEREF_CONN_PER_MSG:
+    case WLDAP32_LDAP_OPT_REFERRAL_CALLBACK:
+    case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT:
+    case WLDAP32_LDAP_OPT_ROOTDSE_CACHE:
+    case WLDAP32_LDAP_OPT_SASL_METHOD:
+    case WLDAP32_LDAP_OPT_SECURITY_CONTEXT:
+    case WLDAP32_LDAP_OPT_SEND_TIMEOUT:
+    case WLDAP32_LDAP_OPT_SERVER_CERTIFICATE:
+    case WLDAP32_LDAP_OPT_SERVER_ERROR:
+    case WLDAP32_LDAP_OPT_SERVER_EXT_ERROR:
+    case WLDAP32_LDAP_OPT_SIGN:
+    case WLDAP32_LDAP_OPT_SSL:
+    case WLDAP32_LDAP_OPT_SSL_INFO:
+    case WLDAP32_LDAP_OPT_SSPI_FLAGS:
+    case WLDAP32_LDAP_OPT_TCP_KEEPALIVE:
         FIXME( "Unsupported option: 0x%02x\n", option );
         return LDAP_NOT_SUPPORTED;
 
@@ -428,7 +428,7 @@ ULONG CDECL ldap_set_optionW( WLDAP32_LDAP *ld, int option, void *value )
 
     switch (option)
     {
-    case LDAP_OPT_SERVER_CONTROLS:
+    case WLDAP32_LDAP_OPT_SERVER_CONTROLS:
     {
         LDAPControl **ctrlsU;
 
@@ -439,58 +439,58 @@ ULONG CDECL ldap_set_optionW( WLDAP32_LDAP *ld, int option, void *value )
         controlarrayfreeU( ctrlsU );
         return ret;
     }
-    case LDAP_OPT_DEREF:
-    case LDAP_OPT_DESC:
-    case LDAP_OPT_ERROR_NUMBER:
-    case LDAP_OPT_PROTOCOL_VERSION:
-    case LDAP_OPT_REFERRALS:
-    case LDAP_OPT_SIZELIMIT:
-    case LDAP_OPT_TIMELIMIT:
+    case WLDAP32_LDAP_OPT_DEREF:
+    case WLDAP32_LDAP_OPT_DESC:
+    case WLDAP32_LDAP_OPT_ERROR_NUMBER:
+    case WLDAP32_LDAP_OPT_PROTOCOL_VERSION:
+    case WLDAP32_LDAP_OPT_REFERRALS:
+    case WLDAP32_LDAP_OPT_SIZELIMIT:
+    case WLDAP32_LDAP_OPT_TIMELIMIT:
         return ldap_set_option( ld, option, value );
 
-    case LDAP_OPT_CACHE_ENABLE:
-    case LDAP_OPT_CACHE_FN_PTRS:
-    case LDAP_OPT_CACHE_STRATEGY:
-    case LDAP_OPT_IO_FN_PTRS:
-    case LDAP_OPT_REBIND_ARG:
-    case LDAP_OPT_REBIND_FN:
-    case LDAP_OPT_RESTART:
-    case LDAP_OPT_THREAD_FN_PTRS:
+    case WLDAP32_LDAP_OPT_CACHE_ENABLE:
+    case WLDAP32_LDAP_OPT_CACHE_FN_PTRS:
+    case WLDAP32_LDAP_OPT_CACHE_STRATEGY:
+    case WLDAP32_LDAP_OPT_IO_FN_PTRS:
+    case WLDAP32_LDAP_OPT_REBIND_ARG:
+    case WLDAP32_LDAP_OPT_REBIND_FN:
+    case WLDAP32_LDAP_OPT_RESTART:
+    case WLDAP32_LDAP_OPT_THREAD_FN_PTRS:
         return LDAP_LOCAL_ERROR;
 
-    case LDAP_OPT_API_FEATURE_INFO:
-    case LDAP_OPT_API_INFO:
+    case WLDAP32_LDAP_OPT_API_FEATURE_INFO:
+    case WLDAP32_LDAP_OPT_API_INFO:
         return LDAP_UNWILLING_TO_PERFORM;
 
-    case LDAP_OPT_AREC_EXCLUSIVE:
-    case LDAP_OPT_AUTO_RECONNECT:
-    case LDAP_OPT_CLIENT_CERTIFICATE:
-    case LDAP_OPT_DNSDOMAIN_NAME:
-    case LDAP_OPT_ENCRYPT:
-    case LDAP_OPT_ERROR_STRING:
-    case LDAP_OPT_FAST_CONCURRENT_BIND:
-    case LDAP_OPT_GETDSNAME_FLAGS:
-    case LDAP_OPT_HOST_NAME:
-    case LDAP_OPT_HOST_REACHABLE:
-    case LDAP_OPT_PING_KEEP_ALIVE:
-    case LDAP_OPT_PING_LIMIT:
-    case LDAP_OPT_PING_WAIT_TIME:
-    case LDAP_OPT_PROMPT_CREDENTIALS:
-    case LDAP_OPT_REF_DEREF_CONN_PER_MSG:
-    case LDAP_OPT_REFERRAL_CALLBACK:
-    case LDAP_OPT_REFERRAL_HOP_LIMIT:
-    case LDAP_OPT_ROOTDSE_CACHE:
-    case LDAP_OPT_SASL_METHOD:
-    case LDAP_OPT_SECURITY_CONTEXT:
-    case LDAP_OPT_SEND_TIMEOUT:
-    case LDAP_OPT_SERVER_CERTIFICATE:
-    case LDAP_OPT_SERVER_ERROR:
-    case LDAP_OPT_SERVER_EXT_ERROR:
-    case LDAP_OPT_SIGN:
-    case LDAP_OPT_SSL:
-    case LDAP_OPT_SSL_INFO:
-    case LDAP_OPT_SSPI_FLAGS:
-    case LDAP_OPT_TCP_KEEPALIVE:
+    case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE:
+    case WLDAP32_LDAP_OPT_AUTO_RECONNECT:
+    case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE:
+    case WLDAP32_LDAP_OPT_DNSDOMAIN_NAME:
+    case WLDAP32_LDAP_OPT_ENCRYPT:
+    case WLDAP32_LDAP_OPT_ERROR_STRING:
+    case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND:
+    case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS:
+    case WLDAP32_LDAP_OPT_HOST_NAME:
+    case WLDAP32_LDAP_OPT_HOST_REACHABLE:
+    case WLDAP32_LDAP_OPT_PING_KEEP_ALIVE:
+    case WLDAP32_LDAP_OPT_PING_LIMIT:
+    case WLDAP32_LDAP_OPT_PING_WAIT_TIME:
+    case WLDAP32_LDAP_OPT_PROMPT_CREDENTIALS:
+    case WLDAP32_LDAP_OPT_REF_DEREF_CONN_PER_MSG:
+    case WLDAP32_LDAP_OPT_REFERRAL_CALLBACK:
+    case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT:
+    case WLDAP32_LDAP_OPT_ROOTDSE_CACHE:
+    case WLDAP32_LDAP_OPT_SASL_METHOD:
+    case WLDAP32_LDAP_OPT_SECURITY_CONTEXT:
+    case WLDAP32_LDAP_OPT_SEND_TIMEOUT:
+    case WLDAP32_LDAP_OPT_SERVER_CERTIFICATE:
+    case WLDAP32_LDAP_OPT_SERVER_ERROR:
+    case WLDAP32_LDAP_OPT_SERVER_EXT_ERROR:
+    case WLDAP32_LDAP_OPT_SIGN:
+    case WLDAP32_LDAP_OPT_SSL:
+    case WLDAP32_LDAP_OPT_SSL_INFO:
+    case WLDAP32_LDAP_OPT_SSPI_FLAGS:
+    case WLDAP32_LDAP_OPT_TCP_KEEPALIVE:
         FIXME( "Unsupported option: 0x%02x\n", option );
         return LDAP_NOT_SUPPORTED;
 
diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h
index f4638e9a7fb..4936a581e3f 100644
--- a/dlls/wldap32/winldap_private.h
+++ b/dlls/wldap32/winldap_private.h
@@ -48,43 +48,56 @@ typedef struct berelement
     PCHAR opaque;
 } WLDAP32_BerElement;
 
-#define LDAP_OPT_THREAD_FN_PTRS         0x05
-#define LDAP_OPT_REBIND_FN              0x06
-#define LDAP_OPT_REBIND_ARG             0x07
-#define LDAP_OPT_SSL                    0x0a
-#define LDAP_OPT_IO_FN_PTRS             0x0b
-#define LDAP_OPT_CACHE_FN_PTRS          0x0d
-#define LDAP_OPT_CACHE_STRATEGY         0x0e
-#define LDAP_OPT_CACHE_ENABLE           0x0f
-#define LDAP_OPT_REFERRAL_HOP_LIMIT     0x10
-#define LDAP_OPT_VERSION                0x11
-#define LDAP_OPT_SERVER_ERROR           0x33
-#define LDAP_OPT_SERVER_EXT_ERROR       0x34
-#define LDAP_OPT_PING_KEEP_ALIVE        0x36
-#define LDAP_OPT_PING_WAIT_TIME         0x37
-#define LDAP_OPT_PING_LIMIT             0x38
-#define LDAP_OPT_DNSDOMAIN_NAME         0x3b
-#define LDAP_OPT_GETDSNAME_FLAGS        0x3d
-#define LDAP_OPT_HOST_REACHABLE         0x3e
-#define LDAP_OPT_PROMPT_CREDENTIALS     0x3f
-#define LDAP_OPT_TCP_KEEPALIVE          0x40
-#define LDAP_OPT_FAST_CONCURRENT_BIND   0x41
-#define LDAP_OPT_SEND_TIMEOUT           0x42
-#define LDAP_OPT_REFERRAL_CALLBACK      0x70
-#define LDAP_OPT_CLIENT_CERTIFICATE     0x80
-#define LDAP_OPT_SERVER_CERTIFICATE     0x81
-#define LDAP_OPT_AUTO_RECONNECT         0x91
-#define LDAP_OPT_SSPI_FLAGS             0x92
-#define LDAP_OPT_SSL_INFO               0x93
-#define LDAP_OPT_REF_DEREF_CONN_PER_MSG 0x94
-#define LDAP_OPT_TLS                    LDAP_OPT_SSL
-#define LDAP_OPT_TLS_INFO               LDAP_OPT_SSL_INFO
-#define LDAP_OPT_SIGN                   0x95
-#define LDAP_OPT_ENCRYPT                0x96
-#define LDAP_OPT_SASL_METHOD            0x97
-#define LDAP_OPT_AREC_EXCLUSIVE         0x98
-#define LDAP_OPT_SECURITY_CONTEXT       0x99
-#define LDAP_OPT_ROOTDSE_CACHE          0x9a
+#define WLDAP32_LDAP_OPT_API_INFO               0x00
+#define WLDAP32_LDAP_OPT_DESC                   0x01
+#define WLDAP32_LDAP_OPT_DEREF                  0x02
+#define WLDAP32_LDAP_OPT_SIZELIMIT              0x03
+#define WLDAP32_LDAP_OPT_TIMELIMIT              0x04
+#define WLDAP32_LDAP_OPT_THREAD_FN_PTRS         0x05
+#define WLDAP32_LDAP_OPT_REBIND_FN              0x06
+#define WLDAP32_LDAP_OPT_REBIND_ARG             0x07
+#define WLDAP32_LDAP_OPT_REFERRALS              0x08
+#define WLDAP32_LDAP_OPT_RESTART                0x09
+#define WLDAP32_LDAP_OPT_SSL                    0x0a
+#define WLDAP32_LDAP_OPT_IO_FN_PTRS             0x0b
+#define WLDAP32_LDAP_OPT_CACHE_FN_PTRS          0x0d
+#define WLDAP32_LDAP_OPT_CACHE_STRATEGY         0x0e
+#define WLDAP32_LDAP_OPT_CACHE_ENABLE           0x0f
+#define WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT     0x10
+#define WLDAP32_LDAP_OPT_VERSION                0x11
+#define WLDAP32_LDAP_OPT_PROTOCOL_VERSION       WLDAP32_LDAP_OPT_VERSION
+#define WLDAP32_LDAP_OPT_SERVER_CONTROLS        0x12
+#define WLDAP32_LDAP_OPT_API_FEATURE_INFO       0x15
+#define WLDAP32_LDAP_OPT_HOST_NAME              0x30
+#define WLDAP32_LDAP_OPT_ERROR_NUMBER           0x31
+#define WLDAP32_LDAP_OPT_ERROR_STRING           0x32
+#define WLDAP32_LDAP_OPT_SERVER_ERROR           0x33
+#define WLDAP32_LDAP_OPT_SERVER_EXT_ERROR       0x34
+#define WLDAP32_LDAP_OPT_PING_KEEP_ALIVE        0x36
+#define WLDAP32_LDAP_OPT_PING_WAIT_TIME         0x37
+#define WLDAP32_LDAP_OPT_PING_LIMIT             0x38
+#define WLDAP32_LDAP_OPT_DNSDOMAIN_NAME         0x3b
+#define WLDAP32_LDAP_OPT_GETDSNAME_FLAGS        0x3d
+#define WLDAP32_LDAP_OPT_HOST_REACHABLE         0x3e
+#define WLDAP32_LDAP_OPT_PROMPT_CREDENTIALS     0x3f
+#define WLDAP32_LDAP_OPT_TCP_KEEPALIVE          0x40
+#define WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND   0x41
+#define WLDAP32_LDAP_OPT_SEND_TIMEOUT           0x42
+#define WLDAP32_LDAP_OPT_REFERRAL_CALLBACK      0x70
+#define WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE     0x80
+#define WLDAP32_LDAP_OPT_SERVER_CERTIFICATE     0x81
+#define WLDAP32_LDAP_OPT_AUTO_RECONNECT         0x91
+#define WLDAP32_LDAP_OPT_SSPI_FLAGS             0x92
+#define WLDAP32_LDAP_OPT_SSL_INFO               0x93
+#define WLDAP32_LDAP_OPT_REF_DEREF_CONN_PER_MSG 0x94
+#define WLDAP32_LDAP_OPT_TLS                    WLDAP32_LDAP_OPT_SSL
+#define WLDAP32_LDAP_OPT_TLS_INFO               WLDAP32_LDAP_OPT_SSL_INFO
+#define WLDAP32_LDAP_OPT_SIGN                   0x95
+#define WLDAP32_LDAP_OPT_ENCRYPT                0x96
+#define WLDAP32_LDAP_OPT_SASL_METHOD            0x97
+#define WLDAP32_LDAP_OPT_AREC_EXCLUSIVE         0x98
+#define WLDAP32_LDAP_OPT_SECURITY_CONTEXT       0x99
+#define WLDAP32_LDAP_OPT_ROOTDSE_CACHE          0x9a
 
 typedef struct ldap
 {