More cleanups (one-class-per-header)