diff --git a/cmd/guru/callees.go b/cmd/guru/callees.go
index 1fcd193c..678450bf 100644
--- a/cmd/guru/callees.go
+++ b/cmd/guru/callees.go
@@ -11,11 +11,11 @@ import (
 	"go/types"
 	"sort"
 
+	"golang.org/x/tools/cmd/guru/serial"
 	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/go/pointer"
 	"golang.org/x/tools/go/ssa"
 	"golang.org/x/tools/go/ssa/ssautil"
-	"golang.org/x/tools/cmd/guru/serial"
 )
 
 // Callees reports the possible callees of the function call site
diff --git a/cmd/guru/callers.go b/cmd/guru/callers.go
index 928555b8..b0edc4d3 100644
--- a/cmd/guru/callers.go
+++ b/cmd/guru/callers.go
@@ -8,11 +8,11 @@ import (
 	"fmt"
 	"go/token"
 
+	"golang.org/x/tools/cmd/guru/serial"
 	"golang.org/x/tools/go/callgraph"
 	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/go/ssa"
 	"golang.org/x/tools/go/ssa/ssautil"
-	"golang.org/x/tools/cmd/guru/serial"
 )
 
 // Callers reports the possible callers of the function
diff --git a/cmd/guru/callstack.go b/cmd/guru/callstack.go
index b9894164..3b0bf5f4 100644
--- a/cmd/guru/callstack.go
+++ b/cmd/guru/callstack.go
@@ -8,11 +8,11 @@ import (
 	"fmt"
 	"go/token"
 
+	"golang.org/x/tools/cmd/guru/serial"
 	"golang.org/x/tools/go/callgraph"
 	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/go/ssa"
 	"golang.org/x/tools/go/ssa/ssautil"
-	"golang.org/x/tools/cmd/guru/serial"
 )
 
 // Callstack displays an arbitrary path from a root of the callgraph
diff --git a/cmd/guru/definition.go b/cmd/guru/definition.go
index 99f54435..d95fbc6f 100644
--- a/cmd/guru/definition.go
+++ b/cmd/guru/definition.go
@@ -10,8 +10,8 @@ import (
 	"go/token"
 	"go/types"
 
-	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/cmd/guru/serial"
+	"golang.org/x/tools/go/loader"
 )
 
 // definition reports the location of the definition of an identifier.
diff --git a/cmd/guru/describe.go b/cmd/guru/describe.go
index d3f47317..def908e0 100644
--- a/cmd/guru/describe.go
+++ b/cmd/guru/describe.go
@@ -15,10 +15,10 @@ import (
 	"os"
 	"strings"
 
+	"golang.org/x/tools/cmd/guru/serial"
 	"golang.org/x/tools/go/ast/astutil"
 	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/go/types/typeutil"
-	"golang.org/x/tools/cmd/guru/serial"
 )
 
 // describe describes the syntax node denoted by the query position,
diff --git a/cmd/guru/freevars.go b/cmd/guru/freevars.go
index 60f4db9b..c4ff6590 100644
--- a/cmd/guru/freevars.go
+++ b/cmd/guru/freevars.go
@@ -12,8 +12,8 @@ import (
 	"go/types"
 	"sort"
 
-	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/cmd/guru/serial"
+	"golang.org/x/tools/go/loader"
 )
 
 // freevars displays the lexical (not package-level) free variables of
diff --git a/cmd/guru/guru.go b/cmd/guru/guru.go
index 69becfe0..2ec78533 100644
--- a/cmd/guru/guru.go
+++ b/cmd/guru/guru.go
@@ -20,11 +20,11 @@ import (
 	"io"
 	"path/filepath"
 
+	"golang.org/x/tools/cmd/guru/serial"
 	"golang.org/x/tools/go/ast/astutil"
 	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/go/pointer"
 	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/cmd/guru/serial"
 )
 
 type printfFunc func(pos interface{}, format string, args ...interface{})
diff --git a/cmd/guru/implements.go b/cmd/guru/implements.go
index d2e75ea8..07a617dc 100644
--- a/cmd/guru/implements.go
+++ b/cmd/guru/implements.go
@@ -13,9 +13,9 @@ import (
 	"sort"
 	"strings"
 
+	"golang.org/x/tools/cmd/guru/serial"
 	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/go/types/typeutil"
-	"golang.org/x/tools/cmd/guru/serial"
 	"golang.org/x/tools/refactor/importgraph"
 )
 
diff --git a/cmd/guru/peers.go b/cmd/guru/peers.go
index eda36107..1d3ed15a 100644
--- a/cmd/guru/peers.go
+++ b/cmd/guru/peers.go
@@ -11,10 +11,10 @@ import (
 	"go/types"
 	"sort"
 
+	"golang.org/x/tools/cmd/guru/serial"
 	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/go/ssa"
 	"golang.org/x/tools/go/ssa/ssautil"
-	"golang.org/x/tools/cmd/guru/serial"
 )
 
 // peers enumerates, for a given channel send (or receive) operation,
diff --git a/cmd/guru/pointsto.go b/cmd/guru/pointsto.go
index 758ba028..65fff7b4 100644
--- a/cmd/guru/pointsto.go
+++ b/cmd/guru/pointsto.go
@@ -11,12 +11,12 @@ import (
 	"go/types"
 	"sort"
 
+	"golang.org/x/tools/cmd/guru/serial"
 	"golang.org/x/tools/go/ast/astutil"
 	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/go/pointer"
 	"golang.org/x/tools/go/ssa"
 	"golang.org/x/tools/go/ssa/ssautil"
-	"golang.org/x/tools/oracle/serial"
 )
 
 // pointsto runs the pointer analysis on the selected expression,
diff --git a/cmd/guru/referrers.go b/cmd/guru/referrers.go
index eaf5f1d2..53d60273 100644
--- a/cmd/guru/referrers.go
+++ b/cmd/guru/referrers.go
@@ -13,8 +13,8 @@ import (
 	"io/ioutil"
 	"sort"
 
-	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/cmd/guru/serial"
+	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/refactor/importgraph"
 )