Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ia032a9f0c9360ffbc0d8a9c631f4c87d765fd0da
Reviewed-by: Eike Ziller <eike.ziller@digia.com>