Fixes related to /usr/include path on multiarch systems