Make it builds on some common platforms
24 files changed