diff --git a/disabled-packages/box86/build.sh b/disabled-packages/box86/build.sh
index 5d39907e1b..c2c238c5f8 100644
--- a/disabled-packages/box86/build.sh
+++ b/disabled-packages/box86/build.sh
@@ -10,7 +10,6 @@ TERMUX_PKG_SRCURL=git+https://github.com/ptitSeb/box86
 TERMUX_PKG_GIT_BRANCH=master
 TERMUX_PKG_DEPENDS="libandroid-complex-math, libandroid-glob, libandroid-spawn, libandroid-sysv-semaphore"
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_ENABLE_CLANG16_PORTING=false
 
 # box86 is for arm only
 TERMUX_PKG_BLACKLISTED_ARCHES="aarch64, i686, x86_64"
diff --git a/disabled-packages/dynomite/build.sh b/disabled-packages/dynomite/build.sh
index a72ce1e9c1..2492c43ea8 100644
--- a/disabled-packages/dynomite/build.sh
+++ b/disabled-packages/dynomite/build.sh
@@ -13,8 +13,6 @@ ac_cv_evports_works=no
 ac_cv_header_execinfo_h=no
 ac_cv_kqueue_works=no
 "
-TERMUX_PKG_ENABLE_CLANG16_PORTING=false
-
 termux_step_pre_configure() {
 	autoreconf -fi
 
diff --git a/disabled-packages/gl4es/build.sh b/disabled-packages/gl4es/build.sh
index 9d8b6735da..07f0bff12b 100644
--- a/disabled-packages/gl4es/build.sh
+++ b/disabled-packages/gl4es/build.sh
@@ -10,7 +10,6 @@ TERMUX_PKG_SRCURL=git+https://github.com/ptitSeb/gl4es
 TERMUX_PKG_GIT_BRANCH=master
 TERMUX_PKG_DEPENDS="libx11"
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_ENABLE_CLANG16_PORTING=false
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DTERMUX=ON
 -DCMAKE_SYSTEM_NAME=Linux
diff --git a/disabled-packages/latino/build.sh b/disabled-packages/latino/build.sh
index b2861a9574..d0d31eddc0 100644
--- a/disabled-packages/latino/build.sh
+++ b/disabled-packages/latino/build.sh
@@ -6,6 +6,5 @@ TERMUX_PKG_VERSION=1.3.1
 TERMUX_PKG_SRCURL=https://github.com/primitivorm/latino-termux/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=7c67875a1db1c1180a7579545d8981c77444cba99c5d4b46664889732765608c
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_ENABLE_CLANG16_PORTING=false
 TERMUX_PKG_DEPENDS="readline, pcre2"
 TERMUX_PKG_FORCE_CMAKE=true
diff --git a/disabled-packages/sc/build.sh b/disabled-packages/sc/build.sh
index fb656b7de1..6f4ffc43b2 100644
--- a/disabled-packages/sc/build.sh
+++ b/disabled-packages/sc/build.sh
@@ -9,7 +9,6 @@ TERMUX_PKG_SHA256=1997a00b6d82d189b65f6fd2a856a34992abc99e50d9ec463bbf1afb750d17
 TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="SIMPLE=-DSIMPLE"
-TERMUX_PKG_ENABLE_CLANG16_PORTING=false
 
 termux_step_post_configure () {
 	CFLAGS+=" -I$TERMUX_PREFIX/include"
diff --git a/disabled-packages/terraform/build.sh b/disabled-packages/terraform/build.sh
index 0ec9aaf7e0..65f45d8f64 100644
--- a/disabled-packages/terraform/build.sh
+++ b/disabled-packages/terraform/build.sh
@@ -6,7 +6,6 @@ TERMUX_PKG_VERSION="1.4.4"
 TERMUX_PKG_SRCURL=https://github.com/hashicorp/terraform/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=ab9e6d743c0a00be8c6c1a2723f39191e3cbd14517acbc3e6ff2baa753865074
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_ENABLE_CLANG16_PORTING=false
 TERMUX_PKG_DEPENDS="git"
 
 termux_step_make() {
diff --git a/disabled-packages/transcode/build.sh b/disabled-packages/transcode/build.sh
index f201139b6e..429b2eb0ca 100644
--- a/disabled-packages/transcode/build.sh
+++ b/disabled-packages/transcode/build.sh
@@ -24,8 +24,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-imagemagick
 --with-x=no
 "
-TERMUX_PKG_ENABLE_CLANG16_PORTING=false
-
 termux_step_post_get_source() {
 	local _PATCH_FILES="
 		transcode-1.1.7-freetype251.patch
diff --git a/scripts/build/configure/termux_step_configure_cmake.sh b/scripts/build/configure/termux_step_configure_cmake.sh
index ccecf18b91..e1af9afb20 100644
--- a/scripts/build/configure/termux_step_configure_cmake.sh
+++ b/scripts/build/configure/termux_step_configure_cmake.sh
@@ -9,14 +9,6 @@ termux_step_configure_cmake() {
 	CMAKE_PROC=$TERMUX_ARCH
 	test $CMAKE_PROC == "arm" && CMAKE_PROC='armv7-a'
 
-	local CMAKE_TERMUX_TOOL_C_COMPILER=False
-	if [ "$TERMUX_PKG_ENABLE_CLANG16_PORTING" = "true" ]; then
-		local _cc
-		if _cc="$(command -v ${CC-})"; then
-			CMAKE_TERMUX_TOOL_C_COMPILER="$_cc"
-		fi
-	fi
-
 	local CMAKE_ADDITIONAL_ARGS=()
 	if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
  		if [ "$TERMUX_PACKAGE_LIBRARY" = "bionic" ]; then
@@ -30,11 +22,9 @@ termux_step_configure_cmake() {
   		if [ "$TERMUX_PACKAGE_LIBRARY" = "bionic" ]; then
 			CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_SYSTEM_NAME=Android")
 			CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_SYSTEM_VERSION=$TERMUX_PKG_API_LEVEL")
-			CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_TERMUX_TOOL_C_COMPILER=$CMAKE_TERMUX_TOOL_C_COMPILER")
 			CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=$TERMUX_STANDALONE_TOOLCHAIN")
    		elif [ "$TERMUX_PACKAGE_LIBRARY" = "glibc" ]; then
      			CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_SYSTEM_NAME=Linux")
-			CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_TERMUX_TOOL_C_COMPILER=$CC")
   		fi
   		CMAKE_ADDITIONAL_ARGS+=("-DCMAKE_SYSTEM_PROCESSOR=$CMAKE_PROC")
 	else
diff --git a/scripts/build/setup/cmake-c-compiler.patch b/scripts/build/setup/cmake-c-compiler.patch
deleted file mode 100644
index a48a60a93f..0000000000
--- a/scripts/build/setup/cmake-c-compiler.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/share/cmake-3.29/Modules/Platform/Android/Determine-Compiler.cmake
-+++ b/share/cmake-3.29/Modules/Platform/Android/Determine-Compiler.cmake
-@@ -71,6 +71,10 @@
-   set(_ANDROID_TOOL_CXX_TOOLCHAIN_SUFFIX "")
- endif()
- 
-+if(CMAKE_TERMUX_TOOL_C_COMPILER)
-+  set(_ANDROID_TOOL_C_COMPILER ${CMAKE_TERMUX_TOOL_C_COMPILER})
-+endif()
-+
- unset(_ANDROID_HOST_EXT)
- 
- macro(__android_determine_compiler lang)
diff --git a/scripts/build/setup/termux_setup_cmake.sh b/scripts/build/setup/termux_setup_cmake.sh
index 55dee49acf..bef2261ea2 100644
--- a/scripts/build/setup/termux_setup_cmake.sh
+++ b/scripts/build/setup/termux_setup_cmake.sh
@@ -24,13 +24,6 @@ termux_setup_cmake() {
 				90b543a30220401db0e08347af067545be158ce89ffb09b7df1516cda8617329
 			rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-linux-x86_64"
 			tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR"
-			shopt -s nullglob
-			local f
-			for f in "$TERMUX_SCRIPTDIR"/scripts/build/setup/cmake-*.patch; do
-				echo "[${FUNCNAME[0]}]: Applying $(basename "$f")"
-				patch --silent -p1 -d "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-linux-x86_64" < "$f"
-			done
-			shopt -u nullglob
 			mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-linux-x86_64" \
 				"$TERMUX_CMAKE_FOLDER"
 		fi
diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh
index 64ce46c91c..a2af8147fa 100644
--- a/scripts/build/termux_step_setup_toolchain.sh
+++ b/scripts/build/termux_step_setup_toolchain.sh
@@ -7,10 +7,10 @@ termux_step_setup_toolchain() {
 		# toolchain setup to ensure that everyone gets an updated
 		# toolchain
 		if [ "${TERMUX_NDK_VERSION}" = "26b" ]; then
-			TERMUX_STANDALONE_TOOLCHAIN+="-v3"
+			TERMUX_STANDALONE_TOOLCHAIN+="-v4"
 			termux_setup_toolchain_26b
 		elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then
-			TERMUX_STANDALONE_TOOLCHAIN+="-v6"
+			TERMUX_STANDALONE_TOOLCHAIN+="-v7"
 			termux_setup_toolchain_23c
 		else
 			termux_error_exit "We do not have a setup_toolchain function for NDK version $TERMUX_NDK_VERSION"
diff --git a/scripts/build/termux_step_setup_variables.sh b/scripts/build/termux_step_setup_variables.sh
index 08257a0c89..3bae31095a 100644
--- a/scripts/build/termux_step_setup_variables.sh
+++ b/scripts/build/termux_step_setup_variables.sh
@@ -141,7 +141,6 @@ termux_step_setup_variables() {
 	TERMUX_PKG_DEPENDS=""
 	TERMUX_PKG_DESCRIPTION="FIXME:Add description"
 	TERMUX_PKG_DISABLE_GIR=false # termux_setup_gir
-	TERMUX_PKG_ENABLE_CLANG16_PORTING=true
 	TERMUX_PKG_ESSENTIAL=false
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS=""
 	TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS=""
diff --git a/scripts/build/toolchain/termux_setup_toolchain_26b.sh b/scripts/build/toolchain/termux_setup_toolchain_26b.sh
index 993817d374..3b2043c674 100644
--- a/scripts/build/toolchain/termux_setup_toolchain_26b.sh
+++ b/scripts/build/toolchain/termux_setup_toolchain_26b.sh
@@ -118,15 +118,6 @@ termux_setup_toolchain_26b() {
 	fi
 
 	if [ -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
-		for HOST_PLAT in aarch64-linux-android armv7a-linux-androideabi i686-linux-android x86_64-linux-android arm-linux-androideabi; do
-			if [ "$TERMUX_PKG_ENABLE_CLANG16_PORTING" = "true" ]; then
-				cp $TERMUX_STANDALONE_TOOLCHAIN/bin/$HOST_PLAT-clang.16-porting \
-					$TERMUX_STANDALONE_TOOLCHAIN/bin/$HOST_PLAT-clang
-			else
-				cp $TERMUX_STANDALONE_TOOLCHAIN/bin/$HOST_PLAT-clang.no-16-porting \
-					$TERMUX_STANDALONE_TOOLCHAIN/bin/$HOST_PLAT-clang
-			fi
-		done
 		return
 	fi
 
@@ -170,22 +161,6 @@ termux_setup_toolchain_26b() {
 	cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi-cpp \
 		$_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-cpp
 
-	for HOST_PLAT in aarch64-linux-android armv7a-linux-androideabi i686-linux-android x86_64-linux-android arm-linux-androideabi; do
-		mv $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang \
-			$_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.no-16-porting
-		cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.no-16-porting \
-			$_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.16-porting
-		sed -i 's/"\$@"/--start-no-unused-arguments -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types --end-no-unused-arguments \0/g' \
-			$_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.no-16-porting
-		if [ "$TERMUX_PKG_ENABLE_CLANG16_PORTING" = "true" ]; then
-			cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.16-porting \
-				$_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang
-		else
-			cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang.no-16-porting \
-				$_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang
-		fi
-	done
-
 	# rust 1.75.0+ expects this directory to be present
 	rm -fr "${_TERMUX_TOOLCHAIN_TMPDIR}"/toolchains
 	mkdir -p "${_TERMUX_TOOLCHAIN_TMPDIR}"/toolchains/llvm/prebuilt