diff --git a/mlir/include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h b/mlir/include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h
--- a/mlir/include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h
+++ b/mlir/include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h
@@ -9,7 +9,7 @@
 #ifndef MLIR_CONVERSION_SHAPETOSTANDARD_SHAPETOSTANDARD_H_
 #define MLIR_CONVERSION_SHAPETOSTANDARD_SHAPETOSTANDARD_H_
 
-#include "mlir/Transforms/DialectConversion.h"
+#include <memory>
 
 namespace mlir {
 
@@ -17,6 +17,7 @@
 class ModuleOp;
 template <typename T>
 class OperationPass;
+class OwningRewritePatternList;
 
 void populateShapeToStandardConversionPatterns(
     OwningRewritePatternList &patterns, MLIRContext *ctx);
diff --git a/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp b/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp
--- a/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp
+++ b/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp
@@ -14,7 +14,8 @@
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/Transforms/DialectConversion.h"
 
-namespace mlir {
+using namespace mlir;
+
 namespace {
 
 /// Conversion patterns.
@@ -90,7 +91,7 @@
 
 } // namespace
 
-void populateShapeToStandardConversionPatterns(
+void mlir::populateShapeToStandardConversionPatterns(
     OwningRewritePatternList &patterns, MLIRContext *ctx) {
   // clang-format off
   patterns.insert<
@@ -99,8 +100,7 @@
   // clang-format on
 }
 
-std::unique_ptr<OperationPass<ModuleOp>> createConvertShapeToStandardPass() {
+std::unique_ptr<OperationPass<ModuleOp>>
+mlir::createConvertShapeToStandardPass() {
   return std::make_unique<ConvertShapeToStandardPass>();
 }
-
-} // namespace mlir