refactoring includes

Signed-off-by: Markus Jura <markus.jura@googlemail.com>