[PUSHED] Duplication of some includes due to last commit

[Stephan Bergmann]

On 06/22/2012 01:07 AM, Philipp Riemer wrote:
> Hey,
> I checked every file that was touched by commit
> ec5fa0164b9bae5c5bc6654f581e493206584301 by hand and created a patch
> that deletes all duplicates I could find.

Pushed.

Thanks,
Stephan