Fixes to Linux includes