diff --git a/plan9/race.go b/plan9/race.go
index c7344aa9..c7ff5df2 100644
--- a/plan9/race.go
+++ b/plan9/race.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build race
+// +build plan9,race
 
 package plan9
 
diff --git a/plan9/race0.go b/plan9/race0.go
index 49cfb806..06cabcc7 100644
--- a/plan9/race0.go
+++ b/plan9/race0.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !race
+// +build plan9,!race
 
 package plan9
 
diff --git a/plan9/str.go b/plan9/str.go
index 93a1777f..4f7f9ad7 100644
--- a/plan9/str.go
+++ b/plan9/str.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build plan9
+
 package plan9
 
 func itoa(val int) string { // do it here rather than with fmt to avoid dependency
diff --git a/plan9/syscall.go b/plan9/syscall.go
index 22a65885..18a63077 100644
--- a/plan9/syscall.go
+++ b/plan9/syscall.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build plan9
+
 // Package plan9 contains an interface to the low-level operating system
 // primitives.  OS details vary depending on the underlying system, and
 // by default, godoc will display the OS-specific documentation for the current
diff --git a/plan9/syscall_test.go b/plan9/syscall_test.go
index 1e7acb97..9b8c7dae 100644
--- a/plan9/syscall_test.go
+++ b/plan9/syscall_test.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build plan9
+
 package plan9_test
 
 import (
diff --git a/unix/creds_test.go b/unix/creds_test.go
index 90e30807..78b3dbd4 100644
--- a/unix/creds_test.go
+++ b/unix/creds_test.go
@@ -11,7 +11,8 @@ import (
 	"net"
 	"os"
 	"testing"
-	"unix"
+
+	"code.google.com/p/go.sys/unix"
 )
 
 // TestSCMCredentials tests the sending and receiving of credentials
diff --git a/unix/flock.go b/unix/flock.go
index 5ba9c7dd..ce67a595 100644
--- a/unix/flock.go
+++ b/unix/flock.go
@@ -4,6 +4,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build darwin dragonfly freebsd linux netbsd openbsd
+
 package unix
 
 import "unsafe"
diff --git a/unix/mksyscall_solaris.pl b/unix/mksyscall_solaris.pl
index f05c3de4..1f9f30ec 100755
--- a/unix/mksyscall_solaris.pl
+++ b/unix/mksyscall_solaris.pl
@@ -264,7 +264,7 @@ package $package
 import "unsafe"
 EOF
 
-print "import \"unix\"\n" if $package ne "unix";
+print "import \"code.google.com/p/go.sys/unix\"\n" if $package ne "unix";
 
 print <<EOF;
 
diff --git a/unix/mmap_unix_test.go b/unix/mmap_unix_test.go
index fa808aab..5dfa75dd 100644
--- a/unix/mmap_unix_test.go
+++ b/unix/mmap_unix_test.go
@@ -8,7 +8,8 @@ package unix_test
 
 import (
 	"testing"
-	"unix"
+
+	"code.google.com/p/go.sys/unix"
 )
 
 func TestMmap(t *testing.T) {
diff --git a/unix/race.go b/unix/race.go
index ba94fa90..be324338 100644
--- a/unix/race.go
+++ b/unix/race.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build race
+// +build darwin,race dragonfly,race freebsd,race linux,race netbsd,race openbsd,race
 
 package unix
 
diff --git a/unix/race0.go b/unix/race0.go
index ab7f2d39..9ded70a4 100644
--- a/unix/race0.go
+++ b/unix/race0.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !race
+// +build darwin,!race dragonfly,!race freebsd,!race linux,!race netbsd,!race openbsd,!race
 
 package unix
 
diff --git a/unix/str.go b/unix/str.go
index e05c8e53..9dc86d15 100644
--- a/unix/str.go
+++ b/unix/str.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build darwin dragonfly freebsd linux netbsd openbsd
+
 package unix
 
 func itoa(val int) string { // do it here rather than with fmt to avoid dependency
diff --git a/unix/syscall.go b/unix/syscall.go
index 4472ad81..7ba44756 100644
--- a/unix/syscall.go
+++ b/unix/syscall.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build darwin dragonfly freebsd linux netbsd openbsd
+
 // Package unix contains an interface to the low-level operating system
 // primitives.  OS details vary depending on the underlying system, and
 // by default, godoc will display OS-specific documentation for the current
diff --git a/unix/syscall_bsd_test.go b/unix/syscall_bsd_test.go
index a9d3bb08..9c081d7f 100644
--- a/unix/syscall_bsd_test.go
+++ b/unix/syscall_bsd_test.go
@@ -8,7 +8,8 @@ package unix_test
 
 import (
 	"testing"
-	"unix"
+
+	"code.google.com/p/go.sys/unix"
 )
 
 const MNT_WAIT = 1
diff --git a/unix/syscall_test.go b/unix/syscall_test.go
index 89731728..e5bab901 100644
--- a/unix/syscall_test.go
+++ b/unix/syscall_test.go
@@ -2,11 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build darwin dragonfly freebsd linux netbsd openbsd
+
 package unix_test
 
 import (
 	"testing"
-	"unix"
+
+	"code.google.com/p/go.sys/unix"
 )
 
 func testSetGetenv(t *testing.T, key, value string) {
diff --git a/unix/syscall_unix_test.go b/unix/syscall_unix_test.go
index 302899f7..87f992aa 100644
--- a/unix/syscall_unix_test.go
+++ b/unix/syscall_unix_test.go
@@ -17,7 +17,8 @@ import (
 	"runtime"
 	"testing"
 	"time"
-	"unix"
+
+	"code.google.com/p/go.sys/unix"
 )
 
 // Tests that below functions, structures and constants are consistent
diff --git a/windows/mksyscall_windows.go b/windows/mksyscall_windows.go
index 38df6b7b..ea259aa9 100644
--- a/windows/mksyscall_windows.go
+++ b/windows/mksyscall_windows.go
@@ -661,7 +661,7 @@ const srcTemplate = `
 package {{packagename}}
 
 import "unsafe"{{if windowsdot}}
-import "windows"{{end}}
+import "code.google.com/p/go.sys/windows"{{end}}
 
 var (
 {{template "dlls" .}}
diff --git a/windows/race.go b/windows/race.go
index 8d763a4a..343e18ab 100644
--- a/windows/race.go
+++ b/windows/race.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build race
+// +build windows,race
 
 package windows
 
diff --git a/windows/race0.go b/windows/race0.go
index dddd6f99..17af843b 100644
--- a/windows/race0.go
+++ b/windows/race0.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !race
+// +build windows,!race
 
 package windows
 
diff --git a/windows/str.go b/windows/str.go
index 8ed679f8..917cc2aa 100644
--- a/windows/str.go
+++ b/windows/str.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build windows
+
 package windows
 
 func itoa(val int) string { // do it here rather than with fmt to avoid dependency
diff --git a/windows/syscall.go b/windows/syscall.go
index 66b12ea2..de7aa7df 100644
--- a/windows/syscall.go
+++ b/windows/syscall.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build windows
+
 // Package windows contains an interface to the low-level operating system
 // primitives.  OS details vary depending on the underlying system, and
 // by default, godoc will display the OS-specific documentation for the current
diff --git a/windows/syscall_test.go b/windows/syscall_test.go
index 09e16bf5..e54a03cd 100644
--- a/windows/syscall_test.go
+++ b/windows/syscall_test.go
@@ -2,11 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build windows
+
 package windows_test
 
 import (
 	"testing"
-	"windows"
+
+	"code.google.com/p/go.sys/windows"
 )
 
 func testSetGetenv(t *testing.T, key, value string) {
diff --git a/windows/syscall_windows_test.go b/windows/syscall_windows_test.go
index c7404f6d..d8b129e3 100644
--- a/windows/syscall_windows_test.go
+++ b/windows/syscall_windows_test.go
@@ -9,7 +9,8 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
-	"windows"
+
+	"code.google.com/p/go.sys/windows"
 )
 
 func TestWin32finddata(t *testing.T) {