tweak doxygen decls for metadata API
revert to less-legal but more conventional #ifdef guard for control.h