diff --git a/lib/std/special/compiler_rt.zig b/lib/std/special/compiler_rt.zig
index dcbdebec739e00cb5a5481e52e40ae8ef2c34afb..69e099ae57178440fc3ca3c96caeefe316fd513b 100644
--- a/lib/std/special/compiler_rt.zig
+++ b/lib/std/special/compiler_rt.zig
@@ -595,9 +595,9 @@ comptime {
     @export(__muloti4, .{ .name = "__muloti4", .linkage = linkage });
     const __mulodi4 = @import("compiler_rt/mulodi4.zig").__mulodi4;
     @export(__mulodi4, .{ .name = "__mulodi4", .linkage = linkage });
-}
 
-pub usingnamespace @import("compiler_rt/atomics.zig");
+    _ = @import("compiler_rt/atomics.zig");
+}
 
 // Avoid dragging in the runtime safety mechanisms into this .o file,
 // unless we're trying to test this file.
diff --git a/lib/std/target/aarch64.zig b/lib/std/target/aarch64.zig
index a331d8a874d8b84fbdf4b1ae5d83121ade3774ed..1073cf1cdbd988861f7eec5acada1db7969fdc1d 100644
--- a/lib/std/target/aarch64.zig
+++ b/lib/std/target/aarch64.zig
@@ -171,7 +171,10 @@ pub const Feature = enum {
     zcz_gp,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     @setEvalBranchQuota(2000);
diff --git a/lib/std/target/amdgpu.zig b/lib/std/target/amdgpu.zig
index 6e36a34a5a626ad23965074c3c6abb6d5791e7f1..f8002071be1e7ca4551cc434595fb168527185e9 100644
--- a/lib/std/target/amdgpu.zig
+++ b/lib/std/target/amdgpu.zig
@@ -120,7 +120,10 @@ pub const Feature = enum {
     xnack_support,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/arm.zig b/lib/std/target/arm.zig
index ecd08f28615f75305b493c86cc3c985995cca1b9..394ba05638189110128227ecf19fc58d1357fccf 100644
--- a/lib/std/target/arm.zig
+++ b/lib/std/target/arm.zig
@@ -179,7 +179,10 @@ pub const Feature = enum {
     zcz,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     @setEvalBranchQuota(10000);
diff --git a/lib/std/target/avr.zig b/lib/std/target/avr.zig
index 079d30cf920816b3c9a1f9a39f2e3117aa2929a9..f30a8a788c5531d9b3634acc8d19ca77ee7afea2 100644
--- a/lib/std/target/avr.zig
+++ b/lib/std/target/avr.zig
@@ -41,7 +41,10 @@ pub const Feature = enum {
     xmegau,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/bpf.zig b/lib/std/target/bpf.zig
index 3d3032689d52a74314248592bd0bf4a8cf88e923..a8c7a81a3bf98adea2d45a913db25491185f73fd 100644
--- a/lib/std/target/bpf.zig
+++ b/lib/std/target/bpf.zig
@@ -10,7 +10,10 @@ pub const Feature = enum {
     dwarfris,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/hexagon.zig b/lib/std/target/hexagon.zig
index aa8d8f6efd0ea39044954e61ccf9b942a46d9fd7..a9922e2866ea881b273e71d70262771f258b49bf 100644
--- a/lib/std/target/hexagon.zig
+++ b/lib/std/target/hexagon.zig
@@ -38,7 +38,10 @@ pub const Feature = enum {
     zreg,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/mips.zig b/lib/std/target/mips.zig
index c88d2ec8fb060209c66e3fe0e429589cef45414a..881a46694b34fb53c87cc625fb148e5ce7874163 100644
--- a/lib/std/target/mips.zig
+++ b/lib/std/target/mips.zig
@@ -59,7 +59,10 @@ pub const Feature = enum {
     xgot,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/msp430.zig b/lib/std/target/msp430.zig
index be59b09706736ca1a8d937e9e2119aa5c38dda36..6e8aac29b9384c395bd39603c30687454554407f 100644
--- a/lib/std/target/msp430.zig
+++ b/lib/std/target/msp430.zig
@@ -11,7 +11,10 @@ pub const Feature = enum {
     hwmultf5,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/nvptx.zig b/lib/std/target/nvptx.zig
index 6b9b9bf777bf77daddfa90af7971ab8723439c8f..d4eb0f4e3f9d20005b2820af4e98bfe004e36934 100644
--- a/lib/std/target/nvptx.zig
+++ b/lib/std/target/nvptx.zig
@@ -35,7 +35,10 @@ pub const Feature = enum {
     sm_80,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/powerpc.zig b/lib/std/target/powerpc.zig
index db4d5dccdc7b3cfdb71190ea6ed1a78be5481b42..6fc05a2379456015b68ac46d82281eb8de86aa57 100644
--- a/lib/std/target/powerpc.zig
+++ b/lib/std/target/powerpc.zig
@@ -72,7 +72,10 @@ pub const Feature = enum {
     vsx,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/riscv.zig b/lib/std/target/riscv.zig
index 5b19a936cfab290d1caa0eb095d49aeac758d268..28c6bdc366a11489660510df1599c446dc219083 100644
--- a/lib/std/target/riscv.zig
+++ b/lib/std/target/riscv.zig
@@ -64,7 +64,10 @@ pub const Feature = enum {
     save_restore,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/sparc.zig b/lib/std/target/sparc.zig
index 5423739be6f29194c76b288d5972c936bca99f16..1c1d5082cc9d126d291a08c3f483016e6bd70894 100644
--- a/lib/std/target/sparc.zig
+++ b/lib/std/target/sparc.zig
@@ -26,7 +26,10 @@ pub const Feature = enum {
     vis3,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/spirv.zig b/lib/std/target/spirv.zig
index 7d2dc7fd6db6199f44ab30b41df2d36b8c80a258..84b92a764ce2db72eaa0fdd0aca25e119817a47f 100644
--- a/lib/std/target/spirv.zig
+++ b/lib/std/target/spirv.zig
@@ -294,7 +294,10 @@ pub const Feature = enum {
     LongConstantCompositeINTEL,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     @setEvalBranchQuota(2000);
diff --git a/lib/std/target/systemz.zig b/lib/std/target/systemz.zig
index 65c53984ebe9d20f113b5dde7287edd33cf4a4b9..566a6de33347dfaf5e02bfc7fe83ccf079aa827b 100644
--- a/lib/std/target/systemz.zig
+++ b/lib/std/target/systemz.zig
@@ -43,7 +43,10 @@ pub const Feature = enum {
     vector_packed_decimal_enhancement,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/ve.zig b/lib/std/target/ve.zig
index ff3eea698d23d7dc49cc9795b0860881836e9c0c..f77c07883d110183d9fa4c977471d8e24a919477 100644
--- a/lib/std/target/ve.zig
+++ b/lib/std/target/ve.zig
@@ -8,7 +8,10 @@ pub const Feature = enum {
     vpu,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/wasm.zig b/lib/std/target/wasm.zig
index 4714125f30ffb03fb6a0401c757a3142f709b44e..ac14ac318b22ccbc7772ba5d9963202a5c5fb6b3 100644
--- a/lib/std/target/wasm.zig
+++ b/lib/std/target/wasm.zig
@@ -18,7 +18,10 @@ pub const Feature = enum {
     unimplemented_simd128,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
diff --git a/lib/std/target/x86.zig b/lib/std/target/x86.zig
index 0ca087ab0ccd14b9060e911592af6457615502d4..5c57831bd5b7a2994a4342a43ff302041f533f58 100644
--- a/lib/std/target/x86.zig
+++ b/lib/std/target/x86.zig
@@ -147,7 +147,10 @@ pub const Feature = enum {
     xsaves,
 };
 
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
@@ -2240,8 +2243,8 @@ pub const cpu = struct {
         .features = featureSet(&[_]Feature{
             .cx8,
             .slow_unaligned_mem_16,
-            .vzeroupper,
             .soft_float,
+            .vzeroupper,
         }),
     };
     pub const nehalem = CpuModel{
diff --git a/tools/update_cpu_features.zig b/tools/update_cpu_features.zig
index bdc82fa22e7baf283f38163b0fdab41f83431458..e01cd62ed913c1158d7e4769b9bd6f7f31bed109 100644
--- a/tools/update_cpu_features.zig
+++ b/tools/update_cpu_features.zig
@@ -1066,7 +1066,10 @@ fn processOneTarget(job: Job) anyerror!void {
     try w.writeAll(
         \\};
         \\
-        \\pub usingnamespace CpuFeature.feature_set_fns(Feature);
+        \\pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+        \\pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+        \\pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+        \\pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
         \\
         \\pub const all_features = blk: {
         \\