Build fix for non-unity builds