recursive pxd includes removed, struct declarations corrected.Now compiles