am 86cb1ac3: (-s ours) DO NOT MERGE: Remove two almost-unused include files.

* commit '86cb1ac3d69805bebcac7a18b408d656603028f4':
  DO NOT MERGE: Remove two almost-unused include files.