Buildfixes for #4786

https://github.com/xbmc/xbmc/pull/4786 <- failed cause of Xcode and VS

(hope that works) Jenkins will tell.