cleanup cmd_xxx.h headers