diff --git a/mlir/tools/mlir-opt/CMakeLists.txt b/mlir/tools/mlir-opt/CMakeLists.txt
--- a/mlir/tools/mlir-opt/CMakeLists.txt
+++ b/mlir/tools/mlir-opt/CMakeLists.txt
@@ -30,7 +30,6 @@
   MLIRTestTransforms
   MLIRSupport
   MLIRIR
-  MLIROptLib
   )
 
 # Exclude from libMLIR.so because this has static options intended for
@@ -42,6 +41,10 @@
 
   LINK_LIBS
   ${LIBS}
+
+  DEPENDS
+  intrinsics_gen
+  mlir-headers
   )
 
 add_llvm_tool(mlir-opt