diff --git a/src/cmd/5g/cgen.go b/src/cmd/5g/cgen.go
index d9c8277..a6cc54d 100644
--- a/src/cmd/5g/cgen.go
+++ b/src/cmd/5g/cgen.go
@@ -5,11 +5,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/arm"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 /*
  * peep.c
diff --git a/src/cmd/5g/cgen64.go b/src/cmd/5g/cgen64.go
index 9a3e8ab..8c2f360 100644
--- a/src/cmd/5g/cgen64.go
+++ b/src/cmd/5g/cgen64.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/arm"
 )
-import "cmd/internal/gc"
 
 /*
  * attempt to generate 64-bit
diff --git a/src/cmd/5g/galign.go b/src/cmd/5g/galign.go
index d2eeeab..4b8b82c 100644
--- a/src/cmd/5g/galign.go
+++ b/src/cmd/5g/galign.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/arm"
 )
-import "cmd/internal/gc"
 
 var thechar int = '5'
 
diff --git a/src/cmd/5g/ggen.go b/src/cmd/5g/ggen.go
index 58b0c36..cb8485d 100644
--- a/src/cmd/5g/ggen.go
+++ b/src/cmd/5g/ggen.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/arm"
 )
-import "cmd/internal/gc"
 
 func defframe(ptxt *obj.Prog) {
 	var n *gc.Node
diff --git a/src/cmd/5g/gsubr.go b/src/cmd/5g/gsubr.go
index f2ba6e2..36c1280 100644
--- a/src/cmd/5g/gsubr.go
+++ b/src/cmd/5g/gsubr.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/arm"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 5l for all GOOS.
diff --git a/src/cmd/5g/peep.go b/src/cmd/5g/peep.go
index 0c304f8..4fd2225 100644
--- a/src/cmd/5g/peep.go
+++ b/src/cmd/5g/peep.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/arm"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 var gactive uint32
 
diff --git a/src/cmd/5g/prog.go b/src/cmd/5g/prog.go
index 8135b8c..9deff07 100644
--- a/src/cmd/5g/prog.go
+++ b/src/cmd/5g/prog.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/arm"
 )
-import "cmd/internal/gc"
 
 const (
 	RightRdwr = gc.RightRead | gc.RightWrite
diff --git a/src/cmd/5l/asm.go b/src/cmd/5l/asm.go
index 0cebb6b..3f9b7ad 100644
--- a/src/cmd/5l/asm.go
+++ b/src/cmd/5l/asm.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/ld"
 	"cmd/internal/obj"
 	"fmt"
 	"log"
 )
-import "cmd/internal/ld"
 
 func needlib(name string) int {
 	if name[0] == '\x00' {
diff --git a/src/cmd/5l/obj.go b/src/cmd/5l/obj.go
index 7eb3b0e..49ce107 100644
--- a/src/cmd/5l/obj.go
+++ b/src/cmd/5l/obj.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/ld"
 	"cmd/internal/obj"
 	"fmt"
 	"log"
 )
-import "cmd/internal/ld"
 
 // Reading object files.
 
diff --git a/src/cmd/6g/cgen.go b/src/cmd/6g/cgen.go
index 0b0d6b3..fba794a 100644
--- a/src/cmd/6g/cgen.go
+++ b/src/cmd/6g/cgen.go
@@ -5,11 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/x86"
 	"fmt"
-
-	"cmd/internal/gc"
 )
 
 /*
diff --git a/src/cmd/6g/galign.go b/src/cmd/6g/galign.go
index bdd8a3c..6a2bac8 100644
--- a/src/cmd/6g/galign.go
+++ b/src/cmd/6g/galign.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/x86"
 )
-import "cmd/internal/gc"
 
 var thechar int = '6'
 
diff --git a/src/cmd/6g/ggen.go b/src/cmd/6g/ggen.go
index 45242b3..3e74ce3 100644
--- a/src/cmd/6g/ggen.go
+++ b/src/cmd/6g/ggen.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/x86"
 )
-import "cmd/internal/gc"
 
 func defframe(ptxt *obj.Prog) {
 	var n *gc.Node
diff --git a/src/cmd/6g/gsubr.go b/src/cmd/6g/gsubr.go
index 719a1fe..9df1d09 100644
--- a/src/cmd/6g/gsubr.go
+++ b/src/cmd/6g/gsubr.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/x86"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 6l for all GOOS.
diff --git a/src/cmd/6g/peep.go b/src/cmd/6g/peep.go
index a967bba..11779de 100644
--- a/src/cmd/6g/peep.go
+++ b/src/cmd/6g/peep.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/x86"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 var gactive uint32
 
diff --git a/src/cmd/6g/prog.go b/src/cmd/6g/prog.go
index a1895a7..0bc703f 100644
--- a/src/cmd/6g/prog.go
+++ b/src/cmd/6g/prog.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/x86"
 )
-import "cmd/internal/gc"
 
 var (
 	AX               = RtoB(x86.REG_AX)
diff --git a/src/cmd/6g/reg.go b/src/cmd/6g/reg.go
index 3c5a699..0f32df5 100644
--- a/src/cmd/6g/reg.go
+++ b/src/cmd/6g/reg.go
@@ -31,10 +31,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/x86"
 )
-import "cmd/internal/gc"
 
 const (
 	NREGVAR = 32
diff --git a/src/cmd/6l/asm.go b/src/cmd/6l/asm.go
index bc95d81..828aafc 100644
--- a/src/cmd/6l/asm.go
+++ b/src/cmd/6l/asm.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/ld"
 	"cmd/internal/obj"
 	"fmt"
 	"log"
 )
-import "cmd/internal/ld"
 
 func PADDR(x uint32) uint32 {
 	return x &^ 0x80000000
diff --git a/src/cmd/6l/obj.go b/src/cmd/6l/obj.go
index a34e30d..e8c93c9 100644
--- a/src/cmd/6l/obj.go
+++ b/src/cmd/6l/obj.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/ld"
 	"cmd/internal/obj"
 	"fmt"
 	"log"
 )
-import "cmd/internal/ld"
 
 // Reading object files.
 
diff --git a/src/cmd/8g/cgen.go b/src/cmd/8g/cgen.go
index ec8532d..6e6a281 100644
--- a/src/cmd/8g/cgen.go
+++ b/src/cmd/8g/cgen.go
@@ -5,11 +5,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/i386"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 /*
  * reg.c
diff --git a/src/cmd/8g/cgen64.go b/src/cmd/8g/cgen64.go
index 5235270..1d1ad91 100644
--- a/src/cmd/8g/cgen64.go
+++ b/src/cmd/8g/cgen64.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/i386"
 )
-import "cmd/internal/gc"
 
 /*
  * attempt to generate 64-bit
diff --git a/src/cmd/8g/galign.go b/src/cmd/8g/galign.go
index 45ef130..86024a8 100644
--- a/src/cmd/8g/galign.go
+++ b/src/cmd/8g/galign.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/i386"
 )
-import "cmd/internal/gc"
 
 var thechar int = '8'
 
diff --git a/src/cmd/8g/ggen.go b/src/cmd/8g/ggen.go
index 1cc9a2b..eb5eae2 100644
--- a/src/cmd/8g/ggen.go
+++ b/src/cmd/8g/ggen.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/i386"
 )
-import "cmd/internal/gc"
 
 func defframe(ptxt *obj.Prog) {
 	var n *gc.Node
diff --git a/src/cmd/8g/gsubr.go b/src/cmd/8g/gsubr.go
index 95ec01a..e3a8e7f 100644
--- a/src/cmd/8g/gsubr.go
+++ b/src/cmd/8g/gsubr.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/i386"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 8l for all GOOS.
diff --git a/src/cmd/8g/peep.go b/src/cmd/8g/peep.go
index abb89fd..51e0d2e 100644
--- a/src/cmd/8g/peep.go
+++ b/src/cmd/8g/peep.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/i386"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 const (
 	REGEXT      = 0
diff --git a/src/cmd/8g/prog.go b/src/cmd/8g/prog.go
index f5c4ab6..4a14b01 100644
--- a/src/cmd/8g/prog.go
+++ b/src/cmd/8g/prog.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/i386"
 )
-import "cmd/internal/gc"
 
 var (
 	AX               = RtoB(i386.REG_AX)
diff --git a/src/cmd/8l/asm.go b/src/cmd/8l/asm.go
index d040c03..b580ad5 100644
--- a/src/cmd/8l/asm.go
+++ b/src/cmd/8l/asm.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/ld"
 	"cmd/internal/obj"
 	"fmt"
 	"log"
 )
-import "cmd/internal/ld"
 
 func needlib(name string) int {
 	if name[0] == '\x00' {
diff --git a/src/cmd/8l/obj.go b/src/cmd/8l/obj.go
index 5d44721..01a278c 100644
--- a/src/cmd/8l/obj.go
+++ b/src/cmd/8l/obj.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/ld"
 	"cmd/internal/obj"
 	"fmt"
 	"log"
 )
-import "cmd/internal/ld"
 
 // Reading object files.
 
diff --git a/src/cmd/9g/cgen.go b/src/cmd/9g/cgen.go
index 424825b..4ab5215 100644
--- a/src/cmd/9g/cgen.go
+++ b/src/cmd/9g/cgen.go
@@ -5,11 +5,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/ppc64"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 /*
  * peep.c
diff --git a/src/cmd/9g/galign.go b/src/cmd/9g/galign.go
index 99425c3..b39149a 100644
--- a/src/cmd/9g/galign.go
+++ b/src/cmd/9g/galign.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/ppc64"
 )
-import "cmd/internal/gc"
 
 var thechar int = '9'
 
diff --git a/src/cmd/9g/ggen.go b/src/cmd/9g/ggen.go
index d9bcfb7..3cca4a5 100644
--- a/src/cmd/9g/ggen.go
+++ b/src/cmd/9g/ggen.go
@@ -5,11 +5,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/ppc64"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 func defframe(ptxt *obj.Prog) {
 	var n *gc.Node
diff --git a/src/cmd/9g/gsubr.go b/src/cmd/9g/gsubr.go
index 1f1a43e..5db301a 100644
--- a/src/cmd/9g/gsubr.go
+++ b/src/cmd/9g/gsubr.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/ppc64"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 6l for all GOOS.
diff --git a/src/cmd/9g/peep.go b/src/cmd/9g/peep.go
index 03581b1..af2e68c 100644
--- a/src/cmd/9g/peep.go
+++ b/src/cmd/9g/peep.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/ppc64"
 	"fmt"
 )
-import "cmd/internal/gc"
 
 var gactive uint32
 
diff --git a/src/cmd/9g/prog.go b/src/cmd/9g/prog.go
index 24de65f..d5d5346 100644
--- a/src/cmd/9g/prog.go
+++ b/src/cmd/9g/prog.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+	"cmd/internal/gc"
 	"cmd/internal/obj"
 	"cmd/internal/obj/ppc64"
 )
-import "cmd/internal/gc"
 
 const (
 	LeftRdwr  uint32 = gc.LeftRead | gc.LeftWrite
diff --git a/src/cmd/9l/asm.go b/src/cmd/9l/asm.go
index f0f5b56..2b6cdad 100644
--- a/src/cmd/9l/asm.go
+++ b/src/cmd/9l/asm.go
@@ -31,12 +31,12 @@
 package main
 
 import (
+	"cmd/internal/ld"
 	"cmd/internal/obj"
 	"encoding/binary"
 	"fmt"
 	"log"
 )
-import "cmd/internal/ld"
 
 func needlib(name string) int {
 	if name[0] == '\x00' {
diff --git a/src/cmd/9l/obj.go b/src/cmd/9l/obj.go
index 8bba6be..29b384a 100644
--- a/src/cmd/9l/obj.go
+++ b/src/cmd/9l/obj.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+	"cmd/internal/ld"
 	"cmd/internal/obj"
 	"fmt"
 	"log"
 )
-import "cmd/internal/ld"
 
 // Reading object files.