C++ stuff in new headers, tabs to spaces.