improve header inclusions