Reconstructed Includes

Moved some includes to the cpp file, resulting in faster compilation
times.