cleanup decl.h