diff --git a/llvm/include/llvm/Remarks/Remark.h b/llvm/include/llvm/Remarks/Remark.h
index 67fa17188083..8e1bab3d50cb 100644
--- a/llvm/include/llvm/Remarks/Remark.h
+++ b/llvm/include/llvm/Remarks/Remark.h
@@ -62,7 +62,7 @@ enum class Type {
 /// A remark type used for both emission and parsing.
 struct Remark {
   /// The type of the remark.
-  enum Type RemarkType = Type::Unknown;
+  enum class Type RemarkType = Type::Unknown;
 
   /// Name of the pass that triggers the emission of this remark.
   StringRef PassName;
diff --git a/llvm/lib/Remarks/RemarkParserImpl.h b/llvm/lib/Remarks/RemarkParserImpl.h
index 7e7181e3a3e1..581a629ee38c 100644
--- a/llvm/lib/Remarks/RemarkParserImpl.h
+++ b/llvm/lib/Remarks/RemarkParserImpl.h
@@ -21,7 +21,7 @@ struct ParserImpl {
 
   // The parser kind. This is used as a tag to safely cast between
   // implementations.
-  enum Kind ParserKind;
+  enum class Kind ParserKind;
 };
 } // end namespace remarks
 } // end namespace llvm