Intermediate solution for redundant include paths.

Signed-off-by: Frank Mertens <frank@cyblogic.de>
Restructuring, improved build system logic

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