[[ Bug 13746 ]] Remove header include causing build errors