DO NOT MERGE: Remove two almost-unused include files.

This fixes a compiler warning.

Change-Id: I14b5d3c871e9b2fdc8400d999e76e494ad510328
6 files changed