Add missing header includes

Change-Id: I44af43666dedc12e3df8868bda27fa0b8623b7cb