am 980dc9d5: am 82ab7306: DO NOT MERGE: Remove two almost-unused include files.

* commit '980dc9d52a51254654d8067c973bd3a70db0f371':
  DO NOT MERGE: Remove two almost-unused include files.