diff --git a/mlir/include/mlir/IR/CMakeLists.txt b/mlir/include/mlir/IR/CMakeLists.txt
--- a/mlir/include/mlir/IR/CMakeLists.txt
+++ b/mlir/include/mlir/IR/CMakeLists.txt
@@ -1,11 +1,2 @@
-set(LLVM_TARGET_DEFINITIONS OpAsmInterface.td)
-mlir_tablegen(OpAsmInterface.h.inc -gen-op-interface-decls)
-mlir_tablegen(OpAsmInterface.cpp.inc -gen-op-interface-defs)
-add_public_tablegen_target(MLIROpAsmInterfacesIncGen)
-add_dependencies(mlir-generic-headers MLIROpAsmInterfacesIncGen)
-
-set(LLVM_TARGET_DEFINITIONS SymbolInterfaces.td)
-mlir_tablegen(SymbolInterfaces.h.inc -gen-op-interface-decls)
-mlir_tablegen(SymbolInterfaces.cpp.inc -gen-op-interface-defs)
-add_public_tablegen_target(MLIRSymbolInterfacesIncGen)
-add_dependencies(mlir-generic-headers MLIRSymbolInterfacesIncGen)
+add_mlir_interface(OpAsmInterface)
+add_mlir_interface(SymbolInterfaces)
diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt
--- a/mlir/lib/IR/CMakeLists.txt
+++ b/mlir/lib/IR/CMakeLists.txt
@@ -31,7 +31,7 @@
 
   DEPENDS
   MLIRCallInterfacesIncGen
-  MLIROpAsmInterfacesIncGen
+  MLIROpAsmInterfaceIncGen
   MLIRSymbolInterfacesIncGen
 
   LINK_LIBS PUBLIC