diff --git a/mlir/examples/toy/Ch5/CMakeLists.txt b/mlir/examples/toy/Ch5/CMakeLists.txt
index 6b9ded359f666e..c5f5def5bf00cd 100644
--- a/mlir/examples/toy/Ch5/CMakeLists.txt
+++ b/mlir/examples/toy/Ch5/CMakeLists.txt
@@ -35,4 +35,5 @@ target_link_libraries(toyc-ch5
     MLIRIR
     MLIRParser
     MLIRPass
+    MLIRSupport
     MLIRTransforms)
diff --git a/mlir/examples/toy/Ch6/CMakeLists.txt b/mlir/examples/toy/Ch6/CMakeLists.txt
index 767f2e31750bf3..bfd8f8294fbb1f 100644
--- a/mlir/examples/toy/Ch6/CMakeLists.txt
+++ b/mlir/examples/toy/Ch6/CMakeLists.txt
@@ -41,6 +41,7 @@ target_link_libraries(toyc-ch6
     MLIRLLVMIR
     MLIRParser
     MLIRPass
+    MLIRSupport
     MLIRTargetLLVMIR
     MLIRTransforms
     LLVMOrcJIT
diff --git a/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt b/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
index 4c682b471015db..44e6dda2d5a3dd 100644
--- a/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
@@ -12,13 +12,19 @@ endif()
 
 add_mlir_conversion_library(MLIRGPUtoCUDATransforms
   ${SOURCES}
+
   LINK_LIBS
   LLVMNVPTXCodeGen
   LLVMNVPTXDesc
   LLVMNVPTXInfo
+  LLVMCore
+  LLVMMC
+  LLVMSupport
   MLIRGPU
+  MLIRIR
   MLIRLLVMIR
   MLIRNVVMIR
   MLIRPass
+  MLIRSupport
   MLIRTargetNVVMIR
   )
diff --git a/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt b/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
index 69c1c4e8b06d91..4ef9ab789106b6 100644
--- a/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
@@ -13,4 +13,5 @@ target_link_libraries(MLIRGPUtoVulkanTransforms
   MLIRSupport
   MLIRTransforms
   MLIRTranslation
+  LLVMSupport
   )
diff --git a/mlir/lib/Dialect/CMakeLists.txt b/mlir/lib/Dialect/CMakeLists.txt
index 180ab07c21d743..2d3ae3d71bb624 100644
--- a/mlir/lib/Dialect/CMakeLists.txt
+++ b/mlir/lib/Dialect/CMakeLists.txt
@@ -7,7 +7,7 @@ add_subdirectory(LoopOps)
 add_subdirectory(OpenMP)
 add_subdirectory(QuantOps)
 add_subdirectory(SDBM)
-add_subdirectory(Shape)
+#add_subdirectory(Shape)
 add_subdirectory(SPIRV)
 add_subdirectory(StandardOps)
 add_subdirectory(VectorOps)
diff --git a/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
index eb2aaf6930f23c..ec2512b712ec8a 100644
--- a/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
@@ -5,9 +5,13 @@ add_mlir_dialect_library(MLIRLoopOpsTransforms
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LoopOps
-  )
 
-target_link_libraries(MLIRLoopOpsTransforms
+  LINK_LIBS
+  MLIRAffineOps
+  MLIRIR
   MLIRPass
   MLIRLoopOps
+  MLIRStandardOps
+  MLIRSupport
+  LLVMSupport
   )
diff --git a/mlir/lib/Dialect/VectorOps/CMakeLists.txt b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
index 86910d0c3a6cd2..622ccb9e5791f6 100644
--- a/mlir/lib/Dialect/VectorOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
@@ -12,6 +12,7 @@ add_mlir_dialect_library(MLIRVectorOps
   MLIRVectorTransformPatternsIncGen
 
   LINK_LIBS
+  MLIREDSC
   MLIRIR
   MLIRStandardOps
   MLIRAffineOps
diff --git a/mlir/test/SDBM/CMakeLists.txt b/mlir/test/SDBM/CMakeLists.txt
index 028a6b33536e8d..c7ab71e89eecbe 100644
--- a/mlir/test/SDBM/CMakeLists.txt
+++ b/mlir/test/SDBM/CMakeLists.txt
@@ -8,6 +8,7 @@ target_link_libraries(mlir-sdbm-api-test
   PRIVATE
   MLIRIR
   MLIRSDBM
+  MLIRSupport
   LLVMCore
   LLVMSupport
 )
diff --git a/mlir/test/lib/TestDialect/CMakeLists.txt b/mlir/test/lib/TestDialect/CMakeLists.txt
index d79d4812866153..4dc1f24434547e 100644
--- a/mlir/test/lib/TestDialect/CMakeLists.txt
+++ b/mlir/test/lib/TestDialect/CMakeLists.txt
@@ -25,6 +25,7 @@ add_llvm_library(MLIRTestDialect
   MLIRIR
   MLIRLinalgTransforms
   MLIRPass
+  MLIRStandardOps
   MLIRTransforms
   MLIRTransformUtils
   LLVMSupport
diff --git a/mlir/tools/mlir-cpu-runner/CMakeLists.txt b/mlir/tools/mlir-cpu-runner/CMakeLists.txt
index ee56acd7831669..98d842a7faa17f 100644
--- a/mlir/tools/mlir-cpu-runner/CMakeLists.txt
+++ b/mlir/tools/mlir-cpu-runner/CMakeLists.txt
@@ -16,4 +16,7 @@ target_link_libraries(mlir-cpu-runner PRIVATE
   MLIRSupport
   LLVMCore
   LLVMSupport
-)
+  LLVMX86CodeGen
+  LLVMX86Desc
+  LLVMX86Info
+  )