Merge "Remove __linux__ ifdefs where not needed" into main