Activate class2Headers and remove infinite recursion