Create more forwarding headers to fix build of tests after merge.

Reviewed by: Marcelo Lira