Add missing includes caused by ERS public API changes