Move AFS producer definitions to enum like definitions and fix file inclusion