Added headers where missing, and did minor style fixes

Signed-off-by: Stefan Marr <git@stefan-marr.de>