Finally changed all .h files to the .cpp they should have been.