Anderes Header-Layout, sparsamer.

Signed-off-by: Martin Virtel <martin.virtel@gmail.com>