Merge change Ibdced0b5

* changes:
  Remove unused #includes.