[#236] Add missing imports