Long term I think a better mechanism to add includes should be added, but this is good enough for now.