Join itree.c and itree_common.c together