Fix 'Relative include paths aren't correctly resolved'