[TS] Move C header code to next to code that uses it in constr