clean up decl.h and tcap.h