diff --git a/clang/unittests/AST/OMPStructuredBlockTest.cpp b/clang/unittests/AST/OMPStructuredBlockTest.cpp
index 7b2028b07c05..623bed388c02 100644
--- a/clang/unittests/AST/OMPStructuredBlockTest.cpp
+++ b/clang/unittests/AST/OMPStructuredBlockTest.cpp
@@ -14,6 +14,7 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/StmtOpenMP.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
+#include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Tooling/Tooling.h"
 #include "llvm/ADT/SmallString.h"
 #include "gmock/gmock.h"
@@ -25,8 +26,6 @@ using namespace tooling;
 
 namespace {
 
-AST_MATCHER(Stmt, isOMPStructuredBlock) { return Node.isOMPStructuredBlock(); }
-
 const ast_matchers::internal::VariadicDynCastAllOfMatcher<
     OMPExecutableDirective, OMPTargetDirective>
     ompTargetDirective;
@@ -37,10 +36,6 @@ StatementMatcher OMPInnermostStructuredBlockMatcher() {
       .bind("id");
 }
 
-AST_MATCHER(OMPExecutableDirective, isStandaloneDirective) {
-  return Node.isStandaloneDirective();
-}
-
 StatementMatcher OMPStandaloneDirectiveMatcher() {
   return stmt(ompExecutableDirective(isStandaloneDirective())).bind("id");
 }