diff --git a/extract-files.py b/extract-files.py
index 668b1f4..3d2e2fc 100644
--- a/extract-files.py
+++ b/extract-files.py
@@ -10,13 +10,8 @@ from extract_utils.fixups_blob import (
 )
 from extract_utils.fixups_lib import (
     lib_fixup_remove,
-    lib_fixup_remove_arch_suffix,
-    lib_fixup_remove_proto_version_suffix,
-    lib_fixup_vendorcompat,
+    lib_fixups,
     lib_fixups_user_type,
-    libs_clang_rt_ubsan,
-    libs_proto_3_9_1,
-    libs_proto_21_12,
 )
 from extract_utils.main import (
     ExtractUtils,
@@ -39,9 +34,7 @@ def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs):
 
 
 lib_fixups: lib_fixups_user_type = {
-    libs_clang_rt_ubsan: lib_fixup_remove_arch_suffix,
-    libs_proto_3_9_1: lib_fixup_vendorcompat,
-    libs_proto_21_12: lib_fixup_remove_proto_version_suffix,
+    **lib_fixups,
     (
         'vendor.qti.hardware.dpmservice@1.0',
         'vendor.qti.hardware.dpmservice@1.1',