fix includes and buffersizes of moto-utilities