[Core] New nix fix, sorry. [c2080]

Enum place swap and a new include.

(based on commit [12589] - 0c97ffa)