Fix non-unity builds