3 files changed, 4 insertions, 25 deletions
diff --git a/pkg/sentry/platform/BUILD b/pkg/sentry/platform/BUILD
index 15a7fbbc3..af9ba5394 100644
--- a/pkg/sentry/platform/BUILD
+++ b/pkg/sentry/platform/BUILD
@@ -1,16 +1,7 @@
 package(licenses = ["notice"])  # Apache 2.0
 
 load("//tools/go_generics:defs.bzl", "go_template_instance")
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify")
-
-go_stateify(
-    name = "platform_state",
-    srcs = [
-        "file_range.go",
-    ],
-    out = "platform_state.go",
-    package = "platform",
-)
+load("//tools/go_stateify:defs.bzl", "go_library")
 
 go_template_instance(
     name = "file_range",
@@ -30,7 +21,6 @@ go_library(
         "file_range.go",
         "mmap_min_addr.go",
         "platform.go",
-        "platform_state.go",
     ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/sentry/platform",
     visibility = ["//pkg/sentry:internal"],
@@ -44,7 +34,6 @@ go_library(
         "//pkg/sentry/safemem",
         "//pkg/sentry/usage",
         "//pkg/sentry/usermem",
-        "//pkg/state",
         "//pkg/syserror",
     ],
 )
diff --git a/pkg/sentry/platform/filemem/BUILD b/pkg/sentry/platform/filemem/BUILD
index dadba1d38..2a5982763 100644
--- a/pkg/sentry/platform/filemem/BUILD
+++ b/pkg/sentry/platform/filemem/BUILD
@@ -1,18 +1,7 @@
 package(licenses = ["notice"])  # Apache 2.0
 
 load("//tools/go_generics:defs.bzl", "go_template_instance")
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify", "go_test")
-
-go_stateify(
-    name = "filemem_autogen_state",
-    srcs = [
-        "filemem.go",
-        "filemem_state.go",
-        "usage_set.go",
-    ],
-    out = "filemem_autogen_state.go",
-    package = "filemem",
-)
+load("//tools/go_stateify:defs.bzl", "go_library", "go_test")
 
 go_template_instance(
     name = "usage_set",
@@ -38,7 +27,6 @@ go_library(
     name = "filemem",
     srcs = [
         "filemem.go",
-        "filemem_autogen_state.go",
         "filemem_state.go",
         "filemem_unsafe.go",
         "usage_set.go",
diff --git a/pkg/sentry/platform/filemem/filemem.go b/pkg/sentry/platform/filemem/filemem.go
index 870274ae1..feb020ef8 100644
--- a/pkg/sentry/platform/filemem/filemem.go
+++ b/pkg/sentry/platform/filemem/filemem.go
@@ -155,6 +155,8 @@ type FileMem struct {
 }
 
 // usage tracks usage information.
+//
+// +stateify savable
 type usageInfo struct {
 	// kind is the usage kind.
 	kind usage.MemoryKind