initial import from ISIR's svn
fix a missing include on OSX