Add missing header dependencies

Test: m checkbuild
Change-Id: I1436cf0a9d719949ac8d880bc10ce81bdcfa33a5
2 files changed