Changed a few cpp files to headers.