Merge "update include paths to new location"