resolved some header dependencies
Authored by: berndspeiser 2015-01-28
Parent: [r1356]
Child: [r1358]