Merge changes Ie7574cfe,Icc302d2b

* changes:
  remove unneeded forward declaration
  fix typo (minor)