Move a bunch of method implementations over to the C++ file; remove the need for a few includes. All in all, good stuff