diff --git a/mlir/include/mlir/Support/LLVM.h b/mlir/include/mlir/Support/LLVM.h
--- a/mlir/include/mlir/Support/LLVM.h
+++ b/mlir/include/mlir/Support/LLVM.h
@@ -96,12 +96,14 @@
 namespace mlir {
 // Casting operators.
 using llvm::cast;
+using llvm::cast_if_present;
 using llvm::cast_or_null;
 using llvm::dyn_cast;
 using llvm::dyn_cast_if_present;
 using llvm::dyn_cast_or_null;
 using llvm::isa;
 using llvm::isa_and_nonnull;
+using llvm::isa_and_present;
 
 // String types
 using llvm::SmallString;
diff --git a/mlir/unittests/IR/TypeTest.cpp b/mlir/unittests/IR/TypeTest.cpp
--- a/mlir/unittests/IR/TypeTest.cpp
+++ b/mlir/unittests/IR/TypeTest.cpp
@@ -50,7 +50,7 @@
 
   EXPECT_TRUE(isa<IntegerType>(intTy));
   EXPECT_FALSE(isa<FunctionType>(intTy));
-  EXPECT_FALSE(llvm::isa_and_present<IntegerType>(nullTy));
+  EXPECT_FALSE(isa_and_present<IntegerType>(nullTy));
   EXPECT_TRUE(isa<MiddleType>(middleTy));
   EXPECT_FALSE(isa<LeafType>(middleTy));
   EXPECT_TRUE(isa<MiddleType>(leafTy));
@@ -59,9 +59,8 @@
 
   EXPECT_TRUE(static_cast<bool>(dyn_cast<IntegerType>(intTy)));
   EXPECT_FALSE(static_cast<bool>(dyn_cast<FunctionType>(intTy)));
-  EXPECT_FALSE(static_cast<bool>(llvm::cast_if_present<FunctionType>(nullTy)));
-  EXPECT_FALSE(
-      static_cast<bool>(llvm::dyn_cast_if_present<IntegerType>(nullTy)));
+  EXPECT_FALSE(static_cast<bool>(cast_if_present<FunctionType>(nullTy)));
+  EXPECT_FALSE(static_cast<bool>(dyn_cast_if_present<IntegerType>(nullTy)));
 
   EXPECT_EQ(8u, cast<IntegerType>(intTy).getWidth());
 }