diff --git a/cc/library_headers.go b/cc/library_headers.go
index 6fd9568..dd2f06c 100644
--- a/cc/library_headers.go
+++ b/cc/library_headers.go
@@ -49,12 +49,12 @@
 }
 
 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))