diff --git a/mlir/examples/toy/Ch1/include/toy/AST.h b/mlir/examples/toy/Ch1/include/toy/AST.h
index 294c15be3589..79c9e191ce7d 100644
--- a/mlir/examples/toy/Ch1/include/toy/AST.h
+++ b/mlir/examples/toy/Ch1/include/toy/AST.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_AST_H_
-#define MLIR_TUTORIAL_TOY_AST_H_
+#ifndef TOY_AST_H
+#define TOY_AST_H
 
 #include "toy/Lexer.h"
 
@@ -239,4 +239,4 @@ void dump(ModuleAST &);
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_AST_H_
+#endif // TOY_AST_H
diff --git a/mlir/examples/toy/Ch1/include/toy/Lexer.h b/mlir/examples/toy/Ch1/include/toy/Lexer.h
index 29635e436db0..ecbb3b4e0e58 100644
--- a/mlir/examples/toy/Ch1/include/toy/Lexer.h
+++ b/mlir/examples/toy/Ch1/include/toy/Lexer.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_LEXER_H_
-#define MLIR_TUTORIAL_TOY_LEXER_H_
+#ifndef TOY_LEXER_H
+#define TOY_LEXER_H
 
 #include "llvm/ADT/StringRef.h"
 
@@ -229,4 +229,4 @@ private:
 };
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_LEXER_H_
+#endif // TOY_LEXER_H
diff --git a/mlir/examples/toy/Ch1/include/toy/Parser.h b/mlir/examples/toy/Ch1/include/toy/Parser.h
index 886313c19410..6674d45914a3 100644
--- a/mlir/examples/toy/Ch1/include/toy/Parser.h
+++ b/mlir/examples/toy/Ch1/include/toy/Parser.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_PARSER_H
-#define MLIR_TUTORIAL_TOY_PARSER_H
+#ifndef TOY_PARSER_H
+#define TOY_PARSER_H
 
 #include "toy/AST.h"
 #include "toy/Lexer.h"
@@ -486,4 +486,4 @@ private:
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_PARSER_H
+#endif // TOY_PARSER_H
diff --git a/mlir/examples/toy/Ch2/include/toy/AST.h b/mlir/examples/toy/Ch2/include/toy/AST.h
index 294c15be3589..79c9e191ce7d 100644
--- a/mlir/examples/toy/Ch2/include/toy/AST.h
+++ b/mlir/examples/toy/Ch2/include/toy/AST.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_AST_H_
-#define MLIR_TUTORIAL_TOY_AST_H_
+#ifndef TOY_AST_H
+#define TOY_AST_H
 
 #include "toy/Lexer.h"
 
@@ -239,4 +239,4 @@ void dump(ModuleAST &);
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_AST_H_
+#endif // TOY_AST_H
diff --git a/mlir/examples/toy/Ch2/include/toy/Lexer.h b/mlir/examples/toy/Ch2/include/toy/Lexer.h
index ae90982c59c3..3c59cd9805fe 100644
--- a/mlir/examples/toy/Ch2/include/toy/Lexer.h
+++ b/mlir/examples/toy/Ch2/include/toy/Lexer.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_LEXER_H_
-#define MLIR_TUTORIAL_TOY_LEXER_H_
+#ifndef TOY_LEXER_H
+#define TOY_LEXER_H
 
 #include "llvm/ADT/StringRef.h"
 
@@ -229,4 +229,4 @@ private:
 };
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_LEXER_H_
+#endif // TOY_LEXER_H
diff --git a/mlir/examples/toy/Ch2/include/toy/MLIRGen.h b/mlir/examples/toy/Ch2/include/toy/MLIRGen.h
index 6d7d5ae913ec..ca91872dadc6 100644
--- a/mlir/examples/toy/Ch2/include/toy/MLIRGen.h
+++ b/mlir/examples/toy/Ch2/include/toy/MLIRGen.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_MLIRGEN_H_
-#define MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#ifndef TOY_MLIRGEN_H
+#define TOY_MLIRGEN_H
 
 #include <memory>
 
@@ -29,4 +29,4 @@ class ModuleAST;
 mlir::OwningModuleRef mlirGen(mlir::MLIRContext &context, ModuleAST &moduleAST);
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#endif // TOY_MLIRGEN_H
diff --git a/mlir/examples/toy/Ch2/include/toy/Parser.h b/mlir/examples/toy/Ch2/include/toy/Parser.h
index 886313c19410..6674d45914a3 100644
--- a/mlir/examples/toy/Ch2/include/toy/Parser.h
+++ b/mlir/examples/toy/Ch2/include/toy/Parser.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_PARSER_H
-#define MLIR_TUTORIAL_TOY_PARSER_H
+#ifndef TOY_PARSER_H
+#define TOY_PARSER_H
 
 #include "toy/AST.h"
 #include "toy/Lexer.h"
@@ -486,4 +486,4 @@ private:
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_PARSER_H
+#endif // TOY_PARSER_H
diff --git a/mlir/examples/toy/Ch3/include/toy/AST.h b/mlir/examples/toy/Ch3/include/toy/AST.h
index 294c15be3589..79c9e191ce7d 100644
--- a/mlir/examples/toy/Ch3/include/toy/AST.h
+++ b/mlir/examples/toy/Ch3/include/toy/AST.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_AST_H_
-#define MLIR_TUTORIAL_TOY_AST_H_
+#ifndef TOY_AST_H
+#define TOY_AST_H
 
 #include "toy/Lexer.h"
 
@@ -239,4 +239,4 @@ void dump(ModuleAST &);
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_AST_H_
+#endif // TOY_AST_H
diff --git a/mlir/examples/toy/Ch3/include/toy/Lexer.h b/mlir/examples/toy/Ch3/include/toy/Lexer.h
index ae90982c59c3..3c59cd9805fe 100644
--- a/mlir/examples/toy/Ch3/include/toy/Lexer.h
+++ b/mlir/examples/toy/Ch3/include/toy/Lexer.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_LEXER_H_
-#define MLIR_TUTORIAL_TOY_LEXER_H_
+#ifndef TOY_LEXER_H
+#define TOY_LEXER_H
 
 #include "llvm/ADT/StringRef.h"
 
@@ -229,4 +229,4 @@ private:
 };
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_LEXER_H_
+#endif // TOY_LEXER_H
diff --git a/mlir/examples/toy/Ch3/include/toy/MLIRGen.h b/mlir/examples/toy/Ch3/include/toy/MLIRGen.h
index 6d7d5ae913ec..ca91872dadc6 100644
--- a/mlir/examples/toy/Ch3/include/toy/MLIRGen.h
+++ b/mlir/examples/toy/Ch3/include/toy/MLIRGen.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_MLIRGEN_H_
-#define MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#ifndef TOY_MLIRGEN_H
+#define TOY_MLIRGEN_H
 
 #include <memory>
 
@@ -29,4 +29,4 @@ class ModuleAST;
 mlir::OwningModuleRef mlirGen(mlir::MLIRContext &context, ModuleAST &moduleAST);
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#endif // TOY_MLIRGEN_H
diff --git a/mlir/examples/toy/Ch3/include/toy/Parser.h b/mlir/examples/toy/Ch3/include/toy/Parser.h
index 886313c19410..6674d45914a3 100644
--- a/mlir/examples/toy/Ch3/include/toy/Parser.h
+++ b/mlir/examples/toy/Ch3/include/toy/Parser.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_PARSER_H
-#define MLIR_TUTORIAL_TOY_PARSER_H
+#ifndef TOY_PARSER_H
+#define TOY_PARSER_H
 
 #include "toy/AST.h"
 #include "toy/Lexer.h"
@@ -486,4 +486,4 @@ private:
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_PARSER_H
+#endif // TOY_PARSER_H
diff --git a/mlir/examples/toy/Ch4/include/toy/AST.h b/mlir/examples/toy/Ch4/include/toy/AST.h
index 294c15be3589..79c9e191ce7d 100644
--- a/mlir/examples/toy/Ch4/include/toy/AST.h
+++ b/mlir/examples/toy/Ch4/include/toy/AST.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_AST_H_
-#define MLIR_TUTORIAL_TOY_AST_H_
+#ifndef TOY_AST_H
+#define TOY_AST_H
 
 #include "toy/Lexer.h"
 
@@ -239,4 +239,4 @@ void dump(ModuleAST &);
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_AST_H_
+#endif // TOY_AST_H
diff --git a/mlir/examples/toy/Ch4/include/toy/Lexer.h b/mlir/examples/toy/Ch4/include/toy/Lexer.h
index ae90982c59c3..3c59cd9805fe 100644
--- a/mlir/examples/toy/Ch4/include/toy/Lexer.h
+++ b/mlir/examples/toy/Ch4/include/toy/Lexer.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_LEXER_H_
-#define MLIR_TUTORIAL_TOY_LEXER_H_
+#ifndef TOY_LEXER_H
+#define TOY_LEXER_H
 
 #include "llvm/ADT/StringRef.h"
 
@@ -229,4 +229,4 @@ private:
 };
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_LEXER_H_
+#endif // TOY_LEXER_H
diff --git a/mlir/examples/toy/Ch4/include/toy/MLIRGen.h b/mlir/examples/toy/Ch4/include/toy/MLIRGen.h
index 6d7d5ae913ec..ca91872dadc6 100644
--- a/mlir/examples/toy/Ch4/include/toy/MLIRGen.h
+++ b/mlir/examples/toy/Ch4/include/toy/MLIRGen.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_MLIRGEN_H_
-#define MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#ifndef TOY_MLIRGEN_H
+#define TOY_MLIRGEN_H
 
 #include <memory>
 
@@ -29,4 +29,4 @@ class ModuleAST;
 mlir::OwningModuleRef mlirGen(mlir::MLIRContext &context, ModuleAST &moduleAST);
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#endif // TOY_MLIRGEN_H
diff --git a/mlir/examples/toy/Ch4/include/toy/Parser.h b/mlir/examples/toy/Ch4/include/toy/Parser.h
index 886313c19410..6674d45914a3 100644
--- a/mlir/examples/toy/Ch4/include/toy/Parser.h
+++ b/mlir/examples/toy/Ch4/include/toy/Parser.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_PARSER_H
-#define MLIR_TUTORIAL_TOY_PARSER_H
+#ifndef TOY_PARSER_H
+#define TOY_PARSER_H
 
 #include "toy/AST.h"
 #include "toy/Lexer.h"
@@ -486,4 +486,4 @@ private:
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_PARSER_H
+#endif // TOY_PARSER_H
diff --git a/mlir/examples/toy/Ch4/include/toy/Passes.h b/mlir/examples/toy/Ch4/include/toy/Passes.h
index b95e0f095b9f..0eafa08f8239 100644
--- a/mlir/examples/toy/Ch4/include/toy/Passes.h
+++ b/mlir/examples/toy/Ch4/include/toy/Passes.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_PASSES_H
-#define MLIR_TUTORIAL_TOY_PASSES_H
+#ifndef TOY_PASSES_H
+#define TOY_PASSES_H
 
 #include <memory>
 
@@ -23,4 +23,4 @@ std::unique_ptr<Pass> createShapeInferencePass();
 } // namespace toy
 } // namespace mlir
 
-#endif // MLIR_TUTORIAL_TOY_PASSES_H
+#endif // TOY_PASSES_H
diff --git a/mlir/examples/toy/Ch5/include/toy/AST.h b/mlir/examples/toy/Ch5/include/toy/AST.h
index 294c15be3589..79c9e191ce7d 100644
--- a/mlir/examples/toy/Ch5/include/toy/AST.h
+++ b/mlir/examples/toy/Ch5/include/toy/AST.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_AST_H_
-#define MLIR_TUTORIAL_TOY_AST_H_
+#ifndef TOY_AST_H
+#define TOY_AST_H
 
 #include "toy/Lexer.h"
 
@@ -239,4 +239,4 @@ void dump(ModuleAST &);
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_AST_H_
+#endif // TOY_AST_H
diff --git a/mlir/examples/toy/Ch5/include/toy/Lexer.h b/mlir/examples/toy/Ch5/include/toy/Lexer.h
index ae90982c59c3..3c59cd9805fe 100644
--- a/mlir/examples/toy/Ch5/include/toy/Lexer.h
+++ b/mlir/examples/toy/Ch5/include/toy/Lexer.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_LEXER_H_
-#define MLIR_TUTORIAL_TOY_LEXER_H_
+#ifndef TOY_LEXER_H
+#define TOY_LEXER_H
 
 #include "llvm/ADT/StringRef.h"
 
@@ -229,4 +229,4 @@ private:
 };
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_LEXER_H_
+#endif // TOY_LEXER_H
diff --git a/mlir/examples/toy/Ch5/include/toy/MLIRGen.h b/mlir/examples/toy/Ch5/include/toy/MLIRGen.h
index 6d7d5ae913ec..ca91872dadc6 100644
--- a/mlir/examples/toy/Ch5/include/toy/MLIRGen.h
+++ b/mlir/examples/toy/Ch5/include/toy/MLIRGen.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_MLIRGEN_H_
-#define MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#ifndef TOY_MLIRGEN_H
+#define TOY_MLIRGEN_H
 
 #include <memory>
 
@@ -29,4 +29,4 @@ class ModuleAST;
 mlir::OwningModuleRef mlirGen(mlir::MLIRContext &context, ModuleAST &moduleAST);
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#endif // TOY_MLIRGEN_H
diff --git a/mlir/examples/toy/Ch5/include/toy/Parser.h b/mlir/examples/toy/Ch5/include/toy/Parser.h
index 886313c19410..6674d45914a3 100644
--- a/mlir/examples/toy/Ch5/include/toy/Parser.h
+++ b/mlir/examples/toy/Ch5/include/toy/Parser.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_PARSER_H
-#define MLIR_TUTORIAL_TOY_PARSER_H
+#ifndef TOY_PARSER_H
+#define TOY_PARSER_H
 
 #include "toy/AST.h"
 #include "toy/Lexer.h"
@@ -486,4 +486,4 @@ private:
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_PARSER_H
+#endif // TOY_PARSER_H
diff --git a/mlir/examples/toy/Ch5/include/toy/Passes.h b/mlir/examples/toy/Ch5/include/toy/Passes.h
index 2f496364b62a..02a83cf48303 100644
--- a/mlir/examples/toy/Ch5/include/toy/Passes.h
+++ b/mlir/examples/toy/Ch5/include/toy/Passes.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_PASSES_H
-#define MLIR_TUTORIAL_TOY_PASSES_H
+#ifndef TOY_PASSES_H
+#define TOY_PASSES_H
 
 #include <memory>
 
@@ -28,4 +28,4 @@ std::unique_ptr<mlir::Pass> createLowerToAffinePass();
 } // namespace toy
 } // namespace mlir
 
-#endif // MLIR_TUTORIAL_TOY_PASSES_H
+#endif // TOY_PASSES_H
diff --git a/mlir/examples/toy/Ch6/include/toy/AST.h b/mlir/examples/toy/Ch6/include/toy/AST.h
index 294c15be3589..79c9e191ce7d 100644
--- a/mlir/examples/toy/Ch6/include/toy/AST.h
+++ b/mlir/examples/toy/Ch6/include/toy/AST.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_AST_H_
-#define MLIR_TUTORIAL_TOY_AST_H_
+#ifndef TOY_AST_H
+#define TOY_AST_H
 
 #include "toy/Lexer.h"
 
@@ -239,4 +239,4 @@ void dump(ModuleAST &);
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_AST_H_
+#endif // TOY_AST_H
diff --git a/mlir/examples/toy/Ch6/include/toy/Lexer.h b/mlir/examples/toy/Ch6/include/toy/Lexer.h
index ae90982c59c3..3c59cd9805fe 100644
--- a/mlir/examples/toy/Ch6/include/toy/Lexer.h
+++ b/mlir/examples/toy/Ch6/include/toy/Lexer.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_LEXER_H_
-#define MLIR_TUTORIAL_TOY_LEXER_H_
+#ifndef TOY_LEXER_H
+#define TOY_LEXER_H
 
 #include "llvm/ADT/StringRef.h"
 
@@ -229,4 +229,4 @@ private:
 };
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_LEXER_H_
+#endif // TOY_LEXER_H
diff --git a/mlir/examples/toy/Ch6/include/toy/MLIRGen.h b/mlir/examples/toy/Ch6/include/toy/MLIRGen.h
index 6d7d5ae913ec..ca91872dadc6 100644
--- a/mlir/examples/toy/Ch6/include/toy/MLIRGen.h
+++ b/mlir/examples/toy/Ch6/include/toy/MLIRGen.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_MLIRGEN_H_
-#define MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#ifndef TOY_MLIRGEN_H
+#define TOY_MLIRGEN_H
 
 #include <memory>
 
@@ -29,4 +29,4 @@ class ModuleAST;
 mlir::OwningModuleRef mlirGen(mlir::MLIRContext &context, ModuleAST &moduleAST);
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#endif // TOY_MLIRGEN_H
diff --git a/mlir/examples/toy/Ch6/include/toy/Parser.h b/mlir/examples/toy/Ch6/include/toy/Parser.h
index 886313c19410..6674d45914a3 100644
--- a/mlir/examples/toy/Ch6/include/toy/Parser.h
+++ b/mlir/examples/toy/Ch6/include/toy/Parser.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_PARSER_H
-#define MLIR_TUTORIAL_TOY_PARSER_H
+#ifndef TOY_PARSER_H
+#define TOY_PARSER_H
 
 #include "toy/AST.h"
 #include "toy/Lexer.h"
@@ -486,4 +486,4 @@ private:
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_PARSER_H
+#endif // TOY_PARSER_H
diff --git a/mlir/examples/toy/Ch6/include/toy/Passes.h b/mlir/examples/toy/Ch6/include/toy/Passes.h
index b52f236f81e0..62471dde46d8 100644
--- a/mlir/examples/toy/Ch6/include/toy/Passes.h
+++ b/mlir/examples/toy/Ch6/include/toy/Passes.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_PASSES_H
-#define MLIR_TUTORIAL_TOY_PASSES_H
+#ifndef TOY_PASSES_H
+#define TOY_PASSES_H
 
 #include <memory>
 
@@ -32,4 +32,4 @@ std::unique_ptr<mlir::Pass> createLowerToLLVMPass();
 } // namespace toy
 } // namespace mlir
 
-#endif // MLIR_TUTORIAL_TOY_PASSES_H
+#endif // TOY_PASSES_H
diff --git a/mlir/examples/toy/Ch7/include/toy/AST.h b/mlir/examples/toy/Ch7/include/toy/AST.h
index 0a2e36b0bd27..c59c54d342d7 100644
--- a/mlir/examples/toy/Ch7/include/toy/AST.h
+++ b/mlir/examples/toy/Ch7/include/toy/AST.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_AST_H_
-#define MLIR_TUTORIAL_TOY_AST_H_
+#ifndef TOY_AST_H
+#define TOY_AST_H
 
 #include "toy/Lexer.h"
 
@@ -305,4 +305,4 @@ void dump(ModuleAST &);
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_AST_H_
+#endif // TOY_AST_H
diff --git a/mlir/examples/toy/Ch7/include/toy/Lexer.h b/mlir/examples/toy/Ch7/include/toy/Lexer.h
index 40fd0548fe17..a3fde91a357a 100644
--- a/mlir/examples/toy/Ch7/include/toy/Lexer.h
+++ b/mlir/examples/toy/Ch7/include/toy/Lexer.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_LEXER_H_
-#define MLIR_TUTORIAL_TOY_LEXER_H_
+#ifndef TOY_LEXER_H
+#define TOY_LEXER_H
 
 #include "llvm/ADT/StringRef.h"
 
@@ -232,4 +232,4 @@ private:
 };
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_LEXER_H_
+#endif // TOY_LEXER_H
diff --git a/mlir/examples/toy/Ch7/include/toy/MLIRGen.h b/mlir/examples/toy/Ch7/include/toy/MLIRGen.h
index 6d7d5ae913ec..ca91872dadc6 100644
--- a/mlir/examples/toy/Ch7/include/toy/MLIRGen.h
+++ b/mlir/examples/toy/Ch7/include/toy/MLIRGen.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_MLIRGEN_H_
-#define MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#ifndef TOY_MLIRGEN_H
+#define TOY_MLIRGEN_H
 
 #include <memory>
 
@@ -29,4 +29,4 @@ class ModuleAST;
 mlir::OwningModuleRef mlirGen(mlir::MLIRContext &context, ModuleAST &moduleAST);
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_MLIRGEN_H_
+#endif // TOY_MLIRGEN_H
diff --git a/mlir/examples/toy/Ch7/include/toy/Parser.h b/mlir/examples/toy/Ch7/include/toy/Parser.h
index 683b426169e7..bbca92e957fb 100644
--- a/mlir/examples/toy/Ch7/include/toy/Parser.h
+++ b/mlir/examples/toy/Ch7/include/toy/Parser.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_PARSER_H
-#define MLIR_TUTORIAL_TOY_PARSER_H
+#ifndef TOY_PARSER_H
+#define TOY_PARSER_H
 
 #include "toy/AST.h"
 #include "toy/Lexer.h"
@@ -680,4 +680,4 @@ private:
 
 } // namespace toy
 
-#endif // MLIR_TUTORIAL_TOY_PARSER_H
+#endif // TOY_PARSER_H
diff --git a/mlir/examples/toy/Ch7/include/toy/Passes.h b/mlir/examples/toy/Ch7/include/toy/Passes.h
index b52f236f81e0..62471dde46d8 100644
--- a/mlir/examples/toy/Ch7/include/toy/Passes.h
+++ b/mlir/examples/toy/Ch7/include/toy/Passes.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TUTORIAL_TOY_PASSES_H
-#define MLIR_TUTORIAL_TOY_PASSES_H
+#ifndef TOY_PASSES_H
+#define TOY_PASSES_H
 
 #include <memory>
 
@@ -32,4 +32,4 @@ std::unique_ptr<mlir::Pass> createLowerToLLVMPass();
 } // namespace toy
 } // namespace mlir
 
-#endif // MLIR_TUTORIAL_TOY_PASSES_H
+#endif // TOY_PASSES_H
diff --git a/mlir/include/mlir-c/Conversion.h b/mlir/include/mlir-c/Conversion.h
index b69c41710446..88c5143ad4f0 100644
--- a/mlir/include/mlir-c/Conversion.h
+++ b/mlir/include/mlir-c/Conversion.h
@@ -12,11 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_C_CONVERSIONS_H
-#define MLIR_C_CONVERSIONS_H
+#ifndef MLIR_C_CONVERSION_H
+#define MLIR_C_CONVERSION_H
 
 #include "mlir-c/Support.h"
 
 #include "mlir/Conversion/Passes.capi.h.inc"
 
-#endif // MLIR_C_CONVERSIONS_H
+#endif // MLIR_C_CONVERSION_H
diff --git a/mlir/include/mlir-c/Dialect/SparseTensor.h b/mlir/include/mlir-c/Dialect/SparseTensor.h
index 16d932c16bdb..68d72b917866 100644
--- a/mlir/include/mlir-c/Dialect/SparseTensor.h
+++ b/mlir/include/mlir-c/Dialect/SparseTensor.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_C_DIALECT_SPARSE_TENSOR_H
-#define MLIR_C_DIALECT_SPARSE_TENSOR_H
+#ifndef MLIR_C_DIALECT_SPARSETENSOR_H
+#define MLIR_C_DIALECT_SPARSETENSOR_H
 
 #include "mlir-c/AffineMap.h"
 #include "mlir-c/Registration.h"
@@ -76,4 +76,4 @@ mlirSparseTensorEncodingAttrGetIndexBitWidth(MlirAttribute attr);
 
 #include "mlir/Dialect/SparseTensor/Transforms/Passes.capi.h.inc"
 
-#endif // MLIR_C_DIALECT_SPARSE_TENSOR_H
+#endif // MLIR_C_DIALECT_SPARSETENSOR_H
diff --git a/mlir/include/mlir-c/ExecutionEngine.h b/mlir/include/mlir-c/ExecutionEngine.h
index cd3df8ebf31f..adb4e823e11d 100644
--- a/mlir/include/mlir-c/ExecutionEngine.h
+++ b/mlir/include/mlir-c/ExecutionEngine.h
@@ -87,4 +87,4 @@ mlirExecutionEngineDumpToObjectFile(MlirExecutionEngine jit,
 }
 #endif
 
-#endif // EXECUTIONENGINE_H
+#endif // MLIR_C_EXECUTIONENGINE_H
diff --git a/mlir/include/mlir-c/Interfaces.h b/mlir/include/mlir-c/Interfaces.h
index 87862834201d..233f828b924c 100644
--- a/mlir/include/mlir-c/Interfaces.h
+++ b/mlir/include/mlir-c/Interfaces.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_C_DIALECT_H
-#define MLIR_C_DIALECT_H
+#ifndef MLIR_C_INTERFACES_H
+#define MLIR_C_INTERFACES_H
 
 #include "mlir-c/IR.h"
 #include "mlir-c/Support.h"
@@ -64,4 +64,4 @@ MLIR_CAPI_EXPORTED MlirLogicalResult mlirInferTypeOpInterfaceInferReturnTypes(
 }
 #endif
 
-#endif // MLIR_C_DIALECT_H
+#endif // MLIR_C_INTERFACES_H
diff --git a/mlir/include/mlir/Analysis/AffineAnalysis.h b/mlir/include/mlir/Analysis/AffineAnalysis.h
index 4c10bed1690c..ff0f99a1e593 100644
--- a/mlir/include/mlir/Analysis/AffineAnalysis.h
+++ b/mlir/include/mlir/Analysis/AffineAnalysis.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_ANALYSIS_AFFINE_ANALYSIS_H
-#define MLIR_ANALYSIS_AFFINE_ANALYSIS_H
+#ifndef MLIR_ANALYSIS_AFFINEANALYSIS_H
+#define MLIR_ANALYSIS_AFFINEANALYSIS_H
 
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
@@ -185,4 +185,4 @@ void getDependenceComponents(
 
 } // namespace mlir
 
-#endif // MLIR_ANALYSIS_AFFINE_ANALYSIS_H
+#endif // MLIR_ANALYSIS_AFFINEANALYSIS_H
diff --git a/mlir/include/mlir/Analysis/LoopAnalysis.h b/mlir/include/mlir/Analysis/LoopAnalysis.h
index 3797398e58e0..b3274356f4d4 100644
--- a/mlir/include/mlir/Analysis/LoopAnalysis.h
+++ b/mlir/include/mlir/Analysis/LoopAnalysis.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_ANALYSIS_LOOP_ANALYSIS_H
-#define MLIR_ANALYSIS_LOOP_ANALYSIS_H
+#ifndef MLIR_ANALYSIS_LOOPANALYSIS_H
+#define MLIR_ANALYSIS_LOOPANALYSIS_H
 
 #include "mlir/Support/LLVM.h"
 #include "llvm/ADT/ArrayRef.h"
@@ -115,4 +115,4 @@ Value matchReduction(ArrayRef<BlockArgument> iterCarriedArgs, unsigned redPos,
                      SmallVectorImpl<Operation *> &combinerOps);
 } // namespace mlir
 
-#endif // MLIR_ANALYSIS_LOOP_ANALYSIS_H
+#endif // MLIR_ANALYSIS_LOOPANALYSIS_H
diff --git a/mlir/include/mlir/Analysis/NestedMatcher.h b/mlir/include/mlir/Analysis/NestedMatcher.h
index 844fc3a53ad1..1c8d318d7d94 100644
--- a/mlir/include/mlir/Analysis/NestedMatcher.h
+++ b/mlir/include/mlir/Analysis/NestedMatcher.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_ANALYSIS_MLFUNCTIONMATCHER_H_
-#define MLIR_ANALYSIS_MLFUNCTIONMATCHER_H_
+#ifndef MLIR_ANALYSIS_NESTEDMATCHER_H
+#define MLIR_ANALYSIS_NESTEDMATCHER_H
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Operation.h"
@@ -198,4 +198,4 @@ bool isLoadOrStore(Operation &op);
 } // namespace matcher
 } // namespace mlir
 
-#endif // MLIR_ANALYSIS_MLFUNCTIONMATCHER_H_
+#endif // MLIR_ANALYSIS_NESTEDMATCHER_H
diff --git a/mlir/include/mlir/Analysis/NumberOfExecutions.h b/mlir/include/mlir/Analysis/NumberOfExecutions.h
index a9508057815c..538d3900ac9f 100644
--- a/mlir/include/mlir/Analysis/NumberOfExecutions.h
+++ b/mlir/include/mlir/Analysis/NumberOfExecutions.h
@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_ANALYSIS_NUMBER_OF_EXECUTIONS_H
-#define MLIR_ANALYSIS_NUMBER_OF_EXECUTIONS_H
+#ifndef MLIR_ANALYSIS_NUMBEROFEXECUTIONS_H
+#define MLIR_ANALYSIS_NUMBEROFEXECUTIONS_H
 
 #include "mlir/Support/LLVM.h"
 #include "llvm/ADT/DenseMap.h"
@@ -104,4 +104,4 @@ private:
 
 } // namespace mlir
 
-#endif // MLIR_ANALYSIS_NUMBER_OF_EXECUTIONS_H
+#endif // MLIR_ANALYSIS_NUMBEROFEXECUTIONS_H
diff --git a/mlir/include/mlir/Analysis/Presburger/LinearTransform.h b/mlir/include/mlir/Analysis/Presburger/LinearTransform.h
index a6a36f764e97..73bea008836f 100644
--- a/mlir/include/mlir/Analysis/Presburger/LinearTransform.h
+++ b/mlir/include/mlir/Analysis/Presburger/LinearTransform.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_ANALYSIS_LINEARTRANSFORM_H
-#define MLIR_ANALYSIS_LINEARTRANSFORM_H
+#ifndef MLIR_ANALYSIS_PRESBURGER_LINEARTRANSFORM_H
+#define MLIR_ANALYSIS_PRESBURGER_LINEARTRANSFORM_H
 
 #include "mlir/Analysis/Presburger/IntegerPolyhedron.h"
 #include "mlir/Analysis/Presburger/Matrix.h"
@@ -50,4 +50,4 @@ private:
 };
 
 } // namespace mlir
-#endif // MLIR_ANALYSIS_LINEARTRANSFORM_H
+#endif // MLIR_ANALYSIS_PRESBURGER_LINEARTRANSFORM_H
diff --git a/mlir/include/mlir/Analysis/Presburger/PresburgerSet.h b/mlir/include/mlir/Analysis/Presburger/PresburgerSet.h
index 23c462b72cb0..5963e60071cc 100644
--- a/mlir/include/mlir/Analysis/Presburger/PresburgerSet.h
+++ b/mlir/include/mlir/Analysis/Presburger/PresburgerSet.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_ANALYSIS_PRESBURGERSET_H
-#define MLIR_ANALYSIS_PRESBURGERSET_H
+#ifndef MLIR_ANALYSIS_PRESBURGER_PRESBURGERSET_H
+#define MLIR_ANALYSIS_PRESBURGER_PRESBURGERSET_H
 
 #include "mlir/Analysis/Presburger/IntegerPolyhedron.h"
 
@@ -122,4 +122,4 @@ private:
 
 } // namespace mlir
 
-#endif // MLIR_ANALYSIS_PRESBURGERSET_H
+#endif // MLIR_ANALYSIS_PRESBURGER_PRESBURGERSET_H
diff --git a/mlir/include/mlir/Bindings/Python/PybindAdaptors.h b/mlir/include/mlir/Bindings/Python/PybindAdaptors.h
index 811e54ab45df..f2ccbfed147a 100644
--- a/mlir/include/mlir/Bindings/Python/PybindAdaptors.h
+++ b/mlir/include/mlir/Bindings/Python/PybindAdaptors.h
@@ -15,8 +15,8 @@
 // Pybind-based internals of the core libraries).
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_BINDINGS_PYTHON_PYBIND_ADAPTORS_H
-#define MLIR_BINDINGS_PYTHON_PYBIND_ADAPTORS_H
+#ifndef MLIR_BINDINGS_PYTHON_PYBINDADAPTORS_H
+#define MLIR_BINDINGS_PYTHON_PYBINDADAPTORS_H
 
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
@@ -423,4 +423,4 @@ public:
 } // namespace python
 } // namespace mlir
 
-#endif // MLIR_BINDINGS_PYTHON_PYBIND_ADAPTORS_H
+#endif // MLIR_BINDINGS_PYTHON_PYBINDADAPTORS_H
diff --git a/mlir/include/mlir/Conversion/LLVMCommon/MemRefBuilder.h b/mlir/include/mlir/Conversion/LLVMCommon/MemRefBuilder.h
index 26c9df2d6b2d..28d4a0926007 100644
--- a/mlir/include/mlir/Conversion/LLVMCommon/MemRefBuilder.h
+++ b/mlir/include/mlir/Conversion/LLVMCommon/MemRefBuilder.h
@@ -242,4 +242,4 @@ public:
 
 } // namespace mlir
 
-#endif // MLIR_CONVERSION_LLVMCOMMON_MEMREFBUILDER_H_
+#endif // MLIR_CONVERSION_LLVMCOMMON_MEMREFBUILDER_H
diff --git a/mlir/include/mlir/Conversion/LinalgToSPIRV/LinalgToSPIRVPass.h b/mlir/include/mlir/Conversion/LinalgToSPIRV/LinalgToSPIRVPass.h
index b758b87c80af..0c3f775fbf45 100644
--- a/mlir/include/mlir/Conversion/LinalgToSPIRV/LinalgToSPIRVPass.h
+++ b/mlir/include/mlir/Conversion/LinalgToSPIRV/LinalgToSPIRVPass.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_CONVERSION_STANDARDTOSPIRV_LINALGTOSPIRVPASS_H
-#define MLIR_CONVERSION_STANDARDTOSPIRV_LINALGTOSPIRVPASS_H
+#ifndef MLIR_CONVERSION_LINALGTOSPIRV_LINALGTOSPIRVPASS_H
+#define MLIR_CONVERSION_LINALGTOSPIRV_LINALGTOSPIRVPASS_H
 
 #include "mlir/Pass/Pass.h"
 
@@ -22,4 +22,4 @@ std::unique_ptr<OperationPass<ModuleOp>> createLinalgToSPIRVPass();
 
 } // namespace mlir
 
-#endif // MLIR_CONVERSION_STANDARDTOSPIRV_LINALGTOSPIRVPASS_H
+#endif // MLIR_CONVERSION_LINALGTOSPIRV_LINALGTOSPIRVPASS_H
diff --git a/mlir/include/mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h b/mlir/include/mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h
index b51b7f3b5938..5df05cbabe0d 100644
--- a/mlir/include/mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h
+++ b/mlir/include/mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h
@@ -5,8 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#ifndef MLIR_CONVERSION_OPENMPTOLLVM_OPENMPTOLLVM_H_
-#define MLIR_CONVERSION_OPENMPTOLLVM_OPENMPTOLLVM_H_
+#ifndef MLIR_CONVERSION_OPENMPTOLLVM_CONVERTOPENMPTOLLVM_H
+#define MLIR_CONVERSION_OPENMPTOLLVM_CONVERTOPENMPTOLLVM_H
 
 #include <memory>
 
@@ -28,4 +28,4 @@ std::unique_ptr<OperationPass<ModuleOp>> createConvertOpenMPToLLVMPass();
 
 } // namespace mlir
 
-#endif // MLIR_CONVERSION_OPENMPTOLLVM_OPENMPTOLLVM_H_
+#endif // MLIR_CONVERSION_OPENMPTOLLVM_CONVERTOPENMPTOLLVM_H
diff --git a/mlir/include/mlir/Conversion/VectorToGPU/VectorToGPU.h b/mlir/include/mlir/Conversion/VectorToGPU/VectorToGPU.h
index 5f6f7aa30ea3..edba3d5c042b 100644
--- a/mlir/include/mlir/Conversion/VectorToGPU/VectorToGPU.h
+++ b/mlir/include/mlir/Conversion/VectorToGPU/VectorToGPU.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_INCLUDE_MLIR_CONVERSION_VECTORTOSCF_VECTORTOGPU_H_
-#define MLIR_INCLUDE_MLIR_CONVERSION_VECTORTOSCF_VECTORTOGPU_H_
+#ifndef MLIR_CONVERSION_VECTORTOGPU_VECTORTOGPU_H
+#define MLIR_CONVERSION_VECTORTOGPU_VECTORTOGPU_H
 
 #include "mlir/IR/PatternMatch.h"
 
@@ -31,4 +31,4 @@ std::unique_ptr<Pass> createConvertVectorToGPUPass();
 
 } // namespace mlir
 
-#endif // MLIR_INCLUDE_MLIR_CONVERSION_VECTORTOSCF_VECTORTOGPU_H_
+#endif // MLIR_CONVERSION_VECTORTOGPU_VECTORTOGPU_H
diff --git a/mlir/include/mlir/Conversion/VectorToSPIRV/VectorToSPIRV.h b/mlir/include/mlir/Conversion/VectorToSPIRV/VectorToSPIRV.h
index bfadb83a921e..7b8882b36cd5 100644
--- a/mlir/include/mlir/Conversion/VectorToSPIRV/VectorToSPIRV.h
+++ b/mlir/include/mlir/Conversion/VectorToSPIRV/VectorToSPIRV.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_INCLUDE_MLIR_CONVERSION_VECTORTOSPIRV_VECTORTOSPIRV_H
-#define MLIR_INCLUDE_MLIR_CONVERSION_VECTORTOSPIRV_VECTORTOSPIRV_H
+#ifndef MLIR_CONVERSION_VECTORTOSPIRV_VECTORTOSPIRV_H
+#define MLIR_CONVERSION_VECTORTOSPIRV_VECTORTOSPIRV_H
 
 #include "mlir/Transforms/DialectConversion.h"
 
@@ -25,4 +25,4 @@ void populateVectorToSPIRVPatterns(SPIRVTypeConverter &typeConverter,
 
 } // namespace mlir
 
-#endif // MLIR_INCLUDE_MLIR_CONVERSION_VECTORTOSPIRV_VECTORTOSPIRV_H
+#endif // MLIR_CONVERSION_VECTORTOSPIRV_VECTORTOSPIRV_H
diff --git a/mlir/include/mlir/Conversion/VectorToSPIRV/VectorToSPIRVPass.h b/mlir/include/mlir/Conversion/VectorToSPIRV/VectorToSPIRVPass.h
index 3a9d0a17d025..e8ff8bd1b516 100644
--- a/mlir/include/mlir/Conversion/VectorToSPIRV/VectorToSPIRVPass.h
+++ b/mlir/include/mlir/Conversion/VectorToSPIRV/VectorToSPIRVPass.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_CONVERSION_VECTORTOSPIRV_GPUTOSPIRVPASS_H
-#define MLIR_CONVERSION_VECTORTOSPIRV_GPUTOSPIRVPASS_H
+#ifndef MLIR_CONVERSION_VECTORTOSPIRV_VECTORTOSPIRVPASS_H
+#define MLIR_CONVERSION_VECTORTOSPIRV_VECTORTOSPIRVPASS_H
 
 #include "mlir/Pass/Pass.h"
 
@@ -22,4 +22,4 @@ std::unique_ptr<OperationPass<ModuleOp>> createConvertVectorToSPIRVPass();
 
 } // namespace mlir
 
-#endif // MLIR_CONVERSION_VECTORTOSPIRV_GPUTOSPIRVPASS_H
+#endif // MLIR_CONVERSION_VECTORTOSPIRV_VECTORTOSPIRVPASS_H
diff --git a/mlir/include/mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.h b/mlir/include/mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.h
index 66b427cec11a..9fd70bb814c4 100644
--- a/mlir/include/mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.h
+++ b/mlir/include/mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_AFFINE_IR_AFFINEMEMORYOPDIALECT_H_
-#define MLIR_DIALECT_AFFINE_IR_AFFINEMEMORYOPDIALECT_H_
+#ifndef MLIR_DIALECT_AFFINE_IR_AFFINEMEMORYOPINTERFACES_H
+#define MLIR_DIALECT_AFFINE_IR_AFFINEMEMORYOPINTERFACES_H
 
 #include "mlir/IR/AffineMap.h"
 #include "mlir/IR/BuiltinTypes.h"
@@ -21,4 +21,4 @@ namespace mlir {
 #include "mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.h.inc"
 } // namespace mlir
 
-#endif // MLIR_DIALECT_AFFINE_IR_AFFINEMEMORYOPDIALECT_H_
+#endif // MLIR_DIALECT_AFFINE_IR_AFFINEMEMORYOPINTERFACES_H
diff --git a/mlir/include/mlir/Dialect/Affine/Passes.h b/mlir/include/mlir/Dialect/Affine/Passes.h
index f2a5cffad238..bf7ea08f4ee0 100644
--- a/mlir/include/mlir/Dialect/Affine/Passes.h
+++ b/mlir/include/mlir/Dialect/Affine/Passes.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_AFFINE_TRANSFORMS_PASSES_H
-#define MLIR_DIALECT_AFFINE_TRANSFORMS_PASSES_H
+#ifndef MLIR_DIALECT_AFFINE_PASSES_H
+#define MLIR_DIALECT_AFFINE_PASSES_H
 
 #include "mlir/Pass/Pass.h"
 #include <limits>
@@ -93,4 +93,4 @@ std::unique_ptr<OperationPass<FuncOp>> createSuperVectorizePass();
 
 } // namespace mlir
 
-#endif // MLIR_DIALECT_AFFINE_RANSFORMS_PASSES_H
+#endif // MLIR_DIALECT_AFFINE_PASSES_H
diff --git a/mlir/include/mlir/Dialect/LLVMIR/Transforms/LegalizeForExport.h b/mlir/include/mlir/Dialect/LLVMIR/Transforms/LegalizeForExport.h
index 7d6ec0165d4a..01977067b313 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/Transforms/LegalizeForExport.h
+++ b/mlir/include/mlir/Dialect/LLVMIR/Transforms/LegalizeForExport.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LLVMIR_TRANSFORMS_LEGALIZE_FOR_EXPORT_H
-#define MLIR_DIALECT_LLVMIR_TRANSFORMS_LEGALIZE_FOR_EXPORT_H
+#ifndef MLIR_DIALECT_LLVMIR_TRANSFORMS_LEGALIZEFOREXPORT_H
+#define MLIR_DIALECT_LLVMIR_TRANSFORMS_LEGALIZEFOREXPORT_H
 
 #include <memory>
 
@@ -31,4 +31,4 @@ std::unique_ptr<Pass> createLegalizeForExportPass();
 } // namespace LLVM
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LLVMIR_TRANSFORMS_LEGALIZE_FOR_EXPORT_H
+#endif // MLIR_DIALECT_LLVMIR_TRANSFORMS_LEGALIZEFOREXPORT_H
diff --git a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/AffineInterfaceImpl.h b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/AffineInterfaceImpl.h
index 10afeea50b69..877234b60b5a 100644
--- a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/AffineInterfaceImpl.h
+++ b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/AffineInterfaceImpl.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_AFFINE_INTERFACE_IMPL_H
-#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_AFFINE_INTERFACE_IMPL_H
+#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_AFFINEINTERFACEIMPL_H
+#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_AFFINEINTERFACEIMPL_H
 
 namespace mlir {
 
@@ -24,4 +24,4 @@ void registerBufferizableOpInterfaceExternalModels(DialectRegistry &registry);
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_AFFINE_INTERFACE_IMPL_H
+#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_AFFINEINTERFACEIMPL_H
diff --git a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ArithInterfaceImpl.h b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ArithInterfaceImpl.h
index 6a2139d98c7c..f4454a3ceb49 100644
--- a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ArithInterfaceImpl.h
+++ b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ArithInterfaceImpl.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_ARITH_INTERFACE_IMPL_H
-#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_ARITH_INTERFACE_IMPL_H
+#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_ARITHINTERFACEIMPL_H
+#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_ARITHINTERFACEIMPL_H
 
 namespace mlir {
 
@@ -24,4 +24,4 @@ void registerBufferizableOpInterfaceExternalModels(DialectRegistry &registry);
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_ARITH_INTERFACE_IMPL_H
+#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_ARITHINTERFACEIMPL_H
diff --git a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/BufferizationInterfaceImpl.h b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/BufferizationInterfaceImpl.h
index 23c17f4b188f..78de715ea66f 100644
--- a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/BufferizationInterfaceImpl.h
+++ b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/BufferizationInterfaceImpl.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_BUFFERIZATION_INTERFACE_IMPL_H
-#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_BUFFERIZATION_INTERFACE_IMPL_H
+#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_BUFFERIZATIONINTERFACEIMPL_H
+#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_BUFFERIZATIONINTERFACEIMPL_H
 
 namespace mlir {
 
@@ -24,4 +24,4 @@ void registerBufferizableOpInterfaceExternalModels(DialectRegistry &registry);
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_BUFFERIZATION_INTERFACE_IMPL_H
+#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_BUFFERIZATIONINTERFACEIMPL_H
diff --git a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ComprehensiveBufferize.h b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ComprehensiveBufferize.h
index 149c4c60620e..bd1cd17875c9 100644
--- a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ComprehensiveBufferize.h
+++ b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ComprehensiveBufferize.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_COMPREHENSIVE_BUFFERIZE_H
-#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_COMPREHENSIVE_BUFFERIZE_H
+#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_COMPREHENSIVEBUFFERIZE_H
+#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_COMPREHENSIVEBUFFERIZE_H
 
 #include "mlir/IR/BuiltinOps.h"
 
@@ -37,4 +37,4 @@ runComprehensiveBufferize(Operation *op,
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_COMPREHENSIVE_BUFFERIZE_H
+#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_COMPREHENSIVEBUFFERIZE_H
diff --git a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/LinalgInterfaceImpl.h b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/LinalgInterfaceImpl.h
index e56371617b97..8c0128b70c96 100644
--- a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/LinalgInterfaceImpl.h
+++ b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/LinalgInterfaceImpl.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_LINALG_INTERFACE_IMPL_H
-#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_LINALG_INTERFACE_IMPL_H
+#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_LINALGINTERFACEIMPL_H
+#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_LINALGINTERFACEIMPL_H
 
 #include "mlir/Dialect/Linalg/ComprehensiveBufferize/BufferizableOpInterface.h"
 
@@ -63,4 +63,4 @@ void registerBufferizableOpInterfaceExternalModels(DialectRegistry &registry);
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_LINALG_INTERFACE_IMPL_H
+#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_LINALGINTERFACEIMPL_H
diff --git a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ModuleBufferization.h b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ModuleBufferization.h
index f881a964b905..cde14939e3fe 100644
--- a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ModuleBufferization.h
+++ b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/ModuleBufferization.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_MODULE_BUFFERIZATION_H
-#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_MODULE_BUFFERIZATION_H
+#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_MODULEBUFFERIZATION_H
+#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_MODULEBUFFERIZATION_H
 
 #include <memory>
 
@@ -38,4 +38,4 @@ void registerModuleBufferizationExternalModels(DialectRegistry &registry);
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_MODULE_BUFFERIZATION_H
+#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_MODULEBUFFERIZATION_H
diff --git a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/SCFInterfaceImpl.h b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/SCFInterfaceImpl.h
index e9694fdd2abd..a93caea59f04 100644
--- a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/SCFInterfaceImpl.h
+++ b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/SCFInterfaceImpl.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_SCF_INTERFACE_IMPL_H
-#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_SCF_INTERFACE_IMPL_H
+#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_SCFINTERFACEIMPL_H
+#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_SCFINTERFACEIMPL_H
 
 #include "mlir/Dialect/Linalg/ComprehensiveBufferize/BufferizableOpInterface.h"
 
@@ -34,4 +34,4 @@ void registerBufferizableOpInterfaceExternalModels(DialectRegistry &registry);
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_SCF_INTERFACE_IMPL_H
+#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_SCFINTERFACEIMPL_H
diff --git a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/TensorInterfaceImpl.h b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/TensorInterfaceImpl.h
index 29355ef338f3..cc3ba5aac84b 100644
--- a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/TensorInterfaceImpl.h
+++ b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/TensorInterfaceImpl.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_TENSOR_INTERFACE_IMPL_H
-#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_TENSOR_INTERFACE_IMPL_H
+#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_TENSORINTERFACEIMPL_H
+#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_TENSORINTERFACEIMPL_H
 
 namespace mlir {
 
@@ -24,4 +24,4 @@ void registerBufferizableOpInterfaceExternalModels(DialectRegistry &registry);
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_TENSOR_INTERFACE_IMPL_H
+#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_TENSORINTERFACEIMPL_H
diff --git a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/VectorInterfaceImpl.h b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/VectorInterfaceImpl.h
index 63b000bdee0f..08b6856ed808 100644
--- a/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/VectorInterfaceImpl.h
+++ b/mlir/include/mlir/Dialect/Linalg/ComprehensiveBufferize/VectorInterfaceImpl.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_VECTOR_INTERFACE_IMPL_H
-#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_VECTOR_INTERFACE_IMPL_H
+#ifndef MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_VECTORINTERFACEIMPL_H
+#define MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_VECTORINTERFACEIMPL_H
 
 namespace mlir {
 
@@ -24,4 +24,4 @@ void registerBufferizableOpInterfaceExternalModels(DialectRegistry &registry);
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_VECTOR_INTERFACE_IMPL_H
+#endif // MLIR_DIALECT_LINALG_COMPREHENSIVEBUFFERIZE_VECTORINTERFACEIMPL_H
diff --git a/mlir/include/mlir/Dialect/Linalg/IR/Linalg.h b/mlir/include/mlir/Dialect/Linalg/IR/Linalg.h
index 4e1a02177f1c..93c93cf829c5 100644
--- a/mlir/include/mlir/Dialect/Linalg/IR/Linalg.h
+++ b/mlir/include/mlir/Dialect/Linalg/IR/Linalg.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_LINALG_H_
-#define MLIR_DIALECT_LINALG_LINALG_H_
+#ifndef MLIR_DIALECT_LINALG_IR_LINALG_H
+#define MLIR_DIALECT_LINALG_IR_LINALG_H
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
@@ -120,4 +120,4 @@ LogicalResult verifyStructuredOpInterface(Operation *op);
 #define GET_OP_CLASSES
 #include "mlir/Dialect/Linalg/IR/LinalgStructuredOps.h.inc"
 
-#endif // MLIR_DIALECT_LINALG_LINALG_H_
+#endif // MLIR_DIALECT_LINALG_IR_LINALG_H
diff --git a/mlir/include/mlir/Dialect/Linalg/Transforms/HoistPadding.h b/mlir/include/mlir/Dialect/Linalg/Transforms/HoistPadding.h
index 728d725b2b6e..90e78ca0e274 100644
--- a/mlir/include/mlir/Dialect/Linalg/Transforms/HoistPadding.h
+++ b/mlir/include/mlir/Dialect/Linalg/Transforms/HoistPadding.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_TRANSFORMS_HOIST_PADDING_H_
-#define MLIR_DIALECT_LINALG_TRANSFORMS_HOIST_PADDING_H_
+#ifndef MLIR_DIALECT_LINALG_TRANSFORMS_HOISTPADDING_H
+#define MLIR_DIALECT_LINALG_TRANSFORMS_HOISTPADDING_H
 
 #include "mlir/Support/LogicalResult.h"
 
@@ -65,4 +65,4 @@ FailureOr<Value> hoistPaddingOnTensors(PadTensorOp opToHoist, int numLoops,
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LINALG_TRANSFORMS_HOIST_PADDING_H_
+#endif // MLIR_DIALECT_LINALG_TRANSFORMS_HOISTPADDING_H
diff --git a/mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h b/mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h
index 839064ebd36f..38ea017bb2a6 100644
--- a/mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h
+++ b/mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DIALECT_LINALG_TRANSFORMS_TRANSFORMS_H_
-#define DIALECT_LINALG_TRANSFORMS_TRANSFORMS_H_
+#ifndef MLIR_DIALECT_LINALG_TRANSFORMS_TRANSFORMS_H
+#define MLIR_DIALECT_LINALG_TRANSFORMS_TRANSFORMS_H
 
 #include "mlir/Conversion/VectorToSCF/VectorToSCF.h"
 #include "mlir/Dialect/Linalg/Utils/Utils.h"
@@ -1390,4 +1390,4 @@ public:
 } // namespace linalg
 } // namespace mlir
 
-#endif // DIALECT_LINALG_TRANSFORMS_TRANSFORMS_H_
+#endif // MLIR_DIALECT_LINALG_TRANSFORMS_TRANSFORMS_H
diff --git a/mlir/include/mlir/Dialect/Linalg/Utils/Utils.h b/mlir/include/mlir/Dialect/Linalg/Utils/Utils.h
index 0b79af3d5ae1..935b054cf3e4 100644
--- a/mlir/include/mlir/Dialect/Linalg/Utils/Utils.h
+++ b/mlir/include/mlir/Dialect/Linalg/Utils/Utils.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_LINALG_UTILS_H_
-#define MLIR_DIALECT_LINALG_UTILS_H_
+#ifndef MLIR_DIALECT_LINALG_UTILS_UTILS_H
+#define MLIR_DIALECT_LINALG_UTILS_UTILS_H
 
 #include "mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h"
 #include "mlir/Dialect/Linalg/IR/Linalg.h"
@@ -431,4 +431,4 @@ struct GenerateLoopNest {
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_DIALECT_LINALG_UTILS_H_
+#endif // MLIR_DIALECT_LINALG_UTILS_UTILS_H
diff --git a/mlir/include/mlir/Dialect/Math/Transforms/Approximation.h b/mlir/include/mlir/Dialect/Math/Transforms/Approximation.h
index ae64f4d434a0..b4ebc2f0f8fc 100644
--- a/mlir/include/mlir/Dialect/Math/Transforms/Approximation.h
+++ b/mlir/include/mlir/Dialect/Math/Transforms/Approximation.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_MATH_TRANSFORMATIONS_APPROXIMATION_H_
-#define MLIR_DIALECT_MATH_TRANSFORMATIONS_APPROXIMATION_H_
+#ifndef MLIR_DIALECT_MATH_TRANSFORMS_APPROXIMATION_H
+#define MLIR_DIALECT_MATH_TRANSFORMS_APPROXIMATION_H
 
 #include "mlir/Dialect/Math/IR/Math.h"
 #include "mlir/IR/PatternMatch.h"
@@ -26,4 +26,4 @@ public:
 } // namespace math
 } // namespace mlir
 
-#endif // MLIR_DIALECT_MATH_TRANSFORMATIONS_APPROXIMATION_H_
+#endif // MLIR_DIALECT_MATH_TRANSFORMS_APPROXIMATION_H
diff --git a/mlir/include/mlir/Dialect/Quant/QuantTypes.h b/mlir/include/mlir/Dialect/Quant/QuantTypes.h
index 45e791b8d4c4..17d350c9f0e3 100644
--- a/mlir/include/mlir/Dialect/Quant/QuantTypes.h
+++ b/mlir/include/mlir/Dialect/Quant/QuantTypes.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_QUANT_QUANT_TYPES_H_
-#define MLIR_DIALECT_QUANT_QUANT_TYPES_H_
+#ifndef MLIR_DIALECT_QUANT_QUANTTYPES_H
+#define MLIR_DIALECT_QUANT_QUANTTYPES_H
 
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
@@ -408,4 +408,4 @@ public:
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_DIALECT_QUANT_QUANT_TYPES_H_
+#endif // MLIR_DIALECT_QUANT_QUANTTYPES_H
diff --git a/mlir/include/mlir/Dialect/SCF/SCF.h b/mlir/include/mlir/Dialect/SCF/SCF.h
index 485efaab28a3..34e007f6a4d4 100644
--- a/mlir/include/mlir/Dialect/SCF/SCF.h
+++ b/mlir/include/mlir/Dialect/SCF/SCF.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_SCF_H_
-#define MLIR_DIALECT_SCF_H_
+#ifndef MLIR_DIALECT_SCF_SCF_H
+#define MLIR_DIALECT_SCF_SCF_H
 
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/IR/Attributes.h"
@@ -98,4 +98,4 @@ LoopNest buildLoopNest(OpBuilder &builder, Location loc, ValueRange lbs,
 
 } // namespace scf
 } // namespace mlir
-#endif // MLIR_DIALECT_SCF_H_
+#endif // MLIR_DIALECT_SCF_SCF_H
diff --git a/mlir/include/mlir/Dialect/SPIRV/Transforms/SPIRVConversion.h b/mlir/include/mlir/Dialect/SPIRV/Transforms/SPIRVConversion.h
index 21372d5b7a63..0a1c9696fc11 100644
--- a/mlir/include/mlir/Dialect/SPIRV/Transforms/SPIRVConversion.h
+++ b/mlir/include/mlir/Dialect/SPIRV/Transforms/SPIRVConversion.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_SPIRV_SPIRVCONVERSION_H
-#define MLIR_DIALECT_SPIRV_SPIRVCONVERSION_H
+#ifndef MLIR_DIALECT_SPIRV_TRANSFORMS_SPIRVCONVERSION_H
+#define MLIR_DIALECT_SPIRV_TRANSFORMS_SPIRVCONVERSION_H
 
 #include "mlir/Dialect/SPIRV/IR/SPIRVAttributes.h"
 #include "mlir/Dialect/SPIRV/IR/SPIRVTypes.h"
@@ -168,4 +168,4 @@ spirv::AccessChainOp getElementPtr(SPIRVTypeConverter &typeConverter,
 } // namespace spirv
 } // namespace mlir
 
-#endif // MLIR_DIALECT_SPIRV_SPIRVCONVERSION_H
+#endif // MLIR_DIALECT_SPIRV_TRANSFORMS_SPIRVCONVERSION_H
diff --git a/mlir/include/mlir/Dialect/Shape/IR/Shape.h b/mlir/include/mlir/Dialect/Shape/IR/Shape.h
index 4c6cb44d7bbe..bebd1f834b44 100644
--- a/mlir/include/mlir/Dialect/Shape/IR/Shape.h
+++ b/mlir/include/mlir/Dialect/Shape/IR/Shape.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_SHAPE_IR_SHAPE_H
-#define MLIR_SHAPE_IR_SHAPE_H
+#ifndef MLIR_DIALECT_SHAPE_IR_SHAPE_H
+#define MLIR_DIALECT_SHAPE_IR_SHAPE_H
 
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
@@ -74,4 +74,4 @@ public:
 
 #include "mlir/Dialect/Shape/IR/ShapeOpsDialect.h.inc"
 
-#endif // MLIR_SHAPE_IR_SHAPE_H
+#endif // MLIR_DIALECT_SHAPE_IR_SHAPE_H
diff --git a/mlir/include/mlir/Dialect/StandardOps/IR/Ops.h b/mlir/include/mlir/Dialect/StandardOps/IR/Ops.h
index b309488aa4f5..6b4486501be5 100644
--- a/mlir/include/mlir/Dialect/StandardOps/IR/Ops.h
+++ b/mlir/include/mlir/Dialect/StandardOps/IR/Ops.h
@@ -42,4 +42,4 @@ class PatternRewriter;
 
 #include "mlir/Dialect/StandardOps/IR/OpsDialect.h.inc"
 
-#endif // MLIR_DIALECT_IR_STANDARDOPS_IR_OPS_H
+#endif // MLIR_DIALECT_STANDARDOPS_IR_OPS_H
diff --git a/mlir/include/mlir/Dialect/StandardOps/Transforms/Passes.h b/mlir/include/mlir/Dialect/StandardOps/Transforms/Passes.h
index 201dc970e515..b80cd0bf6d62 100644
--- a/mlir/include/mlir/Dialect/StandardOps/Transforms/Passes.h
+++ b/mlir/include/mlir/Dialect/StandardOps/Transforms/Passes.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_STANDARD_TRANSFORMS_PASSES_H_
-#define MLIR_DIALECT_STANDARD_TRANSFORMS_PASSES_H_
+#ifndef MLIR_DIALECT_STANDARDOPS_TRANSFORMS_PASSES_H
+#define MLIR_DIALECT_STANDARDOPS_TRANSFORMS_PASSES_H
 
 #include "mlir/Pass/Pass.h"
 
@@ -65,4 +65,4 @@ void populateStdExpandOpsPatterns(RewritePatternSet &patterns);
 
 } // namespace mlir
 
-#endif // MLIR_DIALECT_STANDARD_TRANSFORMS_PASSES_H_
+#endif // MLIR_DIALECT_STANDARDOPS_TRANSFORMS_PASSES_H
diff --git a/mlir/include/mlir/Dialect/Tosa/Utils/QuantUtils.h b/mlir/include/mlir/Dialect/Tosa/Utils/QuantUtils.h
index f01946b40cf6..298c97015fe2 100644
--- a/mlir/include/mlir/Dialect/Tosa/Utils/QuantUtils.h
+++ b/mlir/include/mlir/Dialect/Tosa/Utils/QuantUtils.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DIALECT_TOSA_UTILS_QUANT_UTILS_H
-#define DIALECT_TOSA_UTILS_QUANT_UTILS_H
+#ifndef MLIR_DIALECT_TOSA_UTILS_QUANTUTILS_H
+#define MLIR_DIALECT_TOSA_UTILS_QUANTUTILS_H
 
 #include "mlir/Dialect/Tosa/IR/TosaOps.h"
 
@@ -68,4 +68,4 @@ TypeAttr buildQTypeAttrFromMinMax(OpBuilder builder, Type inputDType,
 } // namespace tosa
 } // namespace mlir
 
-#endif // DIALECT_TOSA_UTILS_QUANT_UTILS_H
+#endif // MLIR_DIALECT_TOSA_UTILS_QUANTUTILS_H
diff --git a/mlir/include/mlir/Dialect/Traits.h b/mlir/include/mlir/Dialect/Traits.h
index c23f713752f8..b8764bbac0d7 100644
--- a/mlir/include/mlir/Dialect/Traits.h
+++ b/mlir/include/mlir/Dialect/Traits.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_TRAITS
-#define MLIR_DIALECT_TRAITS
+#ifndef MLIR_DIALECT_TRAITS_H
+#define MLIR_DIALECT_TRAITS_H
 
 #include "mlir/IR/OpDefinition.h"
 
@@ -96,4 +96,4 @@ public:
 } // namespace OpTrait
 } // namespace mlir
 
-#endif // MLIR_DIALECT_TRAITS
+#endif // MLIR_DIALECT_TRAITS_H
diff --git a/mlir/include/mlir/Dialect/Utils/StructuredOpsUtils.h b/mlir/include/mlir/Dialect/Utils/StructuredOpsUtils.h
index b59452572bf2..824bfeb32636 100644
--- a/mlir/include/mlir/Dialect/Utils/StructuredOpsUtils.h
+++ b/mlir/include/mlir/Dialect/Utils/StructuredOpsUtils.h
@@ -191,4 +191,4 @@ protected:
 
 } // namespace mlir
 
-#endif // MLIR_UTILS_STRUCTUREDOPSUTILS_H
+#endif // MLIR_DIALECT_UTILS_STRUCTUREDOPSUTILS_H
diff --git a/mlir/include/mlir/Dialect/Vector/VectorRewritePatterns.h b/mlir/include/mlir/Dialect/Vector/VectorRewritePatterns.h
index 22c1b4d96501..966dcc1d3a44 100644
--- a/mlir/include/mlir/Dialect/Vector/VectorRewritePatterns.h
+++ b/mlir/include/mlir/Dialect/Vector/VectorRewritePatterns.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DIALECT_VECTOR_VECTORREWRITEPATTERNS_H_
-#define DIALECT_VECTOR_VECTORREWRITEPATTERNS_H_
+#ifndef MLIR_DIALECT_VECTOR_VECTORREWRITEPATTERNS_H
+#define MLIR_DIALECT_VECTOR_VECTORREWRITEPATTERNS_H
 
 #include "mlir/Dialect/Vector/VectorOps.h"
 #include "mlir/Dialect/Vector/VectorUtils.h"
@@ -504,4 +504,4 @@ private:
 } // namespace vector
 } // namespace mlir
 
-#endif // DIALECT_VECTOR_VECTORREWRITEPATTERNS_H_
+#endif // MLIR_DIALECT_VECTOR_VECTORREWRITEPATTERNS_H
diff --git a/mlir/include/mlir/Dialect/Vector/VectorTransforms.h b/mlir/include/mlir/Dialect/Vector/VectorTransforms.h
index 32935d547df0..d43163e573bc 100644
--- a/mlir/include/mlir/Dialect/Vector/VectorTransforms.h
+++ b/mlir/include/mlir/Dialect/Vector/VectorTransforms.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DIALECT_VECTOR_VECTORTRANSFORMS_H_
-#define DIALECT_VECTOR_VECTORTRANSFORMS_H_
+#ifndef MLIR_DIALECT_VECTOR_VECTORTRANSFORMS_H
+#define MLIR_DIALECT_VECTOR_VECTORTRANSFORMS_H
 
 #include "mlir/Dialect/Vector/VectorRewritePatterns.h"
 #include "mlir/Dialect/Vector/VectorUtils.h"
@@ -96,4 +96,4 @@ void transferOpflowOpt(FuncOp func);
 } // namespace vector
 } // namespace mlir
 
-#endif // DIALECT_VECTOR_VECTORTRANSFORMS_H_
+#endif // MLIR_DIALECT_VECTOR_VECTORTRANSFORMS_H
diff --git a/mlir/include/mlir/ExecutionEngine/CRunnerUtils.h b/mlir/include/mlir/ExecutionEngine/CRunnerUtils.h
index 46647b678192..8cfc34ef07c4 100644
--- a/mlir/include/mlir/ExecutionEngine/CRunnerUtils.h
+++ b/mlir/include/mlir/ExecutionEngine/CRunnerUtils.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef EXECUTIONENGINE_CRUNNERUTILS_H_
-#define EXECUTIONENGINE_CRUNNERUTILS_H_
+#ifndef MLIR_EXECUTIONENGINE_CRUNNERUTILS_H
+#define MLIR_EXECUTIONENGINE_CRUNNERUTILS_H
 
 #ifdef _WIN32
 #ifndef MLIR_CRUNNERUTILS_EXPORT
@@ -356,4 +356,4 @@ extern "C" MLIR_CRUNNERUTILS_EXPORT void printNewline();
 extern "C" MLIR_CRUNNERUTILS_EXPORT void print_flops(double flops);
 extern "C" MLIR_CRUNNERUTILS_EXPORT double rtclock();
 
-#endif // EXECUTIONENGINE_CRUNNERUTILS_H_
+#endif // MLIR_EXECUTIONENGINE_CRUNNERUTILS_H
diff --git a/mlir/include/mlir/ExecutionEngine/JitRunner.h b/mlir/include/mlir/ExecutionEngine/JitRunner.h
index 7eb45448711e..3f04387f9271 100644
--- a/mlir/include/mlir/ExecutionEngine/JitRunner.h
+++ b/mlir/include/mlir/ExecutionEngine/JitRunner.h
@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_SUPPORT_JITRUNNER_H_
-#define MLIR_SUPPORT_JITRUNNER_H_
+#ifndef MLIR_EXECUTIONENGINE_JITRUNNER_H
+#define MLIR_EXECUTIONENGINE_JITRUNNER_H
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ExecutionEngine/Orc/Core.h"
@@ -61,4 +61,4 @@ int JitRunnerMain(int argc, char **argv, const DialectRegistry &registry,
 
 } // namespace mlir
 
-#endif // MLIR_SUPPORT_JITRUNNER_H_
+#endif // MLIR_EXECUTIONENGINE_JITRUNNER_H
diff --git a/mlir/include/mlir/ExecutionEngine/OptUtils.h b/mlir/include/mlir/ExecutionEngine/OptUtils.h
index 793183cd5157..b5c4e2d3b300 100644
--- a/mlir/include/mlir/ExecutionEngine/OptUtils.h
+++ b/mlir/include/mlir/ExecutionEngine/OptUtils.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_EXECUTIONENGINE_OPTUTILS_H_
-#define MLIR_EXECUTIONENGINE_OPTUTILS_H_
+#ifndef MLIR_EXECUTIONENGINE_OPTUTILS_H
+#define MLIR_EXECUTIONENGINE_OPTUTILS_H
 
 #include "llvm/Pass.h"
 
@@ -54,4 +54,4 @@ makeLLVMPassesTransformer(llvm::ArrayRef<const llvm::PassInfo *> llvmPasses,
 
 } // namespace mlir
 
-#endif // LIR_EXECUTIONENGINE_OPTUTILS_H_
+#endif // MLIR_EXECUTIONENGINE_OPTUTILS_H
diff --git a/mlir/include/mlir/ExecutionEngine/RunnerUtils.h b/mlir/include/mlir/ExecutionEngine/RunnerUtils.h
index 1fb39ee78fdb..61561aae04dc 100644
--- a/mlir/include/mlir/ExecutionEngine/RunnerUtils.h
+++ b/mlir/include/mlir/ExecutionEngine/RunnerUtils.h
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef EXECUTIONENGINE_RUNNERUTILS_H_
-#define EXECUTIONENGINE_RUNNERUTILS_H_
+#ifndef MLIR_EXECUTIONENGINE_RUNNERUTILS_H
+#define MLIR_EXECUTIONENGINE_RUNNERUTILS_H
 
 #ifdef _WIN32
 #ifndef MLIR_RUNNERUTILS_EXPORT
@@ -399,4 +399,4 @@ extern "C" MLIR_RUNNERUTILS_EXPORT int64_t verifyMemRefF64(int64_t rank,
                                                            void *actualPtr,
                                                            void *expectedPtr);
 
-#endif // EXECUTIONENGINE_RUNNERUTILS_H_
+#endif // MLIR_EXECUTIONENGINE_RUNNERUTILS_H
diff --git a/mlir/include/mlir/IR/AffineExpr.h b/mlir/include/mlir/IR/AffineExpr.h
index f09a4aee00e3..01ac2d713820 100644
--- a/mlir/include/mlir/IR/AffineExpr.h
+++ b/mlir/include/mlir/IR/AffineExpr.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_IR_AFFINE_EXPR_H
-#define MLIR_IR_AFFINE_EXPR_H
+#ifndef MLIR_IR_AFFINEEXPR_H
+#define MLIR_IR_AFFINEEXPR_H
 
 #include "mlir/Support/LLVM.h"
 #include "llvm/ADT/DenseMapInfo.h"
@@ -361,4 +361,4 @@ struct DenseMapInfo<mlir::AffineExpr> {
 
 } // namespace llvm
 
-#endif // MLIR_IR_AFFINE_EXPR_H
+#endif // MLIR_IR_AFFINEEXPR_H
diff --git a/mlir/include/mlir/IR/AffineExprVisitor.h b/mlir/include/mlir/IR/AffineExprVisitor.h
index a2aa1fdb86d7..74d75c218e0b 100644
--- a/mlir/include/mlir/IR/AffineExprVisitor.h
+++ b/mlir/include/mlir/IR/AffineExprVisitor.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_IR_AFFINE_EXPR_VISITOR_H
-#define MLIR_IR_AFFINE_EXPR_VISITOR_H
+#ifndef MLIR_IR_AFFINEEXPRVISITOR_H
+#define MLIR_IR_AFFINEEXPRVISITOR_H
 
 #include "mlir/IR/AffineExpr.h"
 #include "llvm/ADT/ArrayRef.h"
@@ -342,4 +342,4 @@ private:
 
 } // namespace mlir
 
-#endif // MLIR_IR_AFFINE_EXPR_VISITOR_H
+#endif // MLIR_IR_AFFINEEXPRVISITOR_H
diff --git a/mlir/include/mlir/IR/AffineMap.h b/mlir/include/mlir/IR/AffineMap.h
index 3fa166c056ae..316e082a45fc 100644
--- a/mlir/include/mlir/IR/AffineMap.h
+++ b/mlir/include/mlir/IR/AffineMap.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_IR_AFFINE_MAP_H
-#define MLIR_IR_AFFINE_MAP_H
+#ifndef MLIR_IR_AFFINEMAP_H
+#define MLIR_IR_AFFINEMAP_H
 
 #include "mlir/IR/AffineExpr.h"
 #include "mlir/Support/LLVM.h"
@@ -592,4 +592,4 @@ struct DenseMapInfo<mlir::AffineMap> {
 
 } // namespace llvm
 
-#endif // MLIR_IR_AFFINE_MAP_H
+#endif // MLIR_IR_AFFINEMAP_H
diff --git a/mlir/include/mlir/IR/BlockSupport.h b/mlir/include/mlir/IR/BlockSupport.h
index c6371f53c662..78c4e2026ab5 100644
--- a/mlir/include/mlir/IR/BlockSupport.h
+++ b/mlir/include/mlir/IR/BlockSupport.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_IR_BLOCK_SUPPORT_H
-#define MLIR_IR_BLOCK_SUPPORT_H
+#ifndef MLIR_IR_BLOCKSUPPORT_H
+#define MLIR_IR_BLOCKSUPPORT_H
 
 #include "mlir/IR/Value.h"
 #include "llvm/ADT/PointerUnion.h"
@@ -259,4 +259,4 @@ private:
 
 } // namespace llvm
 
-#endif // MLIR_IR_BLOCK_SUPPORT_H
+#endif // MLIR_IR_BLOCKSUPPORT_H
diff --git a/mlir/include/mlir/IR/IntegerSet.h b/mlir/include/mlir/IR/IntegerSet.h
index 47ffbf156d90..8e61fdb78a34 100644
--- a/mlir/include/mlir/IR/IntegerSet.h
+++ b/mlir/include/mlir/IR/IntegerSet.h
@@ -21,8 +21,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_IR_INTEGER_SET_H
-#define MLIR_IR_INTEGER_SET_H
+#ifndef MLIR_IR_INTEGERSET_H
+#define MLIR_IR_INTEGERSET_H
 
 #include "mlir/IR/AffineExpr.h"
 #include "llvm/ADT/ArrayRef.h"
@@ -146,4 +146,4 @@ template <> struct DenseMapInfo<mlir::IntegerSet> {
 };
 
 } // namespace llvm
-#endif // MLIR_IR_INTEGER_SET_H
+#endif // MLIR_IR_INTEGERSET_H
diff --git a/mlir/include/mlir/IR/Matchers.h b/mlir/include/mlir/IR/Matchers.h
index 07a6ece3c01b..da313a2f2f9b 100644
--- a/mlir/include/mlir/IR/Matchers.h
+++ b/mlir/include/mlir/IR/Matchers.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_MATCHERS_H
-#define MLIR_MATCHERS_H
+#ifndef MLIR_IR_MATCHERS_H
+#define MLIR_IR_MATCHERS_H
 
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/OpDefinition.h"
@@ -296,4 +296,4 @@ inline auto m_Val(Value v) { return detail::PatternMatcherValue(v); }
 
 } // namespace mlir
 
-#endif // MLIR_MATCHERS_H
+#endif // MLIR_IR_MATCHERS_H
diff --git a/mlir/include/mlir/IR/OperationSupport.h b/mlir/include/mlir/IR/OperationSupport.h
index d6347b70b554..27c4a620f53b 100644
--- a/mlir/include/mlir/IR/OperationSupport.h
+++ b/mlir/include/mlir/IR/OperationSupport.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_IR_OPERATION_SUPPORT_H
-#define MLIR_IR_OPERATION_SUPPORT_H
+#ifndef MLIR_IR_OPERATIONSUPPORT_H
+#define MLIR_IR_OPERATIONSUPPORT_H
 
 #include "mlir/IR/BlockSupport.h"
 #include "mlir/IR/BuiltinAttributes.h"
diff --git a/mlir/include/mlir/IR/PatternMatch.h b/mlir/include/mlir/IR/PatternMatch.h
index 1b5679dc5c29..5b822201d411 100644
--- a/mlir/include/mlir/IR/PatternMatch.h
+++ b/mlir/include/mlir/IR/PatternMatch.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_PATTERNMATCHER_H
-#define MLIR_PATTERNMATCHER_H
+#ifndef MLIR_IR_PATTERNMATCH_H
+#define MLIR_IR_PATTERNMATCH_H
 
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
@@ -1091,4 +1091,4 @@ private:
 
 } // namespace mlir
 
-#endif // MLIR_PATTERN_MATCH_H
+#endif // MLIR_IR_PATTERNMATCH_H
diff --git a/mlir/include/mlir/IR/SubElementInterfaces.h b/mlir/include/mlir/IR/SubElementInterfaces.h
index f5838b0467b9..d0fc0ba92170 100644
--- a/mlir/include/mlir/IR/SubElementInterfaces.h
+++ b/mlir/include/mlir/IR/SubElementInterfaces.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_INTERFACES_SUBELEMENTINTERFACES_H
-#define MLIR_INTERFACES_SUBELEMENTINTERFACES_H
+#ifndef MLIR_IR_SUBELEMENTINTERFACES_H
+#define MLIR_IR_SUBELEMENTINTERFACES_H
 
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Types.h"
@@ -21,4 +21,4 @@
 #include "mlir/IR/SubElementAttrInterfaces.h.inc"
 #include "mlir/IR/SubElementTypeInterfaces.h.inc"
 
-#endif // MLIR_INTERFACES_SUBELEMENTINTERFACES_H
+#endif // MLIR_IR_SUBELEMENTINTERFACES_H
diff --git a/mlir/include/mlir/IR/TypeSupport.h b/mlir/include/mlir/IR/TypeSupport.h
index 6681e18c6e48..2541e13c0763 100644
--- a/mlir/include/mlir/IR/TypeSupport.h
+++ b/mlir/include/mlir/IR/TypeSupport.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_IR_TYPE_SUPPORT_H
-#define MLIR_IR_TYPE_SUPPORT_H
+#ifndef MLIR_IR_TYPESUPPORT_H
+#define MLIR_IR_TYPESUPPORT_H
 
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/StorageUniquerSupport.h"
diff --git a/mlir/include/mlir/IR/TypeUtilities.h b/mlir/include/mlir/IR/TypeUtilities.h
index d19d319a42c0..63942bf9ae50 100644
--- a/mlir/include/mlir/IR/TypeUtilities.h
+++ b/mlir/include/mlir/IR/TypeUtilities.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_SUPPORT_TYPEUTILITIES_H
-#define MLIR_SUPPORT_TYPEUTILITIES_H
+#ifndef MLIR_IR_TYPEUTILITIES_H
+#define MLIR_IR_TYPEUTILITIES_H
 
 #include "mlir/IR/Operation.h"
 #include "llvm/ADT/STLExtras.h"
@@ -99,4 +99,4 @@ using ResultElementTypeRange = iterator_range<ResultElementTypeIterator>;
 
 } // namespace mlir
 
-#endif // MLIR_SUPPORT_TYPEUTILITIES_H
+#endif // MLIR_IR_TYPEUTILITIES_H
diff --git a/mlir/include/mlir/Interfaces/SideEffectInterfaces.h b/mlir/include/mlir/Interfaces/SideEffectInterfaces.h
index bc2f856aedf6..57366db14979 100644
--- a/mlir/include/mlir/Interfaces/SideEffectInterfaces.h
+++ b/mlir/include/mlir/Interfaces/SideEffectInterfaces.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_INTERFACES_SIDEEFFECTS_H
-#define MLIR_INTERFACES_SIDEEFFECTS_H
+#ifndef MLIR_INTERFACES_SIDEEFFECTINTERFACES_H
+#define MLIR_INTERFACES_SIDEEFFECTINTERFACES_H
 
 #include "mlir/IR/OpDefinition.h"
 
@@ -266,4 +266,4 @@ bool wouldOpBeTriviallyDead(Operation *op);
 /// Include the definitions of the side effect interfaces.
 #include "mlir/Interfaces/SideEffectInterfaces.h.inc"
 
-#endif // MLIR_INTERFACES_SIDEEFFECTS_H
+#endif // MLIR_INTERFACES_SIDEEFFECTINTERFACES_H
diff --git a/mlir/include/mlir/Support/DebugStringHelper.h b/mlir/include/mlir/Support/DebugStringHelper.h
index 34eec7676361..4a78b3291e4c 100644
--- a/mlir/include/mlir/Support/DebugStringHelper.h
+++ b/mlir/include/mlir/Support/DebugStringHelper.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DEBUGSTRINGHELPER_H_
-#define MLIR_DEBUGSTRINGHELPER_H_
+#ifndef MLIR_SUPPORT_DEBUGSTRINGHELPER_H
+#define MLIR_SUPPORT_DEBUGSTRINGHELPER_H
 
 #include <string>
 
@@ -40,4 +40,4 @@ inline std::ostream &operator<<(std::ostream &out, const llvm::Twine &twine) {
   return out;
 }
 
-#endif // MLIR_DEBUGSTRINGHELPER_H_
+#endif // MLIR_SUPPORT_DEBUGSTRINGHELPER_H
diff --git a/mlir/include/mlir/Support/LogicalResult.h b/mlir/include/mlir/Support/LogicalResult.h
index cb5174e88b9f..2ed3e3e0b42b 100644
--- a/mlir/include/mlir/Support/LogicalResult.h
+++ b/mlir/include/mlir/Support/LogicalResult.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_SUPPORT_LOGICAL_RESULT_H
-#define MLIR_SUPPORT_LOGICAL_RESULT_H
+#ifndef MLIR_SUPPORT_LOGICALRESULT_H
+#define MLIR_SUPPORT_LOGICALRESULT_H
 
 #include "mlir/Support/LLVM.h"
 #include "llvm/ADT/Optional.h"
@@ -100,4 +100,4 @@ private:
 
 } // namespace mlir
 
-#endif // MLIR_SUPPORT_LOGICAL_RESULT_H
+#endif // MLIR_SUPPORT_LOGICALRESULT_H
diff --git a/mlir/include/mlir/Target/SPIRV/SPIRVBinaryUtils.h b/mlir/include/mlir/Target/SPIRV/SPIRVBinaryUtils.h
index 818e39e5b839..e46a576f1d48 100644
--- a/mlir/include/mlir/Target/SPIRV/SPIRVBinaryUtils.h
+++ b/mlir/include/mlir/Target/SPIRV/SPIRVBinaryUtils.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TARGET_SPIRV_BINARY_UTILS_H_
-#define MLIR_TARGET_SPIRV_BINARY_UTILS_H_
+#ifndef MLIR_TARGET_SPIRV_SPIRVBINARYUTILS_H
+#define MLIR_TARGET_SPIRV_SPIRVBINARYUTILS_H
 
 #include "mlir/Dialect/SPIRV/IR/SPIRVEnums.h"
 #include "mlir/Support/LLVM.h"
@@ -54,4 +54,4 @@ inline StringRef decodeStringLiteral(ArrayRef<uint32_t> words,
 } // namespace spirv
 } // namespace mlir
 
-#endif // MLIR_TARGET_SPIRV_BINARY_UTILS_H_
+#endif // MLIR_TARGET_SPIRV_SPIRVBINARYUTILS_H
diff --git a/mlir/include/mlir/Tools/PDLL/AST/Diagnostic.h b/mlir/include/mlir/Tools/PDLL/AST/Diagnostic.h
index dd40aa1ea76b..273ed57dbbad 100644
--- a/mlir/include/mlir/Tools/PDLL/AST/Diagnostic.h
+++ b/mlir/include/mlir/Tools/PDLL/AST/Diagnostic.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TOOLS_PDLL_AST_DIAGNOSTICS_H_
-#define MLIR_TOOLS_PDLL_AST_DIAGNOSTICS_H_
+#ifndef MLIR_TOOLS_PDLL_AST_DIAGNOSTIC_H
+#define MLIR_TOOLS_PDLL_AST_DIAGNOSTIC_H
 
 #include <string>
 
@@ -179,4 +179,4 @@ private:
 } // namespace pdll
 } // namespace mlir
 
-#endif // MLIR_TOOLS_PDLL_AST_DIAGNOSTICS_H_
+#endif // MLIR_TOOLS_PDLL_AST_DIAGNOSTIC_H
diff --git a/mlir/include/mlir/Tools/mlir-lsp-server/MlirLspServerMain.h b/mlir/include/mlir/Tools/mlir-lsp-server/MlirLspServerMain.h
index 14912f1c308c..5207106dcecc 100644
--- a/mlir/include/mlir/Tools/mlir-lsp-server/MlirLspServerMain.h
+++ b/mlir/include/mlir/Tools/mlir-lsp-server/MlirLspServerMain.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TOOLS_MLIRLSPSERVER_MLIRLSPSERVERMAIN_H
-#define MLIR_TOOLS_MLIRLSPSERVER_MLIRLSPSERVERMAIN_H
+#ifndef MLIR_TOOLS_MLIR_LSP_SERVER_MLIRLSPSERVERMAIN_H
+#define MLIR_TOOLS_MLIR_LSP_SERVER_MLIRLSPSERVERMAIN_H
 
 namespace mlir {
 class DialectRegistry;
@@ -25,4 +25,4 @@ LogicalResult MlirLspServerMain(int argc, char **argv,
 
 } // namespace mlir
 
-#endif // MLIR_TOOLS_MLIRLSPSERVER_MLIRLSPSERVERMAIN_H
+#endif // MLIR_TOOLS_MLIR_LSP_SERVER_MLIRLSPSERVERMAIN_H
diff --git a/mlir/include/mlir/Tools/mlir-reduce/MlirReduceMain.h b/mlir/include/mlir/Tools/mlir-reduce/MlirReduceMain.h
index 0e6b589934b6..fccff9ec56fa 100644
--- a/mlir/include/mlir/Tools/mlir-reduce/MlirReduceMain.h
+++ b/mlir/include/mlir/Tools/mlir-reduce/MlirReduceMain.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TOOLS_MLIRREDUCE_MLIRREDUCEMAIN_H
-#define MLIR_TOOLS_MLIRREDUCE_MLIRREDUCEMAIN_H
+#ifndef MLIR_TOOLS_MLIR_REDUCE_MLIRREDUCEMAIN_H
+#define MLIR_TOOLS_MLIR_REDUCE_MLIRREDUCEMAIN_H
 
 #include "mlir/Support/LogicalResult.h"
 
@@ -19,4 +19,4 @@ LogicalResult mlirReduceMain(int argc, char **argv, MLIRContext &context);
 
 } // namespace mlir
 
-#endif // MLIR_TOOLS_MLIRREDUCE_MLIRREDUCEMAIN_H
+#endif // MLIR_TOOLS_MLIR_REDUCE_MLIRREDUCEMAIN_H
diff --git a/mlir/include/mlir/Transforms/InliningUtils.h b/mlir/include/mlir/Transforms/InliningUtils.h
index a664ae4d8f3f..e8190fbd45ee 100644
--- a/mlir/include/mlir/Transforms/InliningUtils.h
+++ b/mlir/include/mlir/Transforms/InliningUtils.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TRANSFORMS_INLINING_UTILS_H
-#define MLIR_TRANSFORMS_INLINING_UTILS_H
+#ifndef MLIR_TRANSFORMS_INLININGUTILS_H
+#define MLIR_TRANSFORMS_INLININGUTILS_H
 
 #include "mlir/IR/DialectInterface.h"
 #include "mlir/IR/Location.h"
@@ -246,4 +246,4 @@ LogicalResult inlineCall(InlinerInterface &interface, CallOpInterface call,
 
 } // namespace mlir
 
-#endif // MLIR_TRANSFORMS_INLINING_UTILS_H
+#endif // MLIR_TRANSFORMS_INLININGUTILS_H
diff --git a/mlir/include/mlir/Transforms/LoopFusionUtils.h b/mlir/include/mlir/Transforms/LoopFusionUtils.h
index 02eeb3e981eb..b26d023873b4 100644
--- a/mlir/include/mlir/Transforms/LoopFusionUtils.h
+++ b/mlir/include/mlir/Transforms/LoopFusionUtils.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TRANSFORMS_LOOP_FUSION_UTILS_H
-#define MLIR_TRANSFORMS_LOOP_FUSION_UTILS_H
+#ifndef MLIR_TRANSFORMS_LOOPFUSIONUTILS_H
+#define MLIR_TRANSFORMS_LOOPFUSIONUTILS_H
 
 #include "mlir/IR/Value.h"
 #include "mlir/Support/LLVM.h"
@@ -167,4 +167,4 @@ void gatherProducerConsumerMemrefs(ArrayRef<Operation *> srcOps,
                                    DenseSet<Value> &producerConsumerMemrefs);
 } // namespace mlir
 
-#endif // MLIR_TRANSFORMS_LOOP_FUSION_UTILS_H
+#endif // MLIR_TRANSFORMS_LOOPFUSIONUTILS_H
diff --git a/mlir/include/mlir/Transforms/LoopUtils.h b/mlir/include/mlir/Transforms/LoopUtils.h
index 70e7395237ec..f9963b4e8c37 100644
--- a/mlir/include/mlir/Transforms/LoopUtils.h
+++ b/mlir/include/mlir/Transforms/LoopUtils.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TRANSFORMS_LOOP_UTILS_H
-#define MLIR_TRANSFORMS_LOOP_UTILS_H
+#ifndef MLIR_TRANSFORMS_LOOPUTILS_H
+#define MLIR_TRANSFORMS_LOOPUTILS_H
 
 #include "mlir/IR/Block.h"
 #include "mlir/Support/LLVM.h"
@@ -325,4 +325,4 @@ LogicalResult moveLoopInvariantCode(LoopLikeOpInterface looplike);
 
 } // namespace mlir
 
-#endif // MLIR_TRANSFORMS_LOOP_UTILS_H
+#endif // MLIR_TRANSFORMS_LOOPUTILS_H