Commit 552817b77f8dca7332d29af4b7a7bc0a08ec9a7a

Brent Cook 2016-05-02T02:03:03

Land #192, fix fix ld warning "attempted multiple inclusion of file" on Solaris