Fixed includes for Collision class