diff --git a/xls/codegen/testdata/assertions_comb_multiple_ifdef_guards.svtxt b/xls/codegen/testdata/assertions_comb_multiple_ifdef_guards.svtxt
index 1b33cfb702..73f0ba5ad3 100644
--- a/xls/codegen/testdata/assertions_comb_multiple_ifdef_guards.svtxt
+++ b/xls/codegen/testdata/assertions_comb_multiple_ifdef_guards.svtxt
@@ -17,9 +17,9 @@ module assertions_top(
   assign out = ult_XXX ? {add_XXX, y[0]} : y & {32{ult_XXX}};
   `ifdef ASSERT_ON
   `ifndef SYNTHESIS
-  __assertions__main_XXX_non_synth___assertions__main_y_ge_than_XXX: assert final ($isunknown(ult_XXX) || ult_XXX) else $fatal(0, "Assertion failure via fail! @ xls/examples/assertions/assertions.x:32:14-32:37");
-  __assertions__main_XXX_non_synth___assertions__main___assertions__main_XXX___itok__assertions__main___itok__assertions__main_XXX___itok__assertions__func_XXX__XXX_x_less_than_XXX: assert final ($isunknown(nand_XXX) || nand_XXX) else $fatal(0, "Assertion failure via assert! @ xls/examples/assertions/assertions.x:21:12-21:40");
-  __assertions__main_XXX_non_synth___assertions__main___assertions__main_XXX___itok__assertions__main___itok__assertions__main_XXX___itok__assertions__func_XXX__XXX_x_less_than_XXX: assert final ($isunknown(nand_XXX) || nand_XXX) else $fatal(0, "Assertion failure via assert! @ xls/examples/assertions/assertions.x:21:12-21:40");
+  __assertions__main_XXX_non_synth___assertions__main_y_ge_than_XXX: assert final ($isunknown(ult_XXX) || ult_XXX) else $fatal(0, "Assertion failure via fail! @ xls/examples/assertions/assertions.x:34:14-34:37");
+  __assertions__main_XXX_non_synth___assertions__main___assertions__main_XXX___itok__assertions__main___itok__assertions__main_XXX___itok__assertions__func_XXX__XXX_x_less_than_XXX: assert final ($isunknown(nand_XXX) || nand_XXX) else $fatal(0, "Assertion failure via assert! @ xls/examples/assertions/assertions.x:23:12-23:40");
+  __assertions__main_XXX_non_synth___assertions__main___assertions__main_XXX___itok__assertions__main___itok__assertions__main_XXX___itok__assertions__func_XXX__XXX_x_less_than_XXX: assert final ($isunknown(nand_XXX) || nand_XXX) else $fatal(0, "Assertion failure via assert! @ xls/examples/assertions/assertions.x:23:12-23:40");
   `endif  // SYNTHESIS
   `endif  // ASSERT_ON
 endmodule
diff --git a/xls/codegen/testdata/assertions_comb_no_ifdef_guards.svtxt b/xls/codegen/testdata/assertions_comb_no_ifdef_guards.svtxt
index 321314b413..7c284bfe72 100644
--- a/xls/codegen/testdata/assertions_comb_no_ifdef_guards.svtxt
+++ b/xls/codegen/testdata/assertions_comb_no_ifdef_guards.svtxt
@@ -15,7 +15,7 @@ module assertions_top(
   assign nand_XXX = ~(y > 32'h0000_XXX & ult_XXX & {add_XXX, y[0]} > 32'h0000_XXX);
   assign nand_XXX = ~(ult_XXX & y > 32'h0000_XXX);
   assign out = ult_XXX ? {add_XXX, y[0]} : y & {32{ult_XXX}};
-  __assertions__main_XXX_non_synth___assertions__main_y_ge_than_XXX: assert final ($isunknown(ult_XXX) || ult_XXX) else $fatal(0, "Assertion failure via fail! @ xls/examples/assertions/assertions.x:32:14-32:37");
-  __assertions__main_XXX_non_synth___assertions__main___assertions__main_XXX___itok__assertions__main___itok__assertions__main_XXX___itok__assertions__func_XXX__XXX_x_less_than_XXX: assert final ($isunknown(nand_XXX) || nand_XXX) else $fatal(0, "Assertion failure via assert! @ xls/examples/assertions/assertions.x:21:12-21:40");
-  __assertions__main_XXX_non_synth___assertions__main___assertions__main_XXX___itok__assertions__main___itok__assertions__main_XXX___itok__assertions__func_XXX__XXX_x_less_than_XXX: assert final ($isunknown(nand_XXX) || nand_XXX) else $fatal(0, "Assertion failure via assert! @ xls/examples/assertions/assertions.x:21:12-21:40");
+  __assertions__main_XXX_non_synth___assertions__main_y_ge_than_XXX: assert final ($isunknown(ult_XXX) || ult_XXX) else $fatal(0, "Assertion failure via fail! @ xls/examples/assertions/assertions.x:34:14-34:37");
+  __assertions__main_XXX_non_synth___assertions__main___assertions__main_XXX___itok__assertions__main___itok__assertions__main_XXX___itok__assertions__func_XXX__XXX_x_less_than_XXX: assert final ($isunknown(nand_XXX) || nand_XXX) else $fatal(0, "Assertion failure via assert! @ xls/examples/assertions/assertions.x:23:12-23:40");
+  __assertions__main_XXX_non_synth___assertions__main___assertions__main_XXX___itok__assertions__main___itok__assertions__main_XXX___itok__assertions__func_XXX__XXX_x_less_than_XXX: assert final ($isunknown(nand_XXX) || nand_XXX) else $fatal(0, "Assertion failure via assert! @ xls/examples/assertions/assertions.x:23:12-23:40");
 endmodule
diff --git a/xls/dslx/stdlib/round.x b/xls/dslx/stdlib/round.x
index e4480f969d..f7bdd9d4bb 100644
--- a/xls/dslx/stdlib/round.x
+++ b/xls/dslx/stdlib/round.x
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
-
 // Implements rounding for all rounding modes defined by the IEEE 754 standard.
 //
 // It handles unsigned, signed (two's complement), and sign-and-magnitude values.
diff --git a/xls/dslx/stdlib/tests/round_tests.x b/xls/dslx/stdlib/tests/round_tests.x
index c32d859ca4..5787e1ca83 100644
--- a/xls/dslx/stdlib/tests/round_tests.x
+++ b/xls/dslx/stdlib/tests/round_tests.x
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
-
 import std;
 import round;
 
@@ -273,33 +271,26 @@ fn test_round_more_fractional_bits_sign_magnitude() {
 #[test]
 fn test_round_unsigned_minimal_cases() {
     // num_bits_rounded = 0 is a no-op (early return path).
-    assert_eq(
-        (u1:0, u5:0b10101),
-        round::round_u(round::RoundingMode::RTP, u3:0, u5:0b10101));
+    assert_eq((u1:0, u5:0b10101), round::round_u(round::RoundingMode::RTP, u3:0, u5:0b10101));
 
     let num_bits_rounded = u3:2;
 
     // Real value is 2.5 (10 / 2^2). Tie between 2 and 3.
     let unrounded = u5:0b01010;
     assert_eq(
-        (u1:0, u5:0b01000),
-        round::round_u(round::RoundingMode::RNE, num_bits_rounded, unrounded));
+        (u1:0, u5:0b01000), round::round_u(round::RoundingMode::RNE, num_bits_rounded, unrounded));
     assert_eq(
-        (u1:0, u5:0b01100),
-        round::round_u(round::RoundingMode::RNA, num_bits_rounded, unrounded));
+        (u1:0, u5:0b01100), round::round_u(round::RoundingMode::RNA, num_bits_rounded, unrounded));
 
     // Real value is 2.75 (11 / 2^2). Non-tie; nearest is 3.
     let unrounded = u5:0b01011;
     assert_eq(
-        (u1:0, u5:0b01100),
-        round::round_u(round::RoundingMode::RNE, num_bits_rounded, unrounded));
+        (u1:0, u5:0b01100), round::round_u(round::RoundingMode::RNE, num_bits_rounded, unrounded));
 
     // Real value is 7.75 (31 / 2^2). RTP would round to 8.0, which overflows u5 with 2
     // fractional bits.
     let unrounded = u5:0b11111;
-    assert_eq(
-        (u1:1, u5:0),
-        round::round_u(round::RoundingMode::RTP, num_bits_rounded, unrounded));
+    assert_eq((u1:1, u5:0), round::round_u(round::RoundingMode::RTP, num_bits_rounded, unrounded));
 }
 
 #[test]
@@ -328,19 +319,13 @@ fn test_round_signed_twos_complement_negative_cases() {
     let unrounded = s5:-9;
 
     // Nearest(-2.25) = -2
-    assert_eq(
-        (u1:0, s5:-8),
-        round::round_s(round::RoundingMode::RNE, num_bits_rounded, unrounded));
+    assert_eq((u1:0, s5:-8), round::round_s(round::RoundingMode::RNE, num_bits_rounded, unrounded));
 
     // RTZ(-2.25) = -2
-    assert_eq(
-        (u1:0, s5:-8),
-        round::round_s(round::RoundingMode::RTZ, num_bits_rounded, unrounded));
+    assert_eq((u1:0, s5:-8), round::round_s(round::RoundingMode::RTZ, num_bits_rounded, unrounded));
 
     // Floor(-2.25) = -3
-    assert_eq(
-        (u1:0, s5:-12),
-        round::round_s(round::RoundingMode::RTN, num_bits_rounded, unrounded));
+    assert_eq((u1:0, s5:-12), round::round_s(round::RoundingMode::RTN, num_bits_rounded, unrounded));
 }
 
 #[test]
@@ -348,9 +333,7 @@ fn test_round_signed_twos_complement_positive_overflow_sign_change() {
     // 0.9375 = 15 / 2^4; rounding to 1.0 cannot be represented in s5 with 4 fractional bits.
     let num_bits_rounded = u3:4;
     let unrounded = s5:15;
-    assert_eq(
-        (u1:1, s5:0),
-        round::round_s(round::RoundingMode::RNE, num_bits_rounded, unrounded));
+    assert_eq((u1:1, s5:0), round::round_s(round::RoundingMode::RNE, num_bits_rounded, unrounded));
 }
 
 #[test]
@@ -360,10 +343,6 @@ fn test_round_signed_twos_complement_rounding_all_bits_negative_overflow() {
     let num_bits_rounded = u3:5;
     let unrounded = s5:-16;  // -0.5 = -16 / 2^5
 
-    assert_eq(
-        (u1:1, s5:0),
-        round::round_s(round::RoundingMode::RTN, num_bits_rounded, unrounded));
-    assert_eq(
-        (u1:1, s5:0),
-        round::round_s(round::RoundingMode::RNA, num_bits_rounded, unrounded));
+    assert_eq((u1:1, s5:0), round::round_s(round::RoundingMode::RTN, num_bits_rounded, unrounded));
+    assert_eq((u1:1, s5:0), round::round_s(round::RoundingMode::RNA, num_bits_rounded, unrounded));
 }
diff --git a/xls/dslx/tests/const_if.x b/xls/dslx/tests/const_if.x
index 869f6a7412..655ddfe3ff 100644
--- a/xls/dslx/tests/const_if.x
+++ b/xls/dslx/tests/const_if.x
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
-
 fn multiply(a: u32, b: u32) -> u32 { a * b }
 
 fn const_if_true(a: u32) -> u32 { const if true { a + u32:2 } else { multiply(a, u32:10) } }
diff --git a/xls/dslx/tests/const_match.x b/xls/dslx/tests/const_match.x
index 41a1f13fc0..5a788239f4 100644
--- a/xls/dslx/tests/const_match.x
+++ b/xls/dslx/tests/const_match.x
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
-
 fn const_match_literal_bool(a: u32, b: u32) -> u32 {
     const match false {
         true => a,
diff --git a/xls/dslx/tests/match_tuple_concat_inference.x b/xls/dslx/tests/match_tuple_concat_inference.x
index 20c4b74bbd..3d2b7e295c 100644
--- a/xls/dslx/tests/match_tuple_concat_inference.x
+++ b/xls/dslx/tests/match_tuple_concat_inference.x
@@ -1,5 +1,3 @@
-#![feature(type_inference_v2)]
-
 // Copyright 2025 The XLS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/xls/dslx/tests/parametric_impl.x b/xls/dslx/tests/parametric_impl.x
index 9e10f21128..31505b6091 100644
--- a/xls/dslx/tests/parametric_impl.x
+++ b/xls/dslx/tests/parametric_impl.x
@@ -1,5 +1,3 @@
-#![feature(type_inference_v2)]
-
 // Copyright 2025 The XLS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/xls/examples/apfloat_add_parallel/apfloat_add_parallel.x b/xls/examples/apfloat_add_parallel/apfloat_add_parallel.x
index f7e6354574..cad6bcd43d 100644
--- a/xls/examples/apfloat_add_parallel/apfloat_add_parallel.x
+++ b/xls/examples/apfloat_add_parallel/apfloat_add_parallel.x
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 // This floating point adder splits the computation into two parallel paths
 // for lower latency. Code based on papers by P.M. Seidel and G. Even:
diff --git a/xls/examples/apfloat_fmac.x b/xls/examples/apfloat_fmac.x
index 3796435e29..59c66bdda1 100644
--- a/xls/examples/apfloat_fmac.x
+++ b/xls/examples/apfloat_fmac.x
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
-
 // DSLX implementation of a fused multiply-accumulate module, calculating
 // `acc = a * b + acc`
 // This is, effectively, an FMA unit that stores its result between ticks.
diff --git a/xls/examples/assertions/assertions.x b/xls/examples/assertions/assertions.x
index a15388b559..fb0182ad42 100644
--- a/xls/examples/assertions/assertions.x
+++ b/xls/examples/assertions/assertions.x
@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
-
 // Example of assertions being used in functions.
+//
+// NOTE: Generated Verilog assertions embed line numbers from this file. If
+// lines in this file are added or deleted, update the golden files for the codegen
+// diff tests using the `*_update_golden` build targets or via `dev_tools/rebuild_golden_files.sh`.
 
 fn func_0<N: u32>(x: bits[N]) -> bits[N] {
     const_assert!(N == u32:32);
diff --git a/xls/examples/bitonic_sort.x b/xls/examples/bitonic_sort.x
index e84041a110..a27a519833 100644
--- a/xls/examples/bitonic_sort.x
+++ b/xls/examples/bitonic_sort.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2023 The XLS Authors
 //
diff --git a/xls/examples/capitalize.x b/xls/examples/capitalize.x
index 7aba69e661..a77eaaa263 100644
--- a/xls/examples/capitalize.x
+++ b/xls/examples/capitalize.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2020 The XLS Authors
 //
diff --git a/xls/examples/codegen_options/f_func.x b/xls/examples/codegen_options/f_func.x
index 3da711ba51..4786e6a9bc 100644
--- a/xls/examples/codegen_options/f_func.x
+++ b/xls/examples/codegen_options/f_func.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2024 The XLS Authors
 //
diff --git a/xls/examples/codegen_options/f_proc.x b/xls/examples/codegen_options/f_proc.x
index 74ead14834..3e0c40efcb 100644
--- a/xls/examples/codegen_options/f_proc.x
+++ b/xls/examples/codegen_options/f_proc.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2024 The XLS Authors
 //
diff --git a/xls/examples/const_if.x b/xls/examples/const_if.x
index ed73819625..35be4a82a5 100644
--- a/xls/examples/const_if.x
+++ b/xls/examples/const_if.x
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 proc Falsy {
     req_r: chan<()> in;
diff --git a/xls/examples/const_match.x b/xls/examples/const_match.x
index 5cdc7a8f38..e09a5a7ce9 100644
--- a/xls/examples/const_match.x
+++ b/xls/examples/const_match.x
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 fn const_match_literal_bool(a: u32, b: u32) -> u32 {
     const match false {
diff --git a/xls/examples/constraint.x b/xls/examples/constraint.x
index 7637025b84..a11c5d6639 100644
--- a/xls/examples/constraint.x
+++ b/xls/examples/constraint.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2022 The XLS Authors
 //
diff --git a/xls/examples/crc32/crc32.x b/xls/examples/crc32/crc32.x
index 23d3ff84fa..52586fa685 100644
--- a/xls/examples/crc32/crc32.x
+++ b/xls/examples/crc32/crc32.x
@@ -1,5 +1,3 @@
-#![feature(type_inference_v2)]
-
 // Copyright 2020 The XLS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/xls/examples/cubic_bezier.x b/xls/examples/cubic_bezier.x
index c94046987d..be9c1eef46 100644
--- a/xls/examples/cubic_bezier.x
+++ b/xls/examples/cubic_bezier.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2020 The XLS Authors
 //
diff --git a/xls/examples/custom_schedule.x b/xls/examples/custom_schedule.x
index b31972cee0..e8ab0beae5 100644
--- a/xls/examples/custom_schedule.x
+++ b/xls/examples/custom_schedule.x
@@ -1,5 +1,3 @@
-#![feature(type_inference_v2)]
-
 // Copyright 2024 The XLS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/xls/examples/delay.x b/xls/examples/delay.x
index d9b4eea99a..34daed1db9 100644
--- a/xls/examples/delay.x
+++ b/xls/examples/delay.x
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 // This file implements a parametric delay proc implemented using external RAM.
 //
diff --git a/xls/examples/delay_loopback_channel.x b/xls/examples/delay_loopback_channel.x
index 13645264bf..f380616a04 100644
--- a/xls/examples/delay_loopback_channel.x
+++ b/xls/examples/delay_loopback_channel.x
@@ -15,8 +15,6 @@
 // This implements a parametric delay proc implemented using loopback channels that are ultimately
 // generated as FIFOs.
 
-#![feature(type_inference_v2)]
-
 import std;
 
 // TODO(google/xls#889): Make top parametric when supported.
diff --git a/xls/examples/dot_product.x b/xls/examples/dot_product.x
index 44fd72ae60..80eb6e4e34 100644
--- a/xls/examples/dot_product.x
+++ b/xls/examples/dot_product.x
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 // Parameterized fixed and floating point dot product
 // implementations.
diff --git a/xls/examples/dslx_intro/crc32_one_byte.x b/xls/examples/dslx_intro/crc32_one_byte.x
index 3740db0fac..d6e8e3cbfb 100644
--- a/xls/examples/dslx_intro/crc32_one_byte.x
+++ b/xls/examples/dslx_intro/crc32_one_byte.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2020 The XLS Authors
 //
diff --git a/xls/examples/dslx_intro/crc32_one_byte_inferred.x b/xls/examples/dslx_intro/crc32_one_byte_inferred.x
index a38af19d20..22a57b38d7 100644
--- a/xls/examples/dslx_intro/crc32_one_byte_inferred.x
+++ b/xls/examples/dslx_intro/crc32_one_byte_inferred.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2020 The XLS Authors
 //
diff --git a/xls/examples/dslx_module/capitalize.x b/xls/examples/dslx_module/capitalize.x
index e74a28a360..17c6cea9ad 100644
--- a/xls/examples/dslx_module/capitalize.x
+++ b/xls/examples/dslx_module/capitalize.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2023 The XLS Authors
 //
diff --git a/xls/examples/dslx_module/some_caps.x b/xls/examples/dslx_module/some_caps.x
index adee4b5d46..5f6d1bbee8 100644
--- a/xls/examples/dslx_module/some_caps.x
+++ b/xls/examples/dslx_module/some_caps.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2023 The XLS Authors
 //
diff --git a/xls/examples/dslx_module/some_caps_streaming.x b/xls/examples/dslx_module/some_caps_streaming.x
index a0cf9c53f4..4e7f58a04b 100644
--- a/xls/examples/dslx_module/some_caps_streaming.x
+++ b/xls/examples/dslx_module/some_caps_streaming.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2023 The XLS Authors
 //
diff --git a/xls/examples/dslx_module/some_caps_streaming_configured.x b/xls/examples/dslx_module/some_caps_streaming_configured.x
index baedc82f1f..5f69e687e4 100644
--- a/xls/examples/dslx_module/some_caps_streaming_configured.x
+++ b/xls/examples/dslx_module/some_caps_streaming_configured.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2024 The XLS Authors
 //
diff --git a/xls/examples/ffi.x b/xls/examples/ffi.x
index bcda005903..61dfb5227f 100644
--- a/xls/examples/ffi.x
+++ b/xls/examples/ffi.x
@@ -1,5 +1,3 @@
-#![feature(type_inference_v2)]
-
 // Copyright 2023 The XLS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/xls/examples/find_index.x b/xls/examples/find_index.x
index be88c16540..01ac95d094 100644
--- a/xls/examples/find_index.x
+++ b/xls/examples/find_index.x
@@ -16,7 +16,6 @@
 // find_index standard library function. This will be used as a synthesis
 // flow example to determine how well the gate-level mapping is performed.
 
-#![feature(type_inference_v2)]
 
 import std;
 
diff --git a/xls/examples/fir_filter.x b/xls/examples/fir_filter.x
index fa248c5f3d..c2c3eafd20 100644
--- a/xls/examples/fir_filter.x
+++ b/xls/examples/fir_filter.x
@@ -17,7 +17,6 @@
 // processing, is essentially a convolution of a
 // filter of a series of samples.
 
-#![feature(type_inference_v2)]
 
 import float32;
 
diff --git a/xls/examples/fp32_fmac.x b/xls/examples/fp32_fmac.x
index 21f6d72db8..e8b22d7765 100644
--- a/xls/examples/fp32_fmac.x
+++ b/xls/examples/fp32_fmac.x
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 import float32;
 import xls.examples.apfloat_fmac;
diff --git a/xls/examples/gcd.x b/xls/examples/gcd.x
index 5ebfcaf6e7..c6845c182b 100644
--- a/xls/examples/gcd.x
+++ b/xls/examples/gcd.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2023 The XLS Authors
 //
diff --git a/xls/examples/jpeg/idct_chen.x b/xls/examples/jpeg/idct_chen.x
index e392ea5d50..b9d797a149 100644
--- a/xls/examples/jpeg/idct_chen.x
+++ b/xls/examples/jpeg/idct_chen.x
@@ -25,7 +25,6 @@
 // reference for comparison to other JPEG decoding solutions (e.g. ensuring
 // golden reference outputs are identical).
 
-#![feature(type_inference_v2)]
 
 const COEFF_PER_MCU = u32:64;
 const COEFF_PER_MCU_U8 = u8:64;
diff --git a/xls/examples/large_array.x b/xls/examples/large_array.x
index 18d9332af4..4608308481 100644
--- a/xls/examples/large_array.x
+++ b/xls/examples/large_array.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2022 The XLS Authors
 //
diff --git a/xls/examples/lfsr.x b/xls/examples/lfsr.x
index 9a0d4bbd9d..fb93031c58 100644
--- a/xls/examples/lfsr.x
+++ b/xls/examples/lfsr.x
@@ -1,5 +1,3 @@
-#![feature(type_inference_v2)]
-
 // Copyright 2021 The XLS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/xls/examples/lfsr_proc.x b/xls/examples/lfsr_proc.x
index 83d18adfae..933e4d9ee6 100644
--- a/xls/examples/lfsr_proc.x
+++ b/xls/examples/lfsr_proc.x
@@ -11,7 +11,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 ////////////////////////////////////////////////////////////////////////////////
 // LFSR proc
diff --git a/xls/examples/matmul_4x4/matmul_4x4.x b/xls/examples/matmul_4x4/matmul_4x4.x
index 57c197c503..6efe544a59 100644
--- a/xls/examples/matmul_4x4/matmul_4x4.x
+++ b/xls/examples/matmul_4x4/matmul_4x4.x
@@ -14,7 +14,6 @@
 
 // DSLX implementation of a 4x4 systolic array.
 
-#![feature(type_inference_v2)]
 
 import float32;
 
diff --git a/xls/examples/nested_sel.x b/xls/examples/nested_sel.x
index fa41e9ed86..c78f757448 100644
--- a/xls/examples/nested_sel.x
+++ b/xls/examples/nested_sel.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2023 The XLS Authors
 //
diff --git a/xls/examples/overflow_detect.x b/xls/examples/overflow_detect.x
index b1b7a60a3e..132757698e 100644
--- a/xls/examples/overflow_detect.x
+++ b/xls/examples/overflow_detect.x
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 import std;
 
diff --git a/xls/examples/passthrough.x b/xls/examples/passthrough.x
index f492f4ff3e..1e98a21159 100644
--- a/xls/examples/passthrough.x
+++ b/xls/examples/passthrough.x
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 #![feature(explicit_state_access)]
 #![feature(generics)]
 
diff --git a/xls/examples/prefix_sum.x b/xls/examples/prefix_sum.x
index b2799ce4a9..30b4c8b901 100644
--- a/xls/examples/prefix_sum.x
+++ b/xls/examples/prefix_sum.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2022 The XLS Authors
 //
diff --git a/xls/examples/proc_iota.x b/xls/examples/proc_iota.x
index 5529423def..8ec7174726 100644
--- a/xls/examples/proc_iota.x
+++ b/xls/examples/proc_iota.x
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 // Basic example showing how a proc network can be created and connected.
 
diff --git a/xls/examples/protobuf/varint_decode.x b/xls/examples/protobuf/varint_decode.x
index f4d26289df..71eced0dcf 100644
--- a/xls/examples/protobuf/varint_decode.x
+++ b/xls/examples/protobuf/varint_decode.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2023 The XLS Authors
 //
diff --git a/xls/examples/protobuf/varint_encode.x b/xls/examples/protobuf/varint_encode.x
index 80a84e5359..87976a6267 100644
--- a/xls/examples/protobuf/varint_encode.x
+++ b/xls/examples/protobuf/varint_encode.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2023 The XLS Authors
 //
diff --git a/xls/examples/protobuf/varint_streaming_decode.x b/xls/examples/protobuf/varint_streaming_decode.x
index b24f329bed..280d7b3968 100644
--- a/xls/examples/protobuf/varint_streaming_decode.x
+++ b/xls/examples/protobuf/varint_streaming_decode.x
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 import std;
 import xls.examples.protobuf.varint_decode;
diff --git a/xls/examples/quickcheck.x b/xls/examples/quickcheck.x
index 7dbef39d53..dc107aca05 100644
--- a/xls/examples/quickcheck.x
+++ b/xls/examples/quickcheck.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2022 The XLS Authors
 //
diff --git a/xls/examples/reorder_queue/reorder_queue.x b/xls/examples/reorder_queue/reorder_queue.x
index b780f5adfe..b3eb111909 100644
--- a/xls/examples/reorder_queue/reorder_queue.x
+++ b/xls/examples/reorder_queue/reorder_queue.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 #![feature(channel_attributes)]
 
 // Copyright 2025 The XLS Authors
diff --git a/xls/examples/serialized_decomposer.x b/xls/examples/serialized_decomposer.x
index 9915a90840..2f0098b31a 100644
--- a/xls/examples/serialized_decomposer.x
+++ b/xls/examples/serialized_decomposer.x
@@ -23,7 +23,6 @@
 // This serves as a demonstration of how we can use tokens as state to coordinate
 // across activations.
 
-#![feature(type_inference_v2)]
 
 pub proc serialized_decomposer {
   ch_in: chan<uN[128]> in;
diff --git a/xls/examples/sha256.x b/xls/examples/sha256.x
index 796e2f1cf7..dea9a6c01c 100644
--- a/xls/examples/sha256.x
+++ b/xls/examples/sha256.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2020 The XLS Authors
 //
diff --git a/xls/examples/sobel_filter.x b/xls/examples/sobel_filter.x
index 4566ddb303..337b931f2f 100644
--- a/xls/examples/sobel_filter.x
+++ b/xls/examples/sobel_filter.x
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 // Floating point sobel filter implementation (fixed-point is TODO).
 // A sobel filter, used in image and video processing, applies stencils
diff --git a/xls/examples/sobel_filter_benchmark.x b/xls/examples/sobel_filter_benchmark.x
index 92dada4c99..ea5bfee8c5 100644
--- a/xls/examples/sobel_filter_benchmark.x
+++ b/xls/examples/sobel_filter_benchmark.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2023 The XLS Authors
 //
@@ -14,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
 
 // Floating point sobel filter implementation (fixed-point is TODO).
 // A sobel filter, used in image and video processing, applies stencils
diff --git a/xls/examples/sparse_prefix_sum.x b/xls/examples/sparse_prefix_sum.x
index a71140dd13..1df22783e0 100644
--- a/xls/examples/sparse_prefix_sum.x
+++ b/xls/examples/sparse_prefix_sum.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2022 The XLS Authors
 //
diff --git a/xls/examples/tiny_adder.x b/xls/examples/tiny_adder.x
index 39ad8e59cd..ac45895f84 100644
--- a/xls/examples/tiny_adder.x
+++ b/xls/examples/tiny_adder.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2022 The XLS Authors
 //
diff --git a/xls/examples/xls_pipeline.x b/xls/examples/xls_pipeline.x
index df50765bc9..abff4736bc 100644
--- a/xls/examples/xls_pipeline.x
+++ b/xls/examples/xls_pipeline.x
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(type_inference_v2)]
-
 // This demonstrates how to emulate a pipeline in DSLX as well as
 // how stage can be modeled.
 //
diff --git a/xls/modules/zstd/zstd_dec.x b/xls/modules/zstd/zstd_dec.x
index d22927ad33..5a6eb747fd 100644
--- a/xls/modules/zstd/zstd_dec.x
+++ b/xls/modules/zstd/zstd_dec.x
@@ -1,4 +1,3 @@
-#![feature(type_inference_v2)]
 
 // Copyright 2024 The XLS Authors
 //