Taking off unecessary header addiction.