Catch up to the axeing of MFS and fix the ia64 build.
Catch up to the axeing of MFS and fix the ia64 build.

Forgotten by:	a Danish axe-wielder

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase