Prepping for header cleanup.