By wrapping accesses to entityPrivate with a macro some more in-code instances of '#ifdef XGIDUALHEAD' can be eliminated.