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

Change-Id: Iac7e32b861d60c4c386f64f065d05a1856e396cf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>