Include dirs cleanup.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
Merge pull request #65 from lgromanowski/master

Include dirs cleanup.