diff --git a/clang/include/clang/Sema/SemaConcept.h b/clang/include/clang/Sema/SemaConcept.h
index bd1b2c04dfabfa..801f3dbc1ab78f 100644
--- a/clang/include/clang/Sema/SemaConcept.h
+++ b/clang/include/clang/Sema/SemaConcept.h
@@ -14,8 +14,8 @@
 #define LLVM_CLANG_SEMA_SEMACONCEPT_H
 #include "clang/AST/ASTConcept.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/Expr.h"
 #include "clang/AST/DeclTemplate.h"
+#include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/Basic/SourceLocation.h"
 #include "llvm/ADT/PointerUnion.h"
diff --git a/clang/lib/AST/DeclTemplate.cpp b/clang/lib/AST/DeclTemplate.cpp
index 1051d11b4a7ed3..d146fa44a6bdcd 100644
--- a/clang/lib/AST/DeclTemplate.cpp
+++ b/clang/lib/AST/DeclTemplate.cpp
@@ -866,9 +866,11 @@ TemplateTemplateParmDecl::Create(const ASTContext &C, DeclContext *DC,
 
 TemplateTemplateParmDecl *
 TemplateTemplateParmDecl::CreateDeserialized(ASTContext &C, GlobalDeclID ID) {
-  return new (C, ID)
-      TemplateTemplateParmDecl(nullptr, SourceLocation(), 0, 0, nullptr,
-                               TemplateNameKind::TNK_Type_template, false, nullptr, nullptr);
+  return new (C, ID) TemplateTemplateParmDecl(
+      /*DC=*/nullptr, SourceLocation(), /*Depth=*/0, /*Index=*/0,
+      /*ParameterPack=*/false,
+      /*Id=*/nullptr, TemplateNameKind::TNK_Type_template, /*Typename=*/false,
+      /*Params=*/nullptr);
 }
 
 TemplateTemplateParmDecl *