Fix clang compile errors.

Clean up several unnecessary forward declarations
and private member variables.

Change-Id: I5cd27a82ae222b8ee589cd279d8778ef7061a531
5 files changed