diff --git a/clang/include/clang/AST/DependentDiagnostic.h b/clang/include/clang/AST/DependentDiagnostic.h
index 18276d54d5404..cadf970620041 100644
--- a/clang/include/clang/AST/DependentDiagnostic.h
+++ b/clang/include/clang/AST/DependentDiagnostic.h
@@ -113,7 +113,9 @@ class DependentDiagnostic {
 
   struct {
     SourceLocation Loc;
+    LLVM_PREFERRED_TYPE(AccessSpecifier)
     unsigned Access : 2;
+    LLVM_PREFERRED_TYPE(bool)
     unsigned IsMember : 1;
     NamedDecl *TargetDecl;
     CXXRecordDecl *NamingClass;