EZP-20321: Fixed IOService & IOHandler dependencies