* added support for other include paths on other targets
* some little clean up..