Fixed 80+ violation and added C++ to header.