This was a dirty mess. Good riddance. Also removing the include from the header now, as it has a forward declaration and thus is not needed.