split includes in head/body, add auto_enabler class ..