Merge "Clean up include paths"