Fixed a buffer overflow in collision_test() and removed a few header dependencies.