Fix minor buildworld issues, mainly #include file dependancies and fields