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 727331f23a8a8d..9b1e8aeec28d4b 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
     )
diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
index 28cab5345f3ce5..750281eb4e6e0a 100644
--- a/mlir/lib/Analysis/CMakeLists.txt
+++ b/mlir/lib/Analysis/CMakeLists.txt
@@ -13,9 +13,22 @@ set(LLVM_OPTIONAL_SOURCES
   Verifier.cpp
   )
 
+add_mlir_library(MLIRControlFlowAnalysis
+  ControlFlowInterfaces.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
+
+  DEPENDS
+  MLIRControlFlowInterfacesIncGen
+  )
+target_link_libraries(MLIRControlFlowAnalysis
+  PUBLIC
+  MLIRIR
+  )
+
 add_mlir_library(MLIRAnalysis
   CallGraph.cpp
-  ControlFlowInterfaces.cpp
   InferTypeOpInterface.cpp
   Liveness.cpp
   SliceAnalysis.cpp
@@ -27,7 +40,6 @@ add_mlir_library(MLIRAnalysis
 
   DEPENDS
   MLIRCallOpInterfacesIncGen
-  MLIRControlFlowInterfacesIncGen
   MLIRTypeInferOpInterfaceIncGen
   )
 
@@ -49,7 +61,6 @@ add_mlir_library(MLIRLoopAnalysis
 
   DEPENDS
   MLIRCallOpInterfacesIncGen
-  MLIRControlFlowInterfacesIncGen
   MLIRTypeInferOpInterfaceIncGen
   )
 
diff --git a/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt b/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
index 67b0bf27d8d034..afc39066a03db0 100644
--- a/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
@@ -13,9 +13,17 @@ endif()
 add_mlir_conversion_library(MLIRGPUtoCUDATransforms ${SOURCES})
 target_link_libraries(MLIRGPUtoCUDATransforms
   PUBLIC
+  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 72680390c9d01a..eeafe5f37b971d 100644
--- a/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
@@ -14,4 +14,5 @@ target_link_libraries(MLIRGPUtoVulkanTransforms
   MLIRSupport
   MLIRTransforms
   MLIRTranslation
+  LLVMSupport
   )
diff --git a/mlir/lib/Dialect/CMakeLists.txt b/mlir/lib/Dialect/CMakeLists.txt
index 2bb137f4795bf8..192616a1409faf 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/LLVMIR/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
index 8c030f30244c78..c9b739523cb4f5 100644
--- a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
+++ b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
@@ -15,6 +15,7 @@ target_link_libraries(MLIRLLVMIR
   LLVMCore
   LLVMSupport
   LLVMFrontendOpenMP
+  MLIRAnalysis
   MLIROpenMP
   MLIRIR
   MLIRSupport
diff --git a/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
index db559a37dbfbb7..1b6e6d2327118f 100644
--- a/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
@@ -6,9 +6,13 @@ add_mlir_dialect_library(MLIRLoopOpsTransforms
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LoopOps
   )
-
 target_link_libraries(MLIRLoopOpsTransforms
   PUBLIC
+  MLIRAffineOps
+  MLIRIR
   MLIRPass
   MLIRLoopOps
+  MLIRStandardOps
+  MLIRSupport
+  LLVMSupport
   )
diff --git a/mlir/lib/Dialect/StandardOps/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
index 54a9a8aa7f14df..02f1da8c089e20 100644
--- a/mlir/lib/Dialect/StandardOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
@@ -13,6 +13,7 @@ add_mlir_dialect_library(MLIRStandardOps
   )
 target_link_libraries(MLIRStandardOps
   PUBLIC
+  MLIRControlFlowAnalysis
   MLIREDSC
   MLIRIR
   LLVMSupport
diff --git a/mlir/lib/Dialect/VectorOps/CMakeLists.txt b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
index 425eec35d37fb5..4810e3c4bf3bbf 100644
--- a/mlir/lib/Dialect/VectorOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
@@ -13,6 +13,7 @@ add_mlir_dialect_library(MLIRVectorOps
   )
 target_link_libraries(MLIRVectorOps
   PUBLIC
+  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 e666f9709683dd..102d4f9fc2a9d2 100644
--- a/mlir/test/lib/TestDialect/CMakeLists.txt
+++ b/mlir/test/lib/TestDialect/CMakeLists.txt
@@ -27,6 +27,7 @@ target_link_libraries(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
+  )