get rid of host specific #if's
Merge pull request #1605 from WalterBright/refactor5

get rid of host specific #if's