diff --git a/TMessagesProj/jni/CMakeLists.txt b/TMessagesProj/jni/CMakeLists.txt
index 77059f188..fd43ea665 100644
--- a/TMessagesProj/jni/CMakeLists.txt
+++ b/TMessagesProj/jni/CMakeLists.txt
@@ -726,6 +726,7 @@ target_include_directories(${NATIVE_LIB} PUBLIC
         third_party/libyuv/include
         boringssl/include
         ffmpeg/build/${ANDROID_ABI}/include
+        libvpx/build/${ANDROID_ABI}/include
         emoji
         exoplayer/include
         exoplayer/libFLAC/include
diff --git a/TMessagesProj/jni/build_ffmpeg_clang.sh b/TMessagesProj/jni/build_ffmpeg_clang.sh
index febae416e..09e909efe 100755
--- a/TMessagesProj/jni/build_ffmpeg_clang.sh
+++ b/TMessagesProj/jni/build_ffmpeg_clang.sh
@@ -48,9 +48,9 @@ function build_one {
 	--enable-x86asm \
 	--cross-prefix=$CROSS_PREFIX \
 	--sysroot="${LLVM_PREFIX}/sysroot" \
-	--extra-cflags="-Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -fPIE -pie --static -fPIC" \
-	--extra-cxxflags="-Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -fPIE -pie --static -fPIC" \
-	--extra-ldflags="-Wl,-Bsymbolic -Wl,-rpath-link=$PLATFORM/usr/lib -L$PLATFORM/usr/lib -nostdlib -lc -lm -ldl -fPIC" \
+	--extra-cflags="${INCLUDES} -Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -fPIE -pie --static -fPIC" \
+	--extra-cxxflags="${INCLUDES} -Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -fPIE -pie --static -fPIC" \
+	--extra-ldflags="${LIBS} -Wl,-Bsymbolic -Wl,-rpath-link=$PLATFORM/usr/lib -L$PLATFORM/usr/lib -nostdlib -lc -lm -ldl -fPIC" \
 	\
 	--enable-version3 \
 	--enable-gpl \
@@ -181,7 +181,7 @@ function build {
 				CPU=arm64-v8a
 				OPTIMIZE_CFLAGS=
 				PREFIX=./build/$CPU
-				LIBVPXPREFIX=../libvpx/build/$CPU
+				LIBVPXPREFIX=../libvpx/build/arm64-v8a
 				ADDITIONAL_CONFIGURE_FLAG="--enable-neon --enable-optimizations"
 				build_one
 			;;
@@ -212,8 +212,8 @@ function build {
 				BIN_MIDDLE=android
 				CPU=i686
 				OPTIMIZE_CFLAGS="-march=$CPU"
-				PREFIX=./build/$ARCH
-				LIBVPXPREFIX=../libvpx/build/$ARCH_NAME
+				PREFIX=./build/x86
+				LIBVPXPREFIX=../libvpx/build/x86
 				ADDITIONAL_CONFIGURE_FLAG="--disable-x86asm --disable-inline-asm --disable-asm"
 				build_one
 			;;
diff --git a/TMessagesProj/jni/build_libvpx_clang.sh b/TMessagesProj/jni/build_libvpx_clang.sh
index 44970bc1a..704c5c3a1 100755
--- a/TMessagesProj/jni/build_libvpx_clang.sh
+++ b/TMessagesProj/jni/build_libvpx_clang.sh
@@ -124,7 +124,7 @@ function build {
 				OPTIMIZE_CFLAGS="-O3 -march=x86-64 -mtune=intel -msse4.2 -mpopcnt -m64 -fPIC"
 				TARGET="x86_64-android-gcc"
 				PREFIX=./build/$CPU
-                CPU_DETECT="--enable-runtime-cpu-detect"
+        CPU_DETECT="--enable-runtime-cpu-detect"
 				build_one
 			;;
 			x86)
@@ -136,7 +136,7 @@ function build {
 				CPU=i686
 				OPTIMIZE_CFLAGS="-O3 -march=i686 -mtune=intel -msse3 -mfpmath=sse -m32 -fPIC"
 				TARGET="x86-android-gcc"
-				PREFIX=./build/$CPU
+				PREFIX=./build/x86
 				CPU_DETECT="--enable-runtime-cpu-detect"
 				build_one
 			;;
diff --git a/TMessagesProj/jni/voip/CMakeLists.txt b/TMessagesProj/jni/voip/CMakeLists.txt
index 563ac31d1..e89b8b401 100644
--- a/TMessagesProj/jni/voip/CMakeLists.txt
+++ b/TMessagesProj/jni/voip/CMakeLists.txt
@@ -425,6 +425,7 @@ target_include_directories(tgcalls_tp PUBLIC
         third_party/libsrtp/include
         third_party/libsrtp/config
         third_party/libsrtp/crypto/include
+        libvpx/build/${ANDROID_ABI}/include
         third_party)
 
 #tgcalls+webrtc
@@ -1685,6 +1686,7 @@ target_include_directories(tgcalls PUBLIC
         third_party/usrsctplib
         third_party
         voip/libtgvoip
+        libvpx/build/${ANDROID_ABI}/include
         ffmpeg/build/${ANDROID_ABI}/include)
 
 if (${ANDROID_ABI} STREQUAL "armeabi-v7a")
diff --git a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/interface/libvpx_interface.h b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/interface/libvpx_interface.h
index f43c90ea3..903c28d48 100644
--- a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/interface/libvpx_interface.h
+++ b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/interface/libvpx_interface.h
@@ -15,10 +15,10 @@
 
 #include <memory>
 
-#include <libvpx/vp8cx.h>
-#include <libvpx/vpx_codec.h>
-#include <libvpx/vpx_encoder.h>
-#include <libvpx/vpx_image.h>
+#include <vpx/vp8cx.h>
+#include <vpx/vpx_codec.h>
+#include <vpx/vpx_encoder.h>
+#include <vpx/vpx_image.h>
 
 namespace webrtc {
 
diff --git a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
index 3c980a1d0..ecd172c0e 100644
--- a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
+++ b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
@@ -31,9 +31,9 @@
 #include "system_wrappers/include/field_trial.h"
 #include "system_wrappers/include/metrics.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
-#include <libvpx/vp8.h>
-#include <libvpx/vp8dx.h>
-#include <libvpx/vpx_decoder.h>
+#include <vpx/vp8.h>
+#include <vpx/vp8dx.h>
+#include <vpx/vpx_decoder.h>
 
 namespace webrtc {
 namespace {
diff --git a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h
index 356200d13..e25c2130f 100644
--- a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h
+++ b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h
@@ -19,8 +19,8 @@
 #include "common_video/include/video_frame_buffer_pool.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/include/video_codec_interface.h"
-#include <libvpx/vp8dx.h>
-#include <libvpx/vpx_decoder.h>
+#include <vpx/vp8dx.h>
+#include <vpx/vpx_decoder.h>
 
 namespace webrtc {
 
diff --git a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
index 72ca0ef79..826f71ea5 100644
--- a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
+++ b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
@@ -40,7 +40,7 @@
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/field_trial.h"
 #include "third_party/libyuv/include/libyuv/scale.h"
-#include <libvpx/vp8cx.h>
+#include <vpx/vp8cx.h>
 
 namespace webrtc {
 namespace {
diff --git a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
index 1a554a056..df8b32557 100644
--- a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
+++ b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
@@ -28,8 +28,8 @@
 #include "rtc_base/experiments/cpu_speed_experiment.h"
 #include "rtc_base/experiments/encoder_info_settings.h"
 #include "rtc_base/experiments/rate_control_settings.h"
-#include <libvpx/vp8cx.h>
-#include <libvpx/vpx_encoder.h>
+#include <vpx/vp8cx.h>
+#include <vpx/vpx_encoder.h>
 
 namespace webrtc {
 
diff --git a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc
index 8d26cbad9..0b6b227e6 100644
--- a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc
+++ b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc
@@ -24,8 +24,8 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
-#include <libvpx/vp8dx.h>
-#include <libvpx/vpx_decoder.h>
+#include <vpx/vp8dx.h>
+#include <vpx/vpx_decoder.h>
 
 namespace webrtc {
 namespace {
diff --git a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.h b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.h
index 0f0aecd97..4a5da0e49 100644
--- a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.h
+++ b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.h
@@ -19,7 +19,7 @@
 #include "common_video/include/video_frame_buffer_pool.h"
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
 #include "modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h"
-#include <libvpx/vp8cx.h>
+#include <vpx/vp8cx.h>
 
 namespace webrtc {
 
diff --git a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
index 65ed77468..9deeb3442 100644
--- a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
+++ b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
@@ -40,8 +40,8 @@
 #include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
-#include <libvpx/vp8cx.h>
-#include <libvpx/vpx_encoder.h>
+#include <vpx/vp8cx.h>
+#include <vpx/vpx_encoder.h>
 
 namespace webrtc {
 
diff --git a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h
index 76a862a8a..50f1ab088 100644
--- a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h
+++ b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h
@@ -29,7 +29,7 @@
 #include "modules/video_coding/svc/scalable_video_controller.h"
 #include "modules/video_coding/utility/framerate_controller.h"
 #include "rtc_base/experiments/encoder_info_settings.h"
-#include <libvpx/vp8cx.h>
+#include <vpx/vp8cx.h>
 
 namespace webrtc {
 
diff --git a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/vp9.cc b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/vp9.cc
index d37697ea9..e8557da02 100644
--- a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/vp9.cc
+++ b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/vp9.cc
@@ -18,9 +18,9 @@
 #include "modules/video_coding/codecs/vp9/libvpx_vp9_decoder.h"
 #include "modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h"
 #include "rtc_base/checks.h"
-#include <libvpx/vp8cx.h>
-#include <libvpx/vp8dx.h>
-#include <libvpx/vpx_codec.h>
+#include <vpx/vp8cx.h>
+#include <vpx/vp8dx.h>
+#include <vpx/vpx_codec.h>
 
 namespace webrtc {
 
diff --git a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc
index e23a8c8a6..a98248101 100644
--- a/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc
+++ b/TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc
@@ -15,9 +15,9 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include <libvpx/vpx_codec.h>
-#include <libvpx/vpx_decoder.h>
-#include <libvpx/vpx_frame_buffer.h>
+#include <vpx/vpx_codec.h>
+#include <vpx/vpx_decoder.h>
+#include <vpx/vpx_frame_buffer.h>
 
 namespace webrtc {