Fix import ordering in interfaces