- Use .cc and .h everywhere. - Update includes/include guards. - Remove extra makefile targets necessitated by previous mix of cpp/cc. Change-Id: I7aad29152d4177937f8f42927c16c6572228c104