Transfered the includes to the header
Homogenized the coding style.