fix rest of non-portable includes