fixed some includes for gcc