clean up C vs. C++ options
doubly-defined type error