diff --git a/flang/include/flang/Optimizer/Transforms/Factory.h b/flang/include/flang/Optimizer/Builder/Factory.h
rename from flang/include/flang/Optimizer/Transforms/Factory.h
rename to flang/include/flang/Optimizer/Builder/Factory.h
--- a/flang/include/flang/Optimizer/Transforms/Factory.h
+++ b/flang/include/flang/Optimizer/Builder/Factory.h
@@ -1,4 +1,4 @@
-//===-- Optimizer/Transforms/Factory.h --------------------------*- C++ -*-===//
+//===-- Optimizer/Builder/Factory.h -----------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef FORTRAN_OPTIMIZER_TRANSFORMS_FACTORY_H
-#define FORTRAN_OPTIMIZER_TRANSFORMS_FACTORY_H
+#ifndef FORTRAN_OPTIMIZER_BUILDER_FACTORY_H
+#define FORTRAN_OPTIMIZER_BUILDER_FACTORY_H
 
 #include "flang/Optimizer/Dialect/FIROps.h"
 #include "flang/Optimizer/Dialect/FIRType.h"
@@ -93,4 +93,4 @@
 
 } // namespace fir::factory
 
-#endif // FORTRAN_OPTIMIZER_TRANSFORMS_FACTORY_H
+#endif // FORTRAN_OPTIMIZER_BUILDER_FACTORY_H
diff --git a/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp b/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp
--- a/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp
+++ b/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp
@@ -9,9 +9,9 @@
 #include "PassDetail.h"
 #include "flang/Optimizer/Builder/BoxValue.h"
 #include "flang/Optimizer/Builder/FIRBuilder.h"
+#include "flang/Optimizer/Builder/Factory.h"
 #include "flang/Optimizer/Dialect/FIRDialect.h"
 #include "flang/Optimizer/Support/FIRContext.h"
-#include "flang/Optimizer/Transforms/Factory.h"
 #include "flang/Optimizer/Transforms/Passes.h"
 #include "mlir/Dialect/SCF/SCF.h"
 #include "mlir/Transforms/DialectConversion.h"