improve fake: merge production of definitions and declarations