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

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