Tidy up some forward declarations.

Change-Id: I625fe935fbdbdffa05cfd6f02060e5b23a4190af
Reviewed-on: https://code-review.googlesource.com/5424
Reviewed-by: Paul Wankadia <junyer@google.com>
7 files changed