Redmine #5874: Some users promise compile fixes

Yeah true, I should find a new name now...