Merge "use relative include path"