Found the proper order in which to feed the files to the compiler. No more warnings!!!

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
Removing old code

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>