Cleaner include paths

Here are my changes to the include files. These build without setting up any environment variables or paths. But please double-check it with cmake.

Hope this helps.

Cheers,
Kastor