am d4b75d9e: Revert "Remove several unused forward declarations. Fixes PR22605."

* commit 'd4b75d9e1bc9bc849d4bc1b0b167799a6a72c816':
  Revert "Remove several unused forward declarations. Fixes PR22605."