fix some circular includes