added missing includes needed on OSX