Fixed up relative include paths and removed root directory include from ...

...makefile to fix builtin header conflict.