Fiddling with include directories and scopes

Signed-off-by: Frank Mertens <frank@cyblogic.de>
Replaced tabs by spaces

Signed-off-by: Frank Mertens <frank@cyblogic.de>