diff --git a/src-self-hosted/c.zig b/src-self-hosted/c.zig
index 778d851240b94a06908a693d89cc8ce1d51b2ef1..1de2b6a24c3b045f67ac0de2e3004ce6b64f36f8 100644
--- a/src-self-hosted/c.zig
+++ b/src-self-hosted/c.zig
@@ -1,4 +1,4 @@
-pub use @cImport({
+pub usingnamespace @cImport({
     @cDefine("__STDC_CONSTANT_MACROS", "");
     @cDefine("__STDC_LIMIT_MACROS", "");
     @cInclude("inttypes.h");
diff --git a/src-self-hosted/translate_c.zig b/src-self-hosted/translate_c.zig
index dac4c2b1ca0e339eef2f9238217997dfc6ac81ca..b7ced4a89f97451e38e24a9b7295515f264a72bf 100644
--- a/src-self-hosted/translate_c.zig
+++ b/src-self-hosted/translate_c.zig
@@ -6,7 +6,7 @@ const builtin = @import("builtin");
 const assert = std.debug.assert;
 const ast = std.zig.ast;
 const Token = std.zig.Token;
-use @import("clang.zig");
+usingnamespace @import("clang.zig");
 
 pub const Mode = enum {
     import,
diff --git a/std/c.zig b/std/c.zig
index 4a223cc9e26b6299124f94aaee7642da701e4f36..029b92e549c790d90802a1a3f7faa33ecf2a6502 100644
--- a/std/c.zig
+++ b/std/c.zig
@@ -2,9 +2,9 @@ const builtin = @import("builtin");
 const std = @import("std");
 const page_size = std.mem.page_size;
 
-pub use @import("os/bits.zig");
+pub usingnamespace @import("os/bits.zig");
 
-pub use switch (builtin.os) {
+pub usingnamespace switch (builtin.os) {
     .linux => @import("c/linux.zig"),
     .windows => @import("c/windows.zig"),
     .macosx, .ios, .tvos, .watchos => @import("c/darwin.zig"),
diff --git a/std/c/darwin.zig b/std/c/darwin.zig
index e45a158f68d3f5e67143e1d3e36a94d78a9a9dd6..156429e7b9fec5135a9a9d57e51c96ffaba568e2 100644
--- a/std/c/darwin.zig
+++ b/std/c/darwin.zig
@@ -3,7 +3,7 @@ const assert = std.debug.assert;
 const builtin = @import("builtin");
 const macho = std.macho;
 
-use @import("../os/bits.zig");
+usingnamespace @import("../os/bits.zig");
 
 extern "c" fn __error() *c_int;
 pub extern "c" fn _NSGetExecutablePath(buf: [*]u8, bufsize: *u32) c_int;
diff --git a/std/c/linux.zig b/std/c/linux.zig
index 9e028728c7560c97612b69067ab3757ee8b282f6..83c6bdfe5bb4cc6ad603f1e5bba1daf7b54880fd 100644
--- a/std/c/linux.zig
+++ b/std/c/linux.zig
@@ -1,5 +1,5 @@
 const std = @import("../std.zig");
-use std.c;
+usingnamespace std.c;
 
 extern "c" fn __errno_location() *c_int;
 pub const _errno = __errno_location;
diff --git a/std/math/big.zig b/std/math/big.zig
index 44b5ce675fadef3ca828ff32aae607a739e7a252..8105beb5065a742eff0f4556d54991a3315614e2 100644
--- a/std/math/big.zig
+++ b/std/math/big.zig
@@ -1,5 +1,5 @@
-pub use @import("big/int.zig");
-pub use @import("big/rational.zig");
+pub usingnamespace @import("big/int.zig");
+pub usingnamespace @import("big/rational.zig");
 
 test "math.big" {
     _ = @import("big/int.zig");
diff --git a/std/os.zig b/std/os.zig
index 6f1f0135ce9301824dbac688f2a525840f02cdc7..631cc266a80bd8856f6e388f9021760470a91edf 100644
--- a/std/os.zig
+++ b/std/os.zig
@@ -46,7 +46,7 @@ pub const system = if (builtin.link_libc) std.c else switch (builtin.os) {
     else => struct {},
 };
 
-pub use @import("os/bits.zig");
+pub usingnamespace @import("os/bits.zig");
 
 /// See also `getenv`. Populated by startup code before main().
 pub var environ: [][*]u8 = undefined;
diff --git a/std/os/bits.zig b/std/os/bits.zig
index 7b87cc6e4d98df5c0d6a1dbe03ea1cfd9f2a8f7f..f16da2487b862a633beb3b5aab29e3893c3eef4c 100644
--- a/std/os/bits.zig
+++ b/std/os/bits.zig
@@ -3,7 +3,7 @@
 
 const builtin = @import("builtin");
 
-pub use switch (builtin.os) {
+pub usingnamespace switch (builtin.os) {
     .macosx, .ios, .tvos, .watchos => @import("bits/darwin.zig"),
     .freebsd => @import("bits/freebsd.zig"),
     .linux => @import("bits/linux.zig"),
diff --git a/std/os/bits/linux.zig b/std/os/bits/linux.zig
index 6532e72362800c45c60aed530b6b77264d99549a..44e713b15f74889f2b1df1fc25e36f3212ec7b32 100644
--- a/std/os/bits/linux.zig
+++ b/std/os/bits/linux.zig
@@ -1,10 +1,10 @@
 const builtin = @import("builtin");
 const std = @import("../../std.zig");
 const maxInt = std.math.maxInt;
-use @import("../bits.zig");
+usingnamespace @import("../bits.zig");
 
-pub use @import("linux/errno.zig");
-pub use switch (builtin.arch) {
+pub usingnamespace @import("linux/errno.zig");
+pub usingnamespace switch (builtin.arch) {
     .x86_64 => @import("linux/x86_64.zig"),
     .aarch64 => @import("linux/arm64.zig"),
     else => struct {},
diff --git a/std/os/bits/windows.zig b/std/os/bits/windows.zig
index 4959249a9a76673c37700bdf99cffe2b5a9c8f4d..fc148d812ff417e6954e475993f378c3c87f4db2 100644
--- a/std/os/bits/windows.zig
+++ b/std/os/bits/windows.zig
@@ -1,6 +1,6 @@
 // The reference for these types and values is Microsoft Windows's ucrt (Universal C RunTime).
 
-use @import("../windows/bits.zig");
+usingnamespace @import("../windows/bits.zig");
 
 pub const fd_t = HANDLE;
 pub const pid_t = HANDLE;
diff --git a/std/os/darwin.zig b/std/os/darwin.zig
index d6e0a1b77cae1c58dc214bc68d30bbf33814501d..67ce9a06cff54ead18902b8f3e69611128130466 100644
--- a/std/os/darwin.zig
+++ b/std/os/darwin.zig
@@ -4,4 +4,4 @@ pub const is_the_target = switch (builtin.os) {
     .macosx, .tvos, .watchos, .ios => true,
     else => false,
 };
-pub use std.c;
+pub usingnamespace std.c;
diff --git a/std/os/freebsd.zig b/std/os/freebsd.zig
index c0f3382bd04f0430d9b37633eb299970dcc09b0d..d418ccd415b8bf97788e6128ddb56943048479ef 100644
--- a/std/os/freebsd.zig
+++ b/std/os/freebsd.zig
@@ -1,4 +1,4 @@
 const std = @import("../std.zig");
 const builtin = @import("builtin");
 pub const is_the_target = builtin.os == .freebsd;
-pub use std.c;
+pub usingnamespace std.c;
diff --git a/std/os/linux.zig b/std/os/linux.zig
index 282aa19bf13c8af05fabfba89b77aa659d2acc24..5d26446682747c85645b2724e8a1a0aaaef89e4a 100644
--- a/std/os/linux.zig
+++ b/std/os/linux.zig
@@ -14,12 +14,12 @@ const vdso = @import("linux/vdso.zig");
 const dl = @import("../dynamic_library.zig");
 
 pub const is_the_target = builtin.os == .linux;
-pub use switch (builtin.arch) {
+pub usingnamespace switch (builtin.arch) {
     .x86_64 => @import("linux/x86_64.zig"),
     .aarch64 => @import("linux/arm64.zig"),
     else => struct {},
 };
-pub use @import("bits.zig");
+pub usingnamespace @import("bits.zig");
 pub const tls = @import("linux/tls.zig");
 
 /// Set by startup code, used by `getauxval`.
diff --git a/std/os/linux/x86_64.zig b/std/os/linux/x86_64.zig
index fa866cff4c7e57ac75da1899783ce5aa77bee9cf..82eed0256b851118d967b16508596d8d172ad568 100644
--- a/std/os/linux/x86_64.zig
+++ b/std/os/linux/x86_64.zig
@@ -1,4 +1,4 @@
-use @import("../bits.zig");
+usingnamespace @import("../bits.zig");
 
 pub fn syscall0(number: usize) usize {
     return asm volatile ("syscall"
diff --git a/std/os/netbsd.zig b/std/os/netbsd.zig
index 25e72c10a829b41cbe0ae45c1785d69b951f8ab1..cd63e40f5cf4d6c4ef1c46855799b79486f29d30 100644
--- a/std/os/netbsd.zig
+++ b/std/os/netbsd.zig
@@ -1,4 +1,4 @@
 const builtin = @import("builtin");
 const std = @import("../std.zig");
 pub const is_the_target = builtin.os == .netbsd;
-pub use std.c;
+pub usingnamespace std.c;
diff --git a/std/os/wasi.zig b/std/os/wasi.zig
index adfe9e821d4ac3271717b7b2f40130dd3912bed7..57b708395c3aaf0ed869514154dc8cf9bd1580b2 100644
--- a/std/os/wasi.zig
+++ b/std/os/wasi.zig
@@ -5,7 +5,7 @@ const std = @import("std");
 const assert = std.debug.assert;
 
 pub const is_the_target = builtin.os == .wasi;
-pub use @import("bits.zig");
+pub usingnamespace @import("bits.zig");
 
 comptime {
     assert(@alignOf(i8) == 1);
diff --git a/std/os/windows.zig b/std/os/windows.zig
index 526ac1cfd6513bf38c9ea625bdc059796a5969a1..1d59004012facee6daa5118d8fc3e595b54a1795 100644
--- a/std/os/windows.zig
+++ b/std/os/windows.zig
@@ -18,7 +18,7 @@ pub const ntdll = @import("windows/ntdll.zig");
 pub const ole32 = @import("windows/ole32.zig");
 pub const shell32 = @import("windows/shell32.zig");
 
-pub use @import("windows/bits.zig");
+pub usingnamespace @import("windows/bits.zig");
 
 pub const CreateFileError = error{
     SharingViolation,
diff --git a/std/os/windows/advapi32.zig b/std/os/windows/advapi32.zig
index df3220e24c0da1b1b6482da97e25da1bd7db4c80..165a2c10a3219707424d68cfb16bbd4f59d88294 100644
--- a/std/os/windows/advapi32.zig
+++ b/std/os/windows/advapi32.zig
@@ -1,4 +1,4 @@
-use @import("bits.zig");
+usingnamespace @import("bits.zig");
 
 pub extern "advapi32" stdcallcc fn RegOpenKeyExW(
     hKey: HKEY,
diff --git a/std/os/windows/kernel32.zig b/std/os/windows/kernel32.zig
index 2bd1824620a27bf9ffabaf7acb41b1970ce57139..852369df20e50d1fb22b493be123caef2a927c07 100644
--- a/std/os/windows/kernel32.zig
+++ b/std/os/windows/kernel32.zig
@@ -1,4 +1,4 @@
-use @import("bits.zig");
+usingnamespace @import("bits.zig");
 
 pub extern "kernel32" stdcallcc fn CancelIoEx(hFile: HANDLE, lpOverlapped: LPOVERLAPPED) BOOL;
 
diff --git a/std/os/windows/ntdll.zig b/std/os/windows/ntdll.zig
index 60c03ffc07d156b34b7446b390925f4fa55bbcf1..e5469cdcf90d03d2ebb759f66adfa16325a21cee 100644
--- a/std/os/windows/ntdll.zig
+++ b/std/os/windows/ntdll.zig
@@ -1,3 +1,3 @@
-use @import("bits.zig");
+usingnamespace @import("bits.zig");
 
 pub extern "NtDll" stdcallcc fn RtlCaptureStackBackTrace(FramesToSkip: DWORD, FramesToCapture: DWORD, BackTrace: **c_void, BackTraceHash: ?*DWORD) WORD;
diff --git a/std/os/windows/ole32.zig b/std/os/windows/ole32.zig
index 80f5bebc360a9756397a93d4f38bdf833fe96914..39c12d074c0174e215a5f5a9c8f124c2837a738c 100644
--- a/std/os/windows/ole32.zig
+++ b/std/os/windows/ole32.zig
@@ -1,4 +1,4 @@
-use @import("bits.zig");
+usingnamespace @import("bits.zig");
 
 pub extern "ole32" stdcallcc fn CoTaskMemFree(pv: LPVOID) void;
 pub extern "ole32" stdcallcc fn CoUninitialize() void;
diff --git a/std/os/windows/shell32.zig b/std/os/windows/shell32.zig
index 9f24acc5c4a84c48e1d80d112b22b5e8d9317f88..c178997aad9ee6000b66ebc839f087af56e04e40 100644
--- a/std/os/windows/shell32.zig
+++ b/std/os/windows/shell32.zig
@@ -1,3 +1,3 @@
-use @import("bits.zig");
+usingnamespace @import("bits.zig");
 
 pub extern "shell32" stdcallcc fn SHGetKnownFolderPath(rfid: *const KNOWNFOLDERID, dwFlags: DWORD, hToken: ?HANDLE, ppszPath: *[*]WCHAR) HRESULT;
diff --git a/std/os/zen.zig b/std/os/zen.zig
index 8d2f9634863b0f131f98048097300ea13c4b75d0..727f55fa6d9e854279266da43b315a45bfb26a66 100644
--- a/std/os/zen.zig
+++ b/std/os/zen.zig
@@ -80,7 +80,7 @@ pub const STDOUT_FILENO = 1;
 pub const STDERR_FILENO = 2;
 
 // FIXME: let's borrow Linux's error numbers for now.
-use @import("bits/linux/errno.zig");
+usingnamespace @import("bits/linux/errno.zig");
 // Get the errno from a syscall return value, or 0 for no error.
 pub fn getErrno(r: usize) usize {
     const signed_r = @bitCast(isize, r);
diff --git a/test/stage1/behavior/alignof.zig b/test/stage1/behavior/alignof.zig
index d4d9661ead4987cae4f28d90057b749d8cbc9bb6..f923fd935577b34837d86d2d4b2d474672aab0f8 100644
--- a/test/stage1/behavior/alignof.zig
+++ b/test/stage1/behavior/alignof.zig
@@ -15,4 +15,3 @@ test "@alignOf(T) before referencing T" {
         comptime expect(@alignOf(Foo) == 4);
     }
 }
-
diff --git a/test/stage1/behavior/bugs/1076.zig b/test/stage1/behavior/bugs/1076.zig
index 9dc1d111eae88b8040563377e73c0edf32128285..550ee9703a0fdab2193e8fb1b109662d2c7dc206 100644
--- a/test/stage1/behavior/bugs/1076.zig
+++ b/test/stage1/behavior/bugs/1076.zig
@@ -13,4 +13,3 @@ fn testCastPtrOfArrayToSliceAndPtr() void {
     x[0] += 1;
     expect(mem.eql(u8, array[0..], "boeu"));
 }
-
diff --git a/test/stage1/behavior/bugs/1486.zig b/test/stage1/behavior/bugs/1486.zig
index d1bb8d7053008d1b9b249fef623d1f790feeb133..1b8e5ca4a108beb3e7594e6cb268ddfcb2b8d43c 100644
--- a/test/stage1/behavior/bugs/1486.zig
+++ b/test/stage1/behavior/bugs/1486.zig
@@ -8,4 +8,3 @@ test "constant pointer to global variable causes runtime load" {
     expect(&global == ptr);
     expect(ptr.* == 1234);
 }
-
diff --git a/test/stage1/behavior/bugs/421.zig b/test/stage1/behavior/bugs/421.zig
index e5f67f61b7fc9e97bec44e49f0045fc39beeab0f..a618876e004fa53931d3b2ff042f319ec0167b07 100644
--- a/test/stage1/behavior/bugs/421.zig
+++ b/test/stage1/behavior/bugs/421.zig
@@ -13,4 +13,3 @@ fn extractOne64(a: u128) u64 {
     const x = @bitCast([2]u64, a);
     return x[1];
 }
-
diff --git a/test/stage1/behavior/bugs/529.zig b/test/stage1/behavior/bugs/529.zig
index 08d6768f7cf3da29241c0b24fa28e675641252ec..6aeb73c3312416c9f2370b1a85dada4376bd6153 100644
--- a/test/stage1/behavior/bugs/529.zig
+++ b/test/stage1/behavior/bugs/529.zig
@@ -12,4 +12,3 @@ test "issue 529 fixed" {
     @import("529_other_file.zig").issue529(null);
     issue529(null);
 }
-
diff --git a/test/stage1/behavior/bugs/726.zig b/test/stage1/behavior/bugs/726.zig
index dd2a135b5668ab3394bbec5d7c44015f1d843212..632d3b1511cd82b4d29e70f1e00d9590e733a0a5 100644
--- a/test/stage1/behavior/bugs/726.zig
+++ b/test/stage1/behavior/bugs/726.zig
@@ -13,4 +13,3 @@ test "@ptrCast from var in empty struct to nullable" {
     var x: ?*const u8 = @ptrCast(?*const u8, &container.c);
     expect(x.?.* == 4);
 }
-
diff --git a/test/stage1/behavior/fn.zig b/test/stage1/behavior/fn.zig
index 3f78c8029018a564d1cdf37c597949ac7cd44476..86f382674c15fe468d5453d3c8ef26325fbb61ff 100644
--- a/test/stage1/behavior/fn.zig
+++ b/test/stage1/behavior/fn.zig
@@ -205,4 +205,3 @@ test "extern struct with stdcallcc fn pointer" {
     s.ptr = S.foo;
     expect(s.ptr() == 1234);
 }
-
diff --git a/test/stage1/behavior/import.zig b/test/stage1/behavior/import.zig
index 11d696f81e61d88dc0e067f19dde2d603e1575ca..aa6e9d82bae9077dc98512f4ed8e63ecd574bbca 100644
--- a/test/stage1/behavior/import.zig
+++ b/test/stage1/behavior/import.zig
@@ -12,7 +12,7 @@ test "importing the same thing gives the same import" {
 
 test "import in non-toplevel scope" {
     const S = struct {
-        use @import("import/a_namespace.zig");
+        usingnamespace @import("import/a_namespace.zig");
     };
     expectEqual(i32(1234), S.foo());
 }
diff --git a/test/stage1/behavior/popcount.zig b/test/stage1/behavior/popcount.zig
index 327bee62a1a03698151a5a5cca3e3c5813f7b9b3..044864cedee2b31345119e0d6ab46ae15214a3b1 100644
--- a/test/stage1/behavior/popcount.zig
+++ b/test/stage1/behavior/popcount.zig
@@ -41,4 +41,3 @@ fn testPopCount() void {
         expect(@popCount(i128, 0b11111111000110001100010000100001000011000011100101010001) == 24);
     }
 }
-
diff --git a/test/stage1/behavior/reflection.zig b/test/stage1/behavior/reflection.zig
index 55efc85b97175675ff9e9e67539573283e9222d9..739e0b318a2af384f324a39ff131574a8e78e3cd 100644
--- a/test/stage1/behavior/reflection.zig
+++ b/test/stage1/behavior/reflection.zig
@@ -93,4 +93,3 @@ const Bar = union(enum) {
     Three: bool,
     Four: f64,
 };
-
diff --git a/test/stage1/behavior/struct.zig b/test/stage1/behavior/struct.zig
index d7bbee5d15256743d37d9908bed09075524b7ab0..7a84fcc763c5657224c6f780974eb1398ada35b2 100644
--- a/test/stage1/behavior/struct.zig
+++ b/test/stage1/behavior/struct.zig
@@ -552,7 +552,7 @@ test "packed struct with fp fields" {
 
 test "use within struct scope" {
     const S = struct {
-        use struct {
+        usingnamespace struct {
             pub fn inner() i32 {
                 return 42;
             }
diff --git a/test/stage1/behavior/this.zig b/test/stage1/behavior/this.zig
index a0bee3a3ee5b0f07c1ea53109e6cbc8b4fa002e4..927c0808ea9e4fb2c0afe07d9da58140fa7d2ef0 100644
--- a/test/stage1/behavior/this.zig
+++ b/test/stage1/behavior/this.zig
@@ -32,4 +32,3 @@ test "this refer to container" {
     expect(pt.x == 13);
     expect(pt.y == 35);
 }
-
diff --git a/test/stage1/behavior/undefined.zig b/test/stage1/behavior/undefined.zig
index 4c233576cd44c9389ccd52b5803dc473568254a3..4f2cbed3bce55239bfcc2b3dab17f0376e0e3cfb 100644
--- a/test/stage1/behavior/undefined.zig
+++ b/test/stage1/behavior/undefined.zig
@@ -66,4 +66,3 @@ test "type name of undefined" {
     const x = undefined;
     expect(mem.eql(u8, @typeName(@typeOf(x)), "(undefined)"));
 }
-
diff --git a/test/stage1/behavior/union.zig b/test/stage1/behavior/union.zig
index b8bb9a51b87d07aad5c8dd8d9f37e61312e79e21..58a5203e8aaeb7e4f7e2c6e37b44b9c54cc049aa 100644
--- a/test/stage1/behavior/union.zig
+++ b/test/stage1/behavior/union.zig
@@ -374,7 +374,7 @@ const Attribute = union(enum) {
 fn setAttribute(attr: Attribute) void {}
 
 fn Setter(attr: Attribute) type {
-    return struct{
+    return struct {
         fn set() void {
             setAttribute(attr);
         }
diff --git a/test/stage1/behavior/widening.zig b/test/stage1/behavior/widening.zig
index f7c238ee8d9515e7109203a5ae335b16bbb49909..d79270b811c428f733220d85a67bd41012245282 100644
--- a/test/stage1/behavior/widening.zig
+++ b/test/stage1/behavior/widening.zig
@@ -25,4 +25,3 @@ test "float widening" {
     var d: f128 = c;
     expect(d == a);
 }
-
diff --git a/test/standalone/use_alias/c.zig b/test/standalone/use_alias/c.zig
index 1bc325b117337fdabc3b83c3e7173be649c230ec..2835a51615cab602363baf3d6fc85291f32128fd 100644
--- a/test/standalone/use_alias/c.zig
+++ b/test/standalone/use_alias/c.zig
@@ -1 +1 @@
-pub use @cImport(@cInclude("foo.h"));
+pub usingnamespace @cImport(@cInclude("foo.h"));