Change to use relative paths instead of absolute paths for includes
Merge