Fixed some includes to avoid compiler warnings