Fix Unix compile for code/rd-vanilla. Fixes #247 fully