Fixed includes to be inside the include guards like they should be.