diff --git a/engine/src/flutter/impeller/entity/contents/atlas_contents.cc b/engine/src/flutter/impeller/entity/contents/atlas_contents.cc
index 1028d68ed0b..380fa276ce2 100644
--- a/engine/src/flutter/impeller/entity/contents/atlas_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/atlas_contents.cc
@@ -6,23 +6,17 @@
 #include <unordered_map>
 #include <utility>
 
-#include "flutter/fml/macros.h"
-
 #include "impeller/core/formats.h"
 #include "impeller/entity/contents/atlas_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/filters/blend_filter_contents.h"
 #include "impeller/entity/contents/filters/color_filter_contents.h"
-#include "impeller/entity/contents/filters/filter_contents.h"
-#include "impeller/entity/contents/framebuffer_blend_contents.h"
 #include "impeller/entity/contents/texture_contents.h"
 #include "impeller/entity/entity.h"
-#include "impeller/entity/geometry/geometry.h"
 #include "impeller/entity/texture_fill.frag.h"
 #include "impeller/entity/texture_fill.vert.h"
 #include "impeller/geometry/color.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/conical_gradient_contents.cc b/engine/src/flutter/impeller/entity/contents/conical_gradient_contents.cc
index 367f1263a88..c6d52fd78d7 100644
--- a/engine/src/flutter/impeller/entity/contents/conical_gradient_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/conical_gradient_contents.cc
@@ -4,7 +4,6 @@
 
 #include "conical_gradient_contents.h"
 
-#include "flutter/fml/logging.h"
 #include "impeller/entity/contents/clip_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/gradient_generator.h"
@@ -12,7 +11,6 @@
 #include "impeller/entity/geometry/geometry.h"
 #include "impeller/geometry/gradient.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
diff --git a/engine/src/flutter/impeller/entity/contents/filters/blend_filter_contents.cc b/engine/src/flutter/impeller/entity/contents/filters/blend_filter_contents.cc
index ab7ea9bf967..9b12d641a38 100644
--- a/engine/src/flutter/impeller/entity/contents/filters/blend_filter_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/filters/blend_filter_contents.cc
@@ -18,9 +18,7 @@
 #include "impeller/entity/contents/solid_color_contents.h"
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/color.h"
-#include "impeller/geometry/path_builder.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/snapshot.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc b/engine/src/flutter/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
index e0cca84e8fb..c246b4ff24a 100644
--- a/engine/src/flutter/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
@@ -8,7 +8,6 @@
 #include "impeller/entity/contents/anonymous_contents.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/filters/color_matrix_filter_contents.cc b/engine/src/flutter/impeller/entity/contents/filters/color_matrix_filter_contents.cc
index 5441840dbdf..89fd478de43 100644
--- a/engine/src/flutter/impeller/entity/contents/filters/color_matrix_filter_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/filters/color_matrix_filter_contents.cc
@@ -13,7 +13,6 @@
 #include "impeller/geometry/point.h"
 #include "impeller/geometry/vector.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/filters/directional_gaussian_blur_filter_contents.cc b/engine/src/flutter/impeller/entity/contents/filters/directional_gaussian_blur_filter_contents.cc
index 5760d7ac250..791a457e3ec 100644
--- a/engine/src/flutter/impeller/entity/contents/filters/directional_gaussian_blur_filter_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/filters/directional_gaussian_blur_filter_contents.cc
@@ -6,10 +6,8 @@
 
 #include <cmath>
 #include <utility>
-#include <valarray>
 
 #include "impeller/base/strings.h"
-#include "impeller/base/validation.h"
 #include "impeller/core/formats.h"
 #include "impeller/core/sampler_descriptor.h"
 #include "impeller/entity/contents/content_context.h"
@@ -19,7 +17,6 @@
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/render_target.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc b/engine/src/flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
index 22fbce32ce1..9dbb25e8dde 100644
--- a/engine/src/flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
@@ -11,7 +11,6 @@
 #include "impeller/entity/texture_fill.vert.h"
 #include "impeller/renderer/command.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc b/engine/src/flutter/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc
index 78825fd40cc..7b768bc708a 100644
--- a/engine/src/flutter/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc
@@ -8,9 +8,7 @@
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/geometry/point.h"
-#include "impeller/geometry/vector.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/filters/morphology_filter_contents.cc b/engine/src/flutter/impeller/entity/contents/filters/morphology_filter_contents.cc
index f94156e8c0d..a90aa853b7a 100644
--- a/engine/src/flutter/impeller/entity/contents/filters/morphology_filter_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/filters/morphology_filter_contents.cc
@@ -10,7 +10,6 @@
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc b/engine/src/flutter/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc
index 839e645be01..a1a36abc154 100644
--- a/engine/src/flutter/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc
@@ -8,9 +8,7 @@
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/geometry/point.h"
-#include "impeller/geometry/vector.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc b/engine/src/flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
index 241f93256f7..9d3c418bdb5 100644
--- a/engine/src/flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
@@ -9,7 +9,6 @@
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/geometry/matrix.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/framebuffer_blend_contents.cc b/engine/src/flutter/impeller/entity/contents/framebuffer_blend_contents.cc
index fb41e3575bf..d48b5d5ffe1 100644
--- a/engine/src/flutter/impeller/entity/contents/framebuffer_blend_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/framebuffer_blend_contents.cc
@@ -6,7 +6,6 @@
 
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
diff --git a/engine/src/flutter/impeller/entity/contents/linear_gradient_contents.cc b/engine/src/flutter/impeller/entity/contents/linear_gradient_contents.cc
index 5c0a24c6c94..fbee0df907b 100644
--- a/engine/src/flutter/impeller/entity/contents/linear_gradient_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/linear_gradient_contents.cc
@@ -4,14 +4,12 @@
 
 #include "linear_gradient_contents.h"
 
-#include "flutter/fml/logging.h"
 #include "impeller/core/formats.h"
 #include "impeller/entity/contents/clip_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/gradient_generator.h"
 #include "impeller/entity/entity.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
diff --git a/engine/src/flutter/impeller/entity/contents/radial_gradient_contents.cc b/engine/src/flutter/impeller/entity/contents/radial_gradient_contents.cc
index 4eb7f1116ca..37c5cdef2b3 100644
--- a/engine/src/flutter/impeller/entity/contents/radial_gradient_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/radial_gradient_contents.cc
@@ -4,7 +4,6 @@
 
 #include "radial_gradient_contents.h"
 
-#include "flutter/fml/logging.h"
 #include "impeller/entity/contents/clip_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/gradient_generator.h"
@@ -12,7 +11,6 @@
 #include "impeller/entity/geometry/geometry.h"
 #include "impeller/geometry/gradient.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
diff --git a/engine/src/flutter/impeller/entity/contents/runtime_effect_contents.cc b/engine/src/flutter/impeller/entity/contents/runtime_effect_contents.cc
index a2a5244b6b0..20f73299a49 100644
--- a/engine/src/flutter/impeller/entity/contents/runtime_effect_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/runtime_effect_contents.cc
@@ -18,7 +18,6 @@
 #include "impeller/entity/runtime_effect.vert.h"
 #include "impeller/renderer/pipeline_library.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/shader_function.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/sweep_gradient_contents.cc b/engine/src/flutter/impeller/entity/contents/sweep_gradient_contents.cc
index 88ba5471217..87f7774d0a3 100644
--- a/engine/src/flutter/impeller/entity/contents/sweep_gradient_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/sweep_gradient_contents.cc
@@ -11,7 +11,6 @@
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/gradient.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
diff --git a/engine/src/flutter/impeller/entity/contents/text_contents.cc b/engine/src/flutter/impeller/entity/contents/text_contents.cc
index 63e86278b2d..8bfb68340d3 100644
--- a/engine/src/flutter/impeller/entity/contents/text_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/text_contents.cc
@@ -6,7 +6,6 @@
 
 #include <cstring>
 #include <optional>
-#include <type_traits>
 #include <utility>
 
 #include "impeller/core/formats.h"
@@ -14,7 +13,6 @@
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/entity.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/typographer/glyph_atlas.h"
 #include "impeller/typographer/lazy_glyph_atlas.h"
 
diff --git a/engine/src/flutter/impeller/entity/contents/texture_contents.cc b/engine/src/flutter/impeller/entity/contents/texture_contents.cc
index 763b2f3f508..e109d1e5753 100644
--- a/engine/src/flutter/impeller/entity/contents/texture_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/texture_contents.cc
@@ -16,7 +16,6 @@
 #include "impeller/entity/texture_fill_external.frag.h"
 #include "impeller/geometry/constants.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/entity/contents/tiled_texture_contents.cc b/engine/src/flutter/impeller/entity/contents/tiled_texture_contents.cc
index 67bd9410073..a71c3ca50c3 100644
--- a/engine/src/flutter/impeller/entity/contents/tiled_texture_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/tiled_texture_contents.cc
@@ -8,13 +8,10 @@
 #include "impeller/entity/contents/clip_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/geometry/geometry.h"
-#include "impeller/entity/texture_fill.frag.h"
 #include "impeller/entity/texture_fill.vert.h"
 #include "impeller/entity/tiled_texture_fill.frag.h"
 #include "impeller/entity/tiled_texture_fill_external.frag.h"
-#include "impeller/geometry/path_builder.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
diff --git a/engine/src/flutter/impeller/entity/contents/vertices_contents.cc b/engine/src/flutter/impeller/entity/contents/vertices_contents.cc
index 47fdc1e9d18..37885ac371f 100644
--- a/engine/src/flutter/impeller/entity/contents/vertices_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/vertices_contents.cc
@@ -10,7 +10,6 @@
 #include "impeller/entity/vertices.frag.h"
 #include "impeller/geometry/color.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
diff --git a/engine/src/flutter/impeller/playground/imgui/imgui_impl_impeller.cc b/engine/src/flutter/impeller/playground/imgui/imgui_impl_impeller.cc
index 37f3adb0e75..990f2c6b102 100644
--- a/engine/src/flutter/impeller/playground/imgui/imgui_impl_impeller.cc
+++ b/engine/src/flutter/impeller/playground/imgui/imgui_impl_impeller.cc
@@ -32,7 +32,6 @@
 #include "impeller/renderer/pipeline_descriptor.h"
 #include "impeller/renderer/pipeline_library.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 struct ImGui_ImplImpeller_Data {
   std::shared_ptr<impeller::Context> context;
diff --git a/engine/src/flutter/impeller/playground/playground.h b/engine/src/flutter/impeller/playground/playground.h
index 6f8f37fca8a..e1dcb8af247 100644
--- a/engine/src/flutter/impeller/playground/playground.h
+++ b/engine/src/flutter/impeller/playground/playground.h
@@ -18,6 +18,7 @@
 #include "impeller/image/compressed_image.h"
 #include "impeller/image/decompressed_image.h"
 #include "impeller/playground/switches.h"
+#include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/renderer.h"
 #include "impeller/runtime_stage/runtime_stage.h"
 
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.h b/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.h
index 17f5a5a7b17..708980d553b 100644
--- a/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.h
+++ b/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.h
@@ -8,7 +8,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include "flutter/fml/macros.h"
 #include "impeller/core/shader_types.h"
 #include "impeller/renderer/backend/gles/gles.h"
 #include "impeller/renderer/backend/gles/proc_table_gles.h"
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.cc b/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.cc
index ff1b2d8a6fa..7209050f64b 100644
--- a/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.cc
+++ b/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.cc
@@ -11,7 +11,6 @@
 #include "fml/closure.h"
 #include "fml/logging.h"
 #include "impeller/base/validation.h"
-#include "impeller/core/texture_descriptor.h"
 #include "impeller/renderer/backend/gles/context_gles.h"
 #include "impeller/renderer/backend/gles/device_buffer_gles.h"
 #include "impeller/renderer/backend/gles/formats_gles.h"
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.h b/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.h
index 2a003e6bdc6..e7e40830633 100644
--- a/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.h
+++ b/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.h
@@ -7,7 +7,6 @@
 
 #include <memory>
 
-#include "flutter/fml/macros.h"
 #include "flutter/impeller/renderer/backend/gles/reactor_gles.h"
 #include "flutter/impeller/renderer/render_pass.h"
 
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/sampler_library_gles.h b/engine/src/flutter/impeller/renderer/backend/gles/sampler_library_gles.h
index 47b5f429ce5..b63e4753726 100644
--- a/engine/src/flutter/impeller/renderer/backend/gles/sampler_library_gles.h
+++ b/engine/src/flutter/impeller/renderer/backend/gles/sampler_library_gles.h
@@ -5,7 +5,6 @@
 #ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_LIBRARY_GLES_H_
 #define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_LIBRARY_GLES_H_
 
-#include "flutter/fml/macros.h"
 #include "impeller/core/sampler_descriptor.h"
 #include "impeller/renderer/sampler_library.h"
 
diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/sampler_library_vk.h b/engine/src/flutter/impeller/renderer/backend/vulkan/sampler_library_vk.h
index a18e65ef159..fc6b36a533a 100644
--- a/engine/src/flutter/impeller/renderer/backend/vulkan/sampler_library_vk.h
+++ b/engine/src/flutter/impeller/renderer/backend/vulkan/sampler_library_vk.h
@@ -5,12 +5,9 @@
 #ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SAMPLER_LIBRARY_VK_H_
 #define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SAMPLER_LIBRARY_VK_H_
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
-#include "impeller/base/comparable.h"
 #include "impeller/core/sampler_descriptor.h"
 #include "impeller/renderer/backend/vulkan/device_holder.h"
-#include "impeller/renderer/backend/vulkan/vk.h"
 #include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/renderer/command.h b/engine/src/flutter/impeller/renderer/command.h
index 426b444cb9c..0e27d74750a 100644
--- a/engine/src/flutter/impeller/renderer/command.h
+++ b/engine/src/flutter/impeller/renderer/command.h
@@ -6,7 +6,6 @@
 #define FLUTTER_IMPELLER_RENDERER_COMMAND_H_
 
 #include <cstdint>
-#include <map>
 #include <memory>
 #include <optional>
 #include <string>
diff --git a/engine/src/flutter/impeller/renderer/compute_pass.h b/engine/src/flutter/impeller/renderer/compute_pass.h
index 155f36e4b95..bd32e6f4713 100644
--- a/engine/src/flutter/impeller/renderer/compute_pass.h
+++ b/engine/src/flutter/impeller/renderer/compute_pass.h
@@ -6,10 +6,7 @@
 #define FLUTTER_IMPELLER_RENDERER_COMPUTE_PASS_H_
 
 #include <string>
-#include <variant>
 
-#include "impeller/core/device_buffer.h"
-#include "impeller/core/texture.h"
 #include "impeller/renderer/compute_command.h"
 
 namespace impeller {
diff --git a/engine/src/flutter/impeller/renderer/compute_pipeline_builder.h b/engine/src/flutter/impeller/renderer/compute_pipeline_builder.h
index 8029c0ff9ac..1e9938ea406 100644
--- a/engine/src/flutter/impeller/renderer/compute_pipeline_builder.h
+++ b/engine/src/flutter/impeller/renderer/compute_pipeline_builder.h
@@ -5,15 +5,11 @@
 #ifndef FLUTTER_IMPELLER_RENDERER_COMPUTE_PIPELINE_BUILDER_H_
 #define FLUTTER_IMPELLER_RENDERER_COMPUTE_PIPELINE_BUILDER_H_
 
-#include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
 #include "impeller/base/strings.h"
 #include "impeller/base/validation.h"
-#include "impeller/core/formats.h"
 #include "impeller/renderer/compute_pipeline_descriptor.h"
 #include "impeller/renderer/context.h"
 #include "impeller/renderer/shader_library.h"
-#include "impeller/renderer/vertex_descriptor.h"
 
 namespace impeller {
 
diff --git a/engine/src/flutter/impeller/renderer/context.h b/engine/src/flutter/impeller/renderer/context.h
index 36ad0c2e189..2b76e8f3bfa 100644
--- a/engine/src/flutter/impeller/renderer/context.h
+++ b/engine/src/flutter/impeller/renderer/context.h
@@ -8,18 +8,17 @@
 #include <memory>
 #include <string>
 
-#include "flutter/fml/macros.h"
 #include "impeller/core/allocator.h"
 #include "impeller/core/capture.h"
 #include "impeller/core/formats.h"
 #include "impeller/core/host_buffer.h"
 #include "impeller/renderer/capabilities.h"
 #include "impeller/renderer/pool.h"
+#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
 class ShaderLibrary;
-class SamplerLibrary;
 class CommandBuffer;
 class PipelineLibrary;
 
diff --git a/engine/src/flutter/impeller/renderer/renderer.cc b/engine/src/flutter/impeller/renderer/renderer.cc
index d1fda89cf72..abc5dc2b7ce 100644
--- a/engine/src/flutter/impeller/renderer/renderer.cc
+++ b/engine/src/flutter/impeller/renderer/renderer.cc
@@ -6,9 +6,7 @@
 
 #include <algorithm>
 
-#include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
-#include "impeller/base/validation.h"
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/surface.h"
 
diff --git a/engine/src/flutter/impeller/renderer/renderer.h b/engine/src/flutter/impeller/renderer/renderer.h
index 1e37761ab4a..1a07e59dcd0 100644
--- a/engine/src/flutter/impeller/renderer/renderer.h
+++ b/engine/src/flutter/impeller/renderer/renderer.h
@@ -8,16 +8,13 @@
 #include <functional>
 #include <memory>
 
-#include "flutter/fml/macros.h"
 #include "flutter/fml/synchronization/semaphore.h"
-#include "impeller/geometry/size.h"
 #include "impeller/renderer/context.h"
 #include "impeller/renderer/render_target.h"
 
 namespace impeller {
 
 class Surface;
-class RenderPass;
 
 class Renderer {
  public:
diff --git a/engine/src/flutter/impeller/renderer/renderer_unittests.cc b/engine/src/flutter/impeller/renderer/renderer_unittests.cc
index c397f74303a..c54e213f10c 100644
--- a/engine/src/flutter/impeller/renderer/renderer_unittests.cc
+++ b/engine/src/flutter/impeller/renderer/renderer_unittests.cc
@@ -3,11 +3,9 @@
 // found in the LICENSE file.
 
 #include "flutter/fml/logging.h"
-#include "flutter/testing/testing.h"
-#include "impeller/base/strings.h"
+
 #include "impeller/core/device_buffer_descriptor.h"
 #include "impeller/core/formats.h"
-#include "impeller/core/sampler.h"
 #include "impeller/core/sampler_descriptor.h"
 #include "impeller/fixtures/array.frag.h"
 #include "impeller/fixtures/array.vert.h"
@@ -23,20 +21,15 @@
 #include "impeller/fixtures/instanced_draw.vert.h"
 #include "impeller/fixtures/mipmaps.frag.h"
 #include "impeller/fixtures/mipmaps.vert.h"
-#include "impeller/fixtures/test_texture.frag.h"
-#include "impeller/fixtures/test_texture.vert.h"
 #include "impeller/geometry/path_builder.h"
-#include "impeller/image/compressed_image.h"
-#include "impeller/image/decompressed_image.h"
 #include "impeller/playground/playground_test.h"
 #include "impeller/renderer/command.h"
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/pipeline_builder.h"
 #include "impeller/renderer/pipeline_library.h"
+#include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/render_target.h"
 #include "impeller/renderer/renderer.h"
-#include "impeller/renderer/sampler_library.h"
-#include "impeller/renderer/surface.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 #include "impeller/tessellator/tessellator.h"
 #include "third_party/imgui/imgui.h"
diff --git a/engine/src/flutter/impeller/scene/geometry.cc b/engine/src/flutter/impeller/scene/geometry.cc
index 27254c9fabc..f8c2071839a 100644
--- a/engine/src/flutter/impeller/scene/geometry.cc
+++ b/engine/src/flutter/impeller/scene/geometry.cc
@@ -4,7 +4,6 @@
 
 #include "impeller/scene/geometry.h"
 
-#include <iostream>
 #include <memory>
 #include <ostream>
 
@@ -14,7 +13,6 @@
 #include "impeller/core/vertex_buffer.h"
 #include "impeller/geometry/point.h"
 #include "impeller/geometry/vector.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 #include "impeller/scene/importer/scene_flatbuffers.h"
 #include "impeller/scene/shaders/skinned.vert.h"
diff --git a/engine/src/flutter/impeller/scene/material.cc b/engine/src/flutter/impeller/scene/material.cc
index d4f4c7161f3..62e681b61c7 100644
--- a/engine/src/flutter/impeller/scene/material.cc
+++ b/engine/src/flutter/impeller/scene/material.cc
@@ -6,7 +6,6 @@
 #include "impeller/base/validation.h"
 #include "impeller/core/formats.h"
 #include "impeller/core/sampler_descriptor.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/scene/importer/conversions.h"
 #include "impeller/scene/importer/scene_flatbuffers.h"
 #include "impeller/scene/pipeline_key.h"
diff --git a/engine/src/flutter/lib/gpu/render_pass.cc b/engine/src/flutter/lib/gpu/render_pass.cc
index 98ea3160cbc..81d26b30064 100644
--- a/engine/src/flutter/lib/gpu/render_pass.cc
+++ b/engine/src/flutter/lib/gpu/render_pass.cc
@@ -14,7 +14,6 @@
 #include "impeller/core/vertex_buffer.h"
 #include "impeller/geometry/color.h"
 #include "impeller/renderer/pipeline_library.h"
-#include "impeller/renderer/sampler_library.h"
 #include "tonic/converter/dart_converter.h"
 
 namespace flutter {