extern.h header cleanup