During work on SFCB we found a few places where the code could be improved and/or minor bugs be fixed. In this and 5 more artifacts I submit patches that
* rebases the code to cmpi version 2.0
* adds some header file inclusions to properly declare various functions
Some of the modifications fix warnings but some fix errors that let make fail.
Patch that fixes a duplicate definition error.