missing include files

Makes assumptions about include file side-effects

Test: compile
Bug: 30465923
Change-Id: I532b6bd5ee89227b6a436131ad279f4d24f6bf4e
6 files changed