Cleaned up collision systems and gave them general includes, reducing duplicate code.