Merge "Revert "Remove gBn/sConstructorMap from headers.""