diff --git a/gotoinline/gotoinline.go b/gotoinline/gotoinline.go
index 98dbfeb..42ec1c7 100644
--- a/gotoinline/gotoinline.go
+++ b/gotoinline/gotoinline.go
@@ -10,7 +10,7 @@ import (
 	"go/token"
 	"strings"
 
-	"golang.org/x/tools/go/types"
+	"go/types"
 
 	"rsc.io/grind/block"
 	"rsc.io/grind/grinder"
diff --git a/grinder/ast.go b/grinder/ast.go
index 2aa2609..0e619d2 100644
--- a/grinder/ast.go
+++ b/grinder/ast.go
@@ -8,7 +8,7 @@ import (
 	"go/ast"
 	"go/token"
 
-	"golang.org/x/tools/go/types"
+	"go/types"
 
 	"rsc.io/grind/block"
 )
diff --git a/grinder/grind.go b/grinder/grind.go
index f2e7bfe..0648b2a 100644
--- a/grinder/grind.go
+++ b/grinder/grind.go
@@ -17,8 +17,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	_ "golang.org/x/tools/go/gcimporter"
-	"golang.org/x/tools/go/types"
+	"go/types"
+
+	_ "golang.org/x/tools/go/gcimporter15"
 )
 
 type Package struct {
diff --git a/main.go b/main.go
index fdca2d1..e5b1e60 100644
--- a/main.go
+++ b/main.go
@@ -13,7 +13,7 @@ import (
 	"os/exec"
 	"strings"
 
-	_ "golang.org/x/tools/go/gcimporter"
+	_ "golang.org/x/tools/go/gcimporter15"
 	"rsc.io/grind/deadcode"
 	"rsc.io/grind/gotoinline"
 	"rsc.io/grind/grinder"
diff --git a/vardecl/vardecl.go b/vardecl/vardecl.go
index 835993a..3b4573e 100644
--- a/vardecl/vardecl.go
+++ b/vardecl/vardecl.go
@@ -11,7 +11,7 @@ import (
 	"go/token"
 	"strings"
 
-	"golang.org/x/tools/go/types"
+	"go/types"
 
 	"rsc.io/grind/block"
 	"rsc.io/grind/flow"