Circular imports make import pxd's order sensitive, and violating this order results in hard to understand errors. As far as I can tell, this rearrangement removes the circular nature, and has no other side affects. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>