Corrected some potentially uninitialised variables that gcc picked up
on.
Removed duplicate header files.