Changed order of header inclusion

Still doesn't work; files are more self-dependent now though: #includes
are in the correct order.
New testing program :P