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

This reverts commit 86cb1ac3d69805bebcac7a18b408d656603028f4.

Change-Id: If592b80e8107f468c2fe1caf00fcff49f25a9441
6 files changed