diff --git a/extract-files.py b/extract-files.py
index 49bd54b..0953b6e 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -13,13 +13,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,
@@ -35,9 +30,7 @@ namespace_imports = [
 ]
 
 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,
     (
         'libagmclient',
         'libagmmixer',