C header warning cleanup

addresses 2 sets of warnings in the existing C headers. with these changes, the generated C lib is building warning-free for me.