================ @@ -54,6 +54,7 @@ namespace clang { class ASTContext; +class DeclStateReverter; ---------------- vgvassilev wrote: How does that relate to the `ASTDeclUnmerger`? https://github.com/llvm/llvm-project/pull/223305