[FOLD] Consolidate includes and remove unity header