Fix to build on OpenBSD
Merge remote-tracking branch 'upstream/master'
duplicated type definitions when using CMAKE
Merge pull request #1119 from mosconi/master

Fix to build on OpenBSD