Remove USER_DEFINED in IncludePkgHeader in spd files as it does not make sense to...