diff --git a/flang/include/flang/Optimizer/Dialect/FIROps.h b/flang/include/flang/Optimizer/Dialect/FIROps.h
--- a/flang/include/flang/Optimizer/Dialect/FIROps.h
+++ b/flang/include/flang/Optimizer/Dialect/FIROps.h
@@ -6,13 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef OPTIMIZER_DIALECT_FIROPS_H
-#define OPTIMIZER_DIALECT_FIROPS_H
+#ifndef FORTRAN_OPTIMIZER_DIALECT_FIROPS_H
+#define FORTRAN_OPTIMIZER_DIALECT_FIROPS_H
 
 #include "flang/Optimizer/Dialect/FIRType.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/Interfaces/LoopLikeInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
+
 
 using namespace mlir;
 
@@ -48,4 +50,4 @@
 #include "flang/Optimizer/Dialect/FIROps.h.inc"
 
 
-#endif // OPTIMIZER_DIALECT_FIROPS_H
+#endif // FORTRAN_OPTIMIZER_DIALECT_FIROPS_H