Add non-unity build targets
Add missing includes