diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dcd3520d..61a7f00b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,10 +144,6 @@ if(WITH_FREERDP_3x_DEPRECATED)
   set(WITHOUT_FREERDP_3x_DEPRECATED OFF)
 endif()
 
-if(WITHOUT_FREERDP_3x_DEPRECATED)
-  add_compile_definitions(WITHOUT_FREERDP_3x_DEPRECATED)
-endif()
-
 option(WITH_FREERDP_DEPRECATED_COMMANDLINE "Build FreeRDP deprecated command line options" OFF)
 if(WITH_FREERDP_DEPRECATED_COMMANDLINE)
   add_compile_definitions(WITH_FREERDP_DEPRECATED_COMMANDLINE)
diff --git a/client/Android/Studio/aFreeRDP/build.gradle b/client/Android/Studio/aFreeRDP/build.gradle
index e1878adc8..a02e8ee20 100644
--- a/client/Android/Studio/aFreeRDP/build.gradle
+++ b/client/Android/Studio/aFreeRDP/build.gradle
@@ -42,7 +42,6 @@ android {
         }
         debug {
             jniDebuggable true
-            renderscriptDebuggable true
         }
     }
 }
diff --git a/client/Android/Studio/build.gradle b/client/Android/Studio/build.gradle
index c3a507fa4..dde326b28 100644
--- a/client/Android/Studio/build.gradle
+++ b/client/Android/Studio/build.gradle
@@ -43,7 +43,7 @@ buildscript {
         }
     }
     dependencies {
-       classpath 'com.android.tools.build:gradle:8.9.2'
+       classpath 'com.android.tools.build:gradle:8.13.0'
     }
 }
 
diff --git a/client/Android/Studio/freeRDPCore/build.gradle b/client/Android/Studio/freeRDPCore/build.gradle
index 26c73fe7b..ae231b458 100644
--- a/client/Android/Studio/freeRDPCore/build.gradle
+++ b/client/Android/Studio/freeRDPCore/build.gradle
@@ -46,7 +46,6 @@ android {
         }
         debug {
             jniDebuggable true
-            renderscriptDebuggable true
         }
     }
     compileOptions {
diff --git a/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties b/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties
index a4881f110..47d490192 100644
--- a/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties
+++ b/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Jan 20 07:44:59 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/include/config/config.h.in b/include/config/config.h.in
index 284a681ec..cf64c3143 100644
--- a/include/config/config.h.in
+++ b/include/config/config.h.in
@@ -227,4 +227,10 @@
  */
 #cmakedefine HAVE_AF_VSOCK_H
 
+/** If library is build without these do permanently hide symbols
+ *
+ * \since version 3.17.2
+ */
+#cmakedefine WITHOUT_FREERDP_3x_DEPRECATED
+
 #endif /* FREERDP_CONFIG_H */
diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf
index 99e3135c1..ea8d12262 100644
--- a/scripts/android-build-32.conf
+++ b/scripts/android-build-32.conf
@@ -20,12 +20,12 @@ WITH_MEDIACODEC=0
 
 OPENH264_TAG=v2.6.0
 OPENH264_HASH=558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69
-OPENSSL_TAG=openssl-3.5.0
-OPENSSL_HASH=344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
-FFMPEG_TAG=n7.1.1
-FFMPEG_HASH=f117507dc501f2a6c11f9241d8d0c3213846cfad91764361af37befd6b6c523d
-CJSON_TAG=v1.7.18
-CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5
+OPENSSL_TAG=openssl-3.5.3
+OPENSSL_HASH=c9489d2abcf943cdc8329a57092331c598a402938054dc3a22218aea8a8ec3bf
+FFMPEG_TAG=n7.1.2
+FFMPEG_HASH=8cb1bb8cfa9aeae13279b4da42ae8307ae6777456d4270f2e603c95aa08ca8ef
+CJSON_TAG=v1.7.19
+CJSON_HASH=7fa616e3046edfa7a28a32d5f9eacfd23f92900fe1f8ccd988c1662f30454562
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs
diff --git a/scripts/android-build-64.conf b/scripts/android-build-64.conf
index 70ccf1cfe..96ceba455 100644
--- a/scripts/android-build-64.conf
+++ b/scripts/android-build-64.conf
@@ -20,12 +20,12 @@ WITH_MEDIACODEC=0
 
 OPENH264_TAG=v2.6.0
 OPENH264_HASH=558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69
-OPENSSL_TAG=openssl-3.5.0
-OPENSSL_HASH=344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
-FFMPEG_TAG=n7.1.1
-FFMPEG_HASH=f117507dc501f2a6c11f9241d8d0c3213846cfad91764361af37befd6b6c523d
-CJSON_TAG=v1.7.18
-CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5
+OPENSSL_TAG=openssl-3.5.3
+OPENSSL_HASH=c9489d2abcf943cdc8329a57092331c598a402938054dc3a22218aea8a8ec3bf
+FFMPEG_TAG=n7.1.2
+FFMPEG_HASH=8cb1bb8cfa9aeae13279b4da42ae8307ae6777456d4270f2e603c95aa08ca8ef
+CJSON_TAG=v1.7.19
+CJSON_HASH=7fa616e3046edfa7a28a32d5f9eacfd23f92900fe1f8ccd988c1662f30454562
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs
diff --git a/scripts/android-build-freerdp.sh b/scripts/android-build-freerdp.sh
index 69874999e..82033f541 100755
--- a/scripts/android-build-freerdp.sh
+++ b/scripts/android-build-freerdp.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-OPENH264_TAG=v2.5.0
-OPENH264_HASH=94c8ca364db990047ec4ec3481b04ce0d791e62561ef5601443011bdc00825e3
-OPENSSL_TAG=openssl-3.4.0
-OPENSSL_HASH=e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf
-FFMPEG_TAG=n7.1
+OPENH264_TAG=v2.6.0
+OPENH264_HASH=558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69
+OPENSSL_TAG=openssl-3.5.3
+OPENSSL_HASH=c9489d2abcf943cdc8329a57092331c598a402938054dc3a22218aea8a8ec3bf
+FFMPEG_TAG=n7.1.2
 FFMPEG_HASH=7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a
-CJSON_TAG=v1.7.18
-CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5
+CJSON_TAG=v1.7.19
+CJSON_HASH=7fa616e3046edfa7a28a32d5f9eacfd23f92900fe1f8ccd988c1662f30454562
 
 WITH_OPENH264=0
 WITH_OPENSSL=0
@@ -102,6 +102,7 @@ CMAKE_CMD_ARGS="-DANDROID_NDK=$ANDROID_NDK \
 	-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
 	-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
 	-DFREERDP_EXTERNAL_PATH=$BUILD_DST \
+	-DWITHOUT_FREERDP_3x_DEPRECATED=ON \
 	-DWITH_CLIENT_SDL=OFF \
 	-DWITH_SERVER=OFF \
 	-DWITH_INTERNAL_RC4=ON \
diff --git a/scripts/android-build-release.conf b/scripts/android-build-release.conf
index 2c643d41f..1bc7f4490 100644
--- a/scripts/android-build-release.conf
+++ b/scripts/android-build-release.conf
@@ -20,12 +20,12 @@ WITH_MEDIACODEC=0
 
 OPENH264_TAG=v2.6.0
 OPENH264_HASH=558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69
-OPENSSL_TAG=openssl-3.5.0
-OPENSSL_HASH=344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
-FFMPEG_TAG=n7.1.1
-FFMPEG_HASH=f117507dc501f2a6c11f9241d8d0c3213846cfad91764361af37befd6b6c523d
-CJSON_TAG=v1.7.18
-CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5
+OPENSSL_TAG=openssl-3.5.3
+OPENSSL_HASH=c9489d2abcf943cdc8329a57092331c598a402938054dc3a22218aea8a8ec3bf
+FFMPEG_TAG=n7.1.2
+FFMPEG_HASH=8cb1bb8cfa9aeae13279b4da42ae8307ae6777456d4270f2e603c95aa08ca8ef
+CJSON_TAG=v1.7.19
+CJSON_HASH=7fa616e3046edfa7a28a32d5f9eacfd23f92900fe1f8ccd988c1662f30454562
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs
diff --git a/scripts/android-build.conf b/scripts/android-build.conf
index f46c80734..dfcf1e1bc 100644
--- a/scripts/android-build.conf
+++ b/scripts/android-build.conf
@@ -20,12 +20,12 @@ WITH_MEDIACODEC=0
 
 OPENH264_TAG=v2.6.0
 OPENH264_HASH=558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69
-OPENSSL_TAG=openssl-3.5.0
-OPENSSL_HASH=344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
-FFMPEG_TAG=n7.1.1
-FFMPEG_HASH=f117507dc501f2a6c11f9241d8d0c3213846cfad91764361af37befd6b6c523d
-CJSON_TAG=v1.7.18
-CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5
+OPENSSL_TAG=openssl-3.5.3
+OPENSSL_HASH=c9489d2abcf943cdc8329a57092331c598a402938054dc3a22218aea8a8ec3bf
+FFMPEG_TAG=n7.1.2
+FFMPEG_HASH=8cb1bb8cfa9aeae13279b4da42ae8307ae6777456d4270f2e603c95aa08ca8ef
+CJSON_TAG=v1.7.19
+CJSON_HASH=7fa616e3046edfa7a28a32d5f9eacfd23f92900fe1f8ccd988c1662f30454562
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs