Finish Connection pimpeling
Add missing include for OSX