More shared header cleanup.