Library code and public headers are now properly separated, we can fix include paths to remove the redundant subfolder. - akien-mga 912cd43418
912cd43418
Don't delete previous mappings when adding a new mapping. This was a old workaround that seems to cause issues. (cherry picked from commit 2685cc7bb6708df745317fd2f078bc945555e4f8)