Mike McCormack : msi: Merge action.h into msipriv.h.