image: Organize header usage