diff --git a/extract-files.py b/extract-files.py
index a25394e..5a5143f 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -10,11 +10,8 @@
 )
 from extract_utils.fixups_lib import (
     lib_fixup_remove,
-    lib_fixup_remove_arch_suffix,
-    lib_fixup_vendorcompat,
+    lib_fixups,
     lib_fixups_user_type,
-    libs_clang_rt_ubsan,
-    libs_proto_3_9_1,
 )
 from extract_utils.main import (
     ExtractUtils,
@@ -37,8 +34,7 @@
 
 
 lib_fixups: lib_fixups_user_type = {
-    libs_clang_rt_ubsan: lib_fixup_remove_arch_suffix,
-    libs_proto_3_9_1: lib_fixup_vendorcompat,
+    **lib_fixups,
     (
         'com.qualcomm.qti.dpm.api@1.0',
         'libmmosal',