[MacOSX] Fix for name collision with OSX headers, Maciej, Tomasz or others feel free to rework if you want/like