diff --git a/cc/binary.go b/cc/binary.go
index 7b5591aaf..cfc54fff4 100644
--- a/cc/binary.go
+++ b/cc/binary.go
@@ -563,11 +563,11 @@ func (binary *binaryDecorator) verifyHostBionicLinker(ctx ModuleContext, in, lin
 }
 
 type ccBinaryBazelHandler struct {
-	BazelHandler
-
 	module *Module
 }
 
+var _ BazelHandler = (*ccBinaryBazelHandler)(nil)
+
 func (handler *ccBinaryBazelHandler) QueueBazelCall(ctx android.BaseModuleContext, label string) {
 	bazelCtx := ctx.Config().BazelContext
 	bazelCtx.QueueBazelRequest(label, cquery.GetOutputFiles, android.GetConfigKey(ctx))
diff --git a/cc/library.go b/cc/library.go
index 57465292d..9a30f5320 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -642,11 +642,11 @@ type libraryDecorator struct {
 }
 
 type ccLibraryBazelHandler struct {
-	BazelHandler
-
 	module *Module
 }
 
+var _ BazelHandler = (*ccLibraryBazelHandler)(nil)
+
 // generateStaticBazelBuildActions constructs the StaticLibraryInfo Soong
 // provider from a Bazel shared library's CcInfo provider.
 func (handler *ccLibraryBazelHandler) generateStaticBazelBuildActions(ctx android.ModuleContext, label string, ccInfo cquery.CcInfo) {
diff --git a/cc/library_headers.go b/cc/library_headers.go
index 6fd956803..dd2f06c21 100644
--- a/cc/library_headers.go
+++ b/cc/library_headers.go
@@ -49,12 +49,12 @@ func RegisterLibraryHeadersBuildComponents(ctx android.RegistrationContext) {
 }
 
 type libraryHeaderBazelHandler struct {
-	BazelHandler
-
 	module  *Module
 	library *libraryDecorator
 }
 
+var _ BazelHandler = (*libraryHeaderBazelHandler)(nil)
+
 func (handler *libraryHeaderBazelHandler) QueueBazelCall(ctx android.BaseModuleContext, label string) {
 	bazelCtx := ctx.Config().BazelContext
 	bazelCtx.QueueBazelRequest(label, cquery.GetCcInfo, android.GetConfigKey(ctx))
diff --git a/cc/object.go b/cc/object.go
index a3be6b113..0b9cf6f37 100644
--- a/cc/object.go
+++ b/cc/object.go
@@ -47,11 +47,11 @@ type objectLinker struct {
 }
 
 type objectBazelHandler struct {
-	BazelHandler
-
 	module *Module
 }
 
+var _ BazelHandler = (*objectBazelHandler)(nil)
+
 func (handler *objectBazelHandler) QueueBazelCall(ctx android.BaseModuleContext, label string) {
 	bazelCtx := ctx.Config().BazelContext
 	bazelCtx.QueueBazelRequest(label, cquery.GetOutputFiles, android.GetConfigKey(ctx))
diff --git a/cc/prebuilt.go b/cc/prebuilt.go
index e8c60baea..4120237d3 100644
--- a/cc/prebuilt.go
+++ b/cc/prebuilt.go
@@ -407,12 +407,12 @@ type prebuiltObjectLinker struct {
 }
 
 type prebuiltStaticLibraryBazelHandler struct {
-	BazelHandler
-
 	module  *Module
 	library *libraryDecorator
 }
 
+var _ BazelHandler = (*prebuiltStaticLibraryBazelHandler)(nil)
+
 func (h *prebuiltStaticLibraryBazelHandler) QueueBazelCall(ctx android.BaseModuleContext, label string) {
 	bazelCtx := ctx.Config().BazelContext
 	bazelCtx.QueueBazelRequest(label, cquery.GetCcInfo, android.GetConfigKey(ctx))
@@ -458,12 +458,12 @@ func (h *prebuiltStaticLibraryBazelHandler) ProcessBazelQueryResponse(ctx androi
 }
 
 type prebuiltSharedLibraryBazelHandler struct {
-	BazelHandler
-
 	module  *Module
 	library *libraryDecorator
 }
 
+var _ BazelHandler = (*prebuiltSharedLibraryBazelHandler)(nil)
+
 func (h *prebuiltSharedLibraryBazelHandler) QueueBazelCall(ctx android.BaseModuleContext, label string) {
 	bazelCtx := ctx.Config().BazelContext
 	bazelCtx.QueueBazelRequest(label, cquery.GetCcInfo, android.GetConfigKey(ctx))