fix missing includes and forward declarations

Change-Id: I669e475f7ab74abef85f0f6194cc37db04af62e3
3 files changed