am 27b788e7: (-s ours) am 980dc9d5: am 82ab7306: DO NOT MERGE: Remove two almost-unused include files.

* commit '27b788e7f271b2b1746b6cf0071f7028f9d6e950':
  DO NOT MERGE: Remove two almost-unused include files.