cleaning up include directives

fixes #8