Bit of includes fixes