diff --git a/stablehlo/integrations/c/CMakeLists.txt b/stablehlo/integrations/c/CMakeLists.txt
index 74595438aa..c690192ecf 100644
--- a/stablehlo/integrations/c/CMakeLists.txt
+++ b/stablehlo/integrations/c/CMakeLists.txt
@@ -28,6 +28,8 @@ add_mlir_public_c_api_library(ChloCAPI
 
   LINK_LIBS PUBLIC
   ChloOps
+
+  LINK_COMPONENTS PUBLIC
   LLVMSupport
 )
 
@@ -40,7 +42,6 @@ add_mlir_public_c_api_library(StablehloCAPI
   StablehloTypes.cpp
 
   LINK_LIBS PUBLIC
-  LLVMSupport
   MLIRCAPIIR
   MLIRIR
   MLIRSupport
@@ -51,6 +52,9 @@ add_mlir_public_c_api_library(StablehloCAPI
   StablehloReferenceConfiguration
   StablehloSerialization
   Version
+
+  LINK_COMPONENTS PUBLIC
+  LLVMSupport
 )
 
 add_mlir_public_c_api_library(VhloCAPI
diff --git a/stablehlo/reference/CMakeLists.txt b/stablehlo/reference/CMakeLists.txt
index b3a406b0af..fb7d01639b 100644
--- a/stablehlo/reference/CMakeLists.txt
+++ b/stablehlo/reference/CMakeLists.txt
@@ -169,10 +169,12 @@ add_mlir_library(StablehloReferenceProcessGrid
   ProcessGrid.cpp
 
   LINK_LIBS PUBLIC
-  LLVMSupport
   MLIRIR
   MLIRSupport
   StablehloReferenceTensor
+
+  LINK_COMPONENTS PUBLIC
+  LLVMSupport
 )
 
 add_mlir_library(StablehloReferenceScope