diff --git a/compiler/plugins/input/StableHLO/Conversion/ConvertCollectives.cpp b/compiler/plugins/input/StableHLO/Conversion/ConvertCollectives.cpp
index aff8e78f0c2b..62f20cd80aaf 100644
--- a/compiler/plugins/input/StableHLO/Conversion/ConvertCollectives.cpp
+++ b/compiler/plugins/input/StableHLO/Conversion/ConvertCollectives.cpp
@@ -400,7 +400,7 @@ static Value emitTranspose(ConversionPatternRewriter &rewriter, Location loc,
 
 /// Converts stablehlo.partition_id to (flow.channel.rank % numPartitions)
 struct PartitionIdOpConversion
-    : public OpConversionPattern<mlir::stablehlo::PartitionIdOp> {
+    : OpConversionPattern<mlir::stablehlo::PartitionIdOp> {
   using OpConversionPattern<
       mlir::stablehlo::PartitionIdOp>::OpConversionPattern;
 
@@ -437,7 +437,7 @@ struct PartitionIdOpConversion
 
 /// Converts stablehlo.replica_id to floor_div(flow.channel.rank, numPartitions)
 struct ReplicaIdOpConversion
-    : public OpConversionPattern<mlir::stablehlo::ReplicaIdOp> {
+    : OpConversionPattern<mlir::stablehlo::ReplicaIdOp> {
   using Base::Base;
 
   LogicalResult
@@ -833,7 +833,7 @@ struct ReduceScatterOpConversion final
 };
 
 struct CollectivePermuteOpConversion
-    : public OpConversionPattern<mlir::stablehlo::CollectivePermuteOp> {
+    : OpConversionPattern<mlir::stablehlo::CollectivePermuteOp> {
   using OpConversionPattern<
       mlir::stablehlo::CollectivePermuteOp>::OpConversionPattern;
 
diff --git a/compiler/plugins/input/StableHLO/Conversion/LegalizeControlFlow.cpp b/compiler/plugins/input/StableHLO/Conversion/LegalizeControlFlow.cpp
index 07b80f485fba..3806522ce4ef 100644
--- a/compiler/plugins/input/StableHLO/Conversion/LegalizeControlFlow.cpp
+++ b/compiler/plugins/input/StableHLO/Conversion/LegalizeControlFlow.cpp
@@ -186,7 +186,7 @@ struct IfOpPattern final : OpConversionPattern<mlir::stablehlo::IfOp> {
 };
 
 // Rewrites `stablehlo.case` to a nested `scf.if`.
-struct CaseOpPattern : public OpConversionPattern<mlir::stablehlo::CaseOp> {
+struct CaseOpPattern : OpConversionPattern<mlir::stablehlo::CaseOp> {
   using Base::Base;
 
   // Recursively create if/else ops to handle each possible value in a case op.
diff --git a/compiler/plugins/input/StableHLO/Conversion/Passes.h b/compiler/plugins/input/StableHLO/Conversion/Passes.h
index e6bd1741f4be..0688e93d2a91 100644
--- a/compiler/plugins/input/StableHLO/Conversion/Passes.h
+++ b/compiler/plugins/input/StableHLO/Conversion/Passes.h
@@ -12,7 +12,7 @@
 
 namespace mlir::iree_compiler::stablehlo {
 
-struct StableHloOptions : public PassPipelineOptions<StableHloOptions> {};
+struct StableHloOptions : PassPipelineOptions<StableHloOptions> {};
 
 //===----------------------------------------------------------------------===//
 // Pipelines
diff --git a/compiler/plugins/input/StableHLO/PluginRegistration.cpp b/compiler/plugins/input/StableHLO/PluginRegistration.cpp
index 003276ffb934..d6595ea7899f 100644
--- a/compiler/plugins/input/StableHLO/PluginRegistration.cpp
+++ b/compiler/plugins/input/StableHLO/PluginRegistration.cpp
@@ -58,8 +58,8 @@ static bool checkOpForTuples(Operation *op) {
 // The StableHLO plugin provides dialects, passes and opt-in options.
 // Therefore, it is appropriate for default activation.
 struct StableHLOSession
-    : public PluginSession<StableHLOSession, StableHLOOptions,
-                           PluginActivationPolicy::DefaultActivated> {
+    : PluginSession<StableHLOSession, StableHLOOptions,
+                    PluginActivationPolicy::DefaultActivated> {
   static void registerPasses() {
     // TODO(scotttodd): register other StableHLO passes?
     registerStableHLOConversionPasses();
diff --git a/compiler/plugins/input/TOSA/InputConversion/Converti48Toi64.cpp b/compiler/plugins/input/TOSA/InputConversion/Converti48Toi64.cpp
index 2899ce23ea08..c81afd601c5c 100644
--- a/compiler/plugins/input/TOSA/InputConversion/Converti48Toi64.cpp
+++ b/compiler/plugins/input/TOSA/InputConversion/Converti48Toi64.cpp
@@ -26,7 +26,7 @@ class Converti48Toi64Pass final
   void runOnOperation() override;
 };
 
-struct i48Toi64Converter : public TypeConverter {
+struct i48Toi64Converter : TypeConverter {
 public:
   static Type convertType(Type type) {
     if (type.isInteger(48)) {
diff --git a/compiler/plugins/input/TOSA/PluginRegistration.cpp b/compiler/plugins/input/TOSA/PluginRegistration.cpp
index b647d73c7854..563ee4f8e8ae 100644
--- a/compiler/plugins/input/TOSA/PluginRegistration.cpp
+++ b/compiler/plugins/input/TOSA/PluginRegistration.cpp
@@ -23,9 +23,8 @@ namespace {
 //
 // The TOSA plugin provides dialects, passes and opt-in options.
 // Therefore, it is appropriate for default activation.
-struct TOSASession
-    : public PluginSession<TOSASession, EmptyPluginOptions,
-                           PluginActivationPolicy::DefaultActivated> {
+struct TOSASession : PluginSession<TOSASession, EmptyPluginOptions,
+                                   PluginActivationPolicy::DefaultActivated> {
   static void registerPasses() {
     registerTOSAConversionPasses();
     registerTosaToArithPass();
diff --git a/compiler/plugins/input/Torch/InputConversion/ConvertTMTensorToLinalgExt.cpp b/compiler/plugins/input/Torch/InputConversion/ConvertTMTensorToLinalgExt.cpp
index 0131f2c71f22..8903a88df935 100644
--- a/compiler/plugins/input/Torch/InputConversion/ConvertTMTensorToLinalgExt.cpp
+++ b/compiler/plugins/input/Torch/InputConversion/ConvertTMTensorToLinalgExt.cpp
@@ -27,7 +27,7 @@ namespace mlir::iree_compiler::TorchInput {
 namespace {
 
 template <typename SrcOpTy, typename TargetOpTy>
-struct TMTensorOpConversion : public OpRewritePattern<SrcOpTy> {
+struct TMTensorOpConversion : OpRewritePattern<SrcOpTy> {
   using OpRewritePattern<SrcOpTy>::OpRewritePattern;
   LogicalResult matchAndRewrite(SrcOpTy srcOp,
                                 PatternRewriter &rewriter) const override {
@@ -46,7 +46,7 @@ struct TMTensorOpConversion : public OpRewritePattern<SrcOpTy> {
 };
 
 struct ScatterOpConversion
-    : public OpRewritePattern<mlir::torch::TMTensor::ScatterOp> {
+    : OpRewritePattern<mlir::torch::TMTensor::ScatterOp> {
   using Base::Base;
   LogicalResult matchAndRewrite(mlir::torch::TMTensor::ScatterOp op,
                                 PatternRewriter &rewriter) const override {
@@ -120,7 +120,7 @@ static SmallVector<AffineMap> getStandardAttentionIndexingMaps(MLIRContext *ctx,
 }
 
 struct AttentionOpConversion
-    : public OpRewritePattern<mlir::torch::TMTensor::AttentionOp> {
+    : OpRewritePattern<mlir::torch::TMTensor::AttentionOp> {
   using Base::Base;
   LogicalResult matchAndRewrite(mlir::torch::TMTensor::AttentionOp op,
                                 PatternRewriter &rewriter) const override {
diff --git a/compiler/plugins/input/Torch/InputConversion/ConvertTorchUnstructuredToLinalgExt.cpp b/compiler/plugins/input/Torch/InputConversion/ConvertTorchUnstructuredToLinalgExt.cpp
index 8d329f393279..b66a03dd79b0 100644
--- a/compiler/plugins/input/Torch/InputConversion/ConvertTorchUnstructuredToLinalgExt.cpp
+++ b/compiler/plugins/input/Torch/InputConversion/ConvertTorchUnstructuredToLinalgExt.cpp
@@ -21,8 +21,7 @@ namespace mlir::iree_compiler::TorchInput {
 
 namespace {
 
-struct FftRfftOpConversion
-    : public OpRewritePattern<torch::Torch::AtenFftRfftOp> {
+struct FftRfftOpConversion : OpRewritePattern<torch::Torch::AtenFftRfftOp> {
   using Base::Base;
   LogicalResult matchAndRewrite(torch::Torch::AtenFftRfftOp op,
                                 PatternRewriter &rewriter) const override {
diff --git a/compiler/plugins/input/Torch/InputConversion/Passes.h b/compiler/plugins/input/Torch/InputConversion/Passes.h
index f18c58a0c7ce..0e9a46bbe269 100644
--- a/compiler/plugins/input/Torch/InputConversion/Passes.h
+++ b/compiler/plugins/input/Torch/InputConversion/Passes.h
@@ -29,7 +29,7 @@ struct BackendLegalOps {
 };
 
 struct TorchToIREELoweringPipelineOptions
-    : public PassPipelineOptions<TorchToIREELoweringPipelineOptions> {
+    : PassPipelineOptions<TorchToIREELoweringPipelineOptions> {
   Option<bool> strictSymbolicShapes{
       *this, "strict-symbolic-shapes",
       llvm::cl::desc("Use strict symbolic shapes."), llvm::cl::init(true)};
diff --git a/compiler/plugins/input/Torch/PluginRegistration.cpp b/compiler/plugins/input/Torch/PluginRegistration.cpp
index bacc42bb61ba..2f934beb4733 100644
--- a/compiler/plugins/input/Torch/PluginRegistration.cpp
+++ b/compiler/plugins/input/Torch/PluginRegistration.cpp
@@ -55,9 +55,8 @@ struct TorchOptions {
 
 // The torch plugin provides dialects, passes and opt-in options.
 // Therefore, it is appropriate for default activation.
-struct TorchSession
-    : public PluginSession<TorchSession, TorchOptions,
-                           PluginActivationPolicy::DefaultActivated> {
+struct TorchSession : PluginSession<TorchSession, TorchOptions,
+                                    PluginActivationPolicy::DefaultActivated> {
   static void registerPasses() {
     mlir::torch::registerTorchPasses();
     mlir::torch::registerTorchConversionPasses();
diff --git a/compiler/plugins/target/CUDA/CUDATarget.cpp b/compiler/plugins/target/CUDA/CUDATarget.cpp
index e15edae690fe..c263ea8ffb67 100644
--- a/compiler/plugins/target/CUDA/CUDATarget.cpp
+++ b/compiler/plugins/target/CUDA/CUDATarget.cpp
@@ -717,8 +717,8 @@ class CUDATargetBackend final : public TargetBackend {
 };
 
 struct CUDASession final
-    : public PluginSession<CUDASession, CUDAOptions,
-                           PluginActivationPolicy::DefaultActivated> {
+    : PluginSession<CUDASession, CUDAOptions,
+                    PluginActivationPolicy::DefaultActivated> {
   void populateHALTargetDevices(IREE::HAL::TargetDeviceList &targets) final {
     // #hal.device.target<"cuda", ...
     targets.add("cuda",
diff --git a/compiler/plugins/target/LLVMCPU/LLVMCPUTarget.cpp b/compiler/plugins/target/LLVMCPU/LLVMCPUTarget.cpp
index fcdd4646e099..33586144d2db 100644
--- a/compiler/plugins/target/LLVMCPU/LLVMCPUTarget.cpp
+++ b/compiler/plugins/target/LLVMCPU/LLVMCPUTarget.cpp
@@ -865,8 +865,8 @@ class LLVMCPUTargetBackend final : public TargetBackend {
 };
 
 struct LLVMCPUSession final
-    : public PluginSession<LLVMCPUSession, LLVMCPUTargetCLOptions,
-                           PluginActivationPolicy::DefaultActivated> {
+    : PluginSession<LLVMCPUSession, LLVMCPUTargetCLOptions,
+                    PluginActivationPolicy::DefaultActivated> {
   void populateHALTargetBackends(IREE::HAL::TargetBackendList &targets) final {
     // #hal.executable.target<"llvm-cpu", ...
     // Use session-scoped codegen options bound in createUninitializedSession.
diff --git a/compiler/plugins/target/Local/LocalTarget.cpp b/compiler/plugins/target/Local/LocalTarget.cpp
index 43f93aaa2cef..02ef4510c15e 100644
--- a/compiler/plugins/target/Local/LocalTarget.cpp
+++ b/compiler/plugins/target/Local/LocalTarget.cpp
@@ -14,8 +14,8 @@ namespace mlir::iree_compiler::IREE::HAL {
 
 namespace {
 struct LocalSession
-    : public PluginSession<LocalSession, IREE::HAL::LocalDevice::Options,
-                           PluginActivationPolicy::DefaultActivated> {
+    : PluginSession<LocalSession, IREE::HAL::LocalDevice::Options,
+                    PluginActivationPolicy::DefaultActivated> {
   void populateHALTargetDevices(IREE::HAL::TargetDeviceList &targets) {
     // #hal.device.target<"local", ...
     targets.add("local", [=]() {
diff --git a/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.cpp b/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.cpp
index ef79b99669fa..c1aeedfe9ed1 100644
--- a/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.cpp
+++ b/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.cpp
@@ -321,8 +321,8 @@ class MetalSPIRVTargetBackend final : public TargetBackend {
 };
 
 struct MetalSPIRVSession final
-    : public PluginSession<MetalSPIRVSession, MetalSPIRVOptions,
-                           PluginActivationPolicy::DefaultActivated> {
+    : PluginSession<MetalSPIRVSession, MetalSPIRVOptions,
+                    PluginActivationPolicy::DefaultActivated> {
   void populateHALTargetDevices(IREE::HAL::TargetDeviceList &targets) final {
     // #hal.device.target<"metal", ...
     targets.add("metal",
diff --git a/compiler/plugins/target/VMVX/VMVXTarget.cpp b/compiler/plugins/target/VMVX/VMVXTarget.cpp
index 8f3b9a48b0ce..7b8f4cd02c12 100644
--- a/compiler/plugins/target/VMVX/VMVXTarget.cpp
+++ b/compiler/plugins/target/VMVX/VMVXTarget.cpp
@@ -259,8 +259,8 @@ class VMVXInlineTargetBackend final : public TargetBackend {
 };
 
 struct VMVXSession final
-    : public PluginSession<VMVXSession, VMVXOptions,
-                           PluginActivationPolicy::DefaultActivated> {
+    : PluginSession<VMVXSession, VMVXOptions,
+                    PluginActivationPolicy::DefaultActivated> {
   void populateHALTargetBackends(IREE::HAL::TargetBackendList &targets) final {
     // #hal.executable.target<"vmvx", ...
     targets.add("vmvx",
diff --git a/compiler/plugins/target/VulkanSPIRV/VulkanSPIRVTarget.cpp b/compiler/plugins/target/VulkanSPIRV/VulkanSPIRVTarget.cpp
index 94fbe5f0703c..7443720f78c9 100644
--- a/compiler/plugins/target/VulkanSPIRV/VulkanSPIRVTarget.cpp
+++ b/compiler/plugins/target/VulkanSPIRV/VulkanSPIRVTarget.cpp
@@ -492,8 +492,8 @@ class VulkanSPIRVTargetBackend final : public TargetBackend {
 };
 
 struct VulkanSPIRVSession final
-    : public PluginSession<VulkanSPIRVSession, VulkanSPIRVTargetOptions,
-                           PluginActivationPolicy::DefaultActivated> {
+    : PluginSession<VulkanSPIRVSession, VulkanSPIRVTargetOptions,
+                    PluginActivationPolicy::DefaultActivated> {
   void populateHALTargetDevices(IREE::HAL::TargetDeviceList &targets) final {
     // #hal.device.target<"vulkan", ...
     targets.add("vulkan", [&]() {
diff --git a/compiler/plugins/target/WebGPUSPIRV/WebGPUSPIRVTarget.cpp b/compiler/plugins/target/WebGPUSPIRV/WebGPUSPIRVTarget.cpp
index 2859af37eed1..858c28ffe664 100644
--- a/compiler/plugins/target/WebGPUSPIRV/WebGPUSPIRVTarget.cpp
+++ b/compiler/plugins/target/WebGPUSPIRV/WebGPUSPIRVTarget.cpp
@@ -262,8 +262,8 @@ class WebGPUSPIRVTargetBackend final : public TargetBackend {
 };
 
 struct WebGPUSPIRVSession final
-    : public PluginSession<WebGPUSPIRVSession, WebGPUSPIRVOptions,
-                           PluginActivationPolicy::DefaultActivated> {
+    : PluginSession<WebGPUSPIRVSession, WebGPUSPIRVOptions,
+                    PluginActivationPolicy::DefaultActivated> {
   void populateHALTargetDevices(IREE::HAL::TargetDeviceList &targets) final {
     // #hal.device.target<"webgpu", ...
     targets.add("webgpu", [=]() {