CRM-14208 additional includes for J3.2.1+