Oh, yes, all of those are fixable. It's just a permanent reminder of a lot of bad decisions along the way.

And it wouldn't be C++ if a large chunk of the bad decisions wasn't rooted in the preprocessor.