diff --git a/felix/extract-files.sh b/felix/extract-files.sh
index 8551cce..d6e2bf5 100755
--- a/felix/extract-files.sh
+++ b/felix/extract-files.sh
@@ -101,33 +101,8 @@ if [ -z "${ONLY_FIRMWARE}" ]; then
     generate_prop_list_from_image "vendor.img" "${VENDOR_TXT}" VENDOR_SKIP_FILES
 
     # flp.default & gps.default have incorrect SONAME
-    # libExynosC2*Dec & libExynosC2*Enc depend on libacryl & libexynosv4l2, which are gnu makefile targets
-    set_disable_checkelf "vendor/lib/libExynosC2H263Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H263Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H264Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H264Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2HevcDec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
     set_disable_checkelf "vendor/lib64/hw/flp.default.so" "${VENDOR_TXT}"
     set_disable_checkelf "vendor/lib64/hw/gps.default.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H263Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H263Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H264Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H264Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2HevcDec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
 
     set_module_suffix "vendor/lib/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
     set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
diff --git a/felix/proprietary-files-vendor.txt b/felix/proprietary-files-vendor.txt
index ce32886..d79cd12 100644
--- a/felix/proprietary-files-vendor.txt
+++ b/felix/proprietary-files-vendor.txt
@@ -1500,18 +1500,18 @@ vendor/lib/hw/vulkan.mali.so
 vendor/lib/lassen_dmd_constants.so
 vendor/lib/libAlgFx_HiFi3z.so
 vendor/lib/libExynosC2ComponentStore.so
-vendor/lib/libExynosC2H263Dec.so;DISABLE_CHECKELF
-vendor/lib/libExynosC2H263Enc.so;DISABLE_CHECKELF
-vendor/lib/libExynosC2H264Dec.so;DISABLE_CHECKELF
-vendor/lib/libExynosC2H264Enc.so;DISABLE_CHECKELF
-vendor/lib/libExynosC2HevcDec.so;DISABLE_CHECKELF
-vendor/lib/libExynosC2HevcEnc.so;DISABLE_CHECKELF
-vendor/lib/libExynosC2Mpeg4Dec.so;DISABLE_CHECKELF
-vendor/lib/libExynosC2Mpeg4Enc.so;DISABLE_CHECKELF
-vendor/lib/libExynosC2Vp8Dec.so;DISABLE_CHECKELF
-vendor/lib/libExynosC2Vp8Enc.so;DISABLE_CHECKELF
-vendor/lib/libExynosC2Vp9Dec.so;DISABLE_CHECKELF
-vendor/lib/libExynosC2Vp9Enc.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2H263Dec.so
+vendor/lib/libExynosC2H263Enc.so
+vendor/lib/libExynosC2H264Dec.so
+vendor/lib/libExynosC2H264Enc.so
+vendor/lib/libExynosC2HevcDec.so
+vendor/lib/libExynosC2HevcEnc.so
+vendor/lib/libExynosC2Mpeg4Dec.so
+vendor/lib/libExynosC2Mpeg4Enc.so
+vendor/lib/libExynosC2Vp8Dec.so
+vendor/lib/libExynosC2Vp8Enc.so
+vendor/lib/libExynosC2Vp9Dec.so
+vendor/lib/libExynosC2Vp9Enc.so
 vendor/lib/libOpenCL-pixel.so
 vendor/lib/libOpenCL.so
 vendor/lib/lib_aion_buffer.so
@@ -1617,18 +1617,18 @@ vendor/lib64/hw/vulkan.mali.so
 vendor/lib64/lassen_dmd_constants.so
 vendor/lib64/libAlgFx_HiFi3z.so
 vendor/lib64/libExynosC2ComponentStore.so
-vendor/lib64/libExynosC2H263Dec.so;DISABLE_CHECKELF
-vendor/lib64/libExynosC2H263Enc.so;DISABLE_CHECKELF
-vendor/lib64/libExynosC2H264Dec.so;DISABLE_CHECKELF
-vendor/lib64/libExynosC2H264Enc.so;DISABLE_CHECKELF
-vendor/lib64/libExynosC2HevcDec.so;DISABLE_CHECKELF
-vendor/lib64/libExynosC2HevcEnc.so;DISABLE_CHECKELF
-vendor/lib64/libExynosC2Mpeg4Dec.so;DISABLE_CHECKELF
-vendor/lib64/libExynosC2Mpeg4Enc.so;DISABLE_CHECKELF
-vendor/lib64/libExynosC2Vp8Dec.so;DISABLE_CHECKELF
-vendor/lib64/libExynosC2Vp8Enc.so;DISABLE_CHECKELF
-vendor/lib64/libExynosC2Vp9Dec.so;DISABLE_CHECKELF
-vendor/lib64/libExynosC2Vp9Enc.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2H263Dec.so
+vendor/lib64/libExynosC2H263Enc.so
+vendor/lib64/libExynosC2H264Dec.so
+vendor/lib64/libExynosC2H264Enc.so
+vendor/lib64/libExynosC2HevcDec.so
+vendor/lib64/libExynosC2HevcEnc.so
+vendor/lib64/libExynosC2Mpeg4Dec.so
+vendor/lib64/libExynosC2Mpeg4Enc.so
+vendor/lib64/libExynosC2Vp8Dec.so
+vendor/lib64/libExynosC2Vp8Enc.so
+vendor/lib64/libExynosC2Vp9Dec.so
+vendor/lib64/libExynosC2Vp9Enc.so
 vendor/lib64/libOpenCL-pixel.so
 vendor/lib64/libOpenCL.so
 vendor/lib64/lib_aion_buffer.so
diff --git a/felix/setup-makefiles.sh b/felix/setup-makefiles.sh
index 21530ee..38bc74d 100755
--- a/felix/setup-makefiles.sh
+++ b/felix/setup-makefiles.sh
@@ -50,8 +50,6 @@ function lib_to_package_fixup_vendor_variants() {
         libprotobuf-cpp-lite-21.12)
             echo "libprotobuf-cpp-lite"
             ;;
-        libacryl | \
-            libexynosv4l2) ;;
         *)
             return 1
             ;;