Clean up Imports so that the ={E}=★ notation is displayed properly.

heap_lang/lib/assert.v

+From iris.program_logic Require Export weakestpre.
+From iris.heap_lang Require Export lang.
 From iris.proofmode Require Import tactics.
 From iris.heap_lang Require Import proofmode notation.
 

heap_lang/lib/barrier/proof.v

+From iris.program_logic Require Export weakestpre.
+From iris.heap_lang Require Export lang.
+From iris.heap_lang.lib.barrier Require Export barrier.
 From iris.prelude Require Import functions.
 From iris.algebra Require Import upred_big_op.
 From iris.program_logic Require Import saved_prop sts.
 From iris.heap_lang Require Import proofmode.
-From iris.heap_lang.lib.barrier Require Export barrier.
 From iris.heap_lang.lib.barrier Require Import protocol.
 
 (** The CMRAs we need. *)

heap_lang/lib/counter.v

+From iris.program_logic Require Export weakestpre.
 From iris.heap_lang Require Export lang.
 From iris.proofmode Require Import invariants tactics.
 From iris.program_logic Require Import auth.

heap_lang/lib/lock.v

+From iris.program_logic Require Export weakestpre.
 From iris.heap_lang Require Export lang.
 From iris.proofmode Require Import invariants tactics.
 From iris.heap_lang Require Import proofmode notation.

heap_lang/lib/spawn.v

+From iris.program_logic Require Export weakestpre.
 From iris.heap_lang Require Export lang.
 From iris.proofmode Require Import invariants tactics.
 From iris.heap_lang Require Import proofmode notation.

heap_lang/lib/ticket_lock.v

-From iris.program_logic Require Export global_functor auth.
-From iris.proofmode Require Import invariants ghost_ownership.
+From iris.program_logic Require Export weakestpre.
+From iris.heap_lang Require Export lang.
+From iris.program_logic Require Import auth.
+From iris.proofmode Require Import invariants.
 From iris.heap_lang Require Import proofmode notation.
 From iris.algebra Require Import gset.
 Import uPred.

program_logic/auth.v

-From iris.algebra Require Export auth upred_tactics.
+From iris.program_logic Require Export pviewshifts.
+From iris.algebra Require Export auth.
 From iris.algebra Require Import gmap.
-From iris.program_logic Require Export invariants ghost_ownership.
-From iris.proofmode Require Import invariants ghost_ownership.
+From iris.proofmode Require Import invariants.
 Import uPred.
 
 (* The CMRA we need. *)

program_logic/boxes.v

-From iris.algebra Require Import gmap agree upred_big_op.
-From iris.program_logic Require Import auth saved_prop.
+From iris.program_logic Require Export pviewshifts.
+From iris.algebra Require Import auth gmap agree upred_big_op.
 From iris.proofmode Require Import tactics invariants.
 Import uPred.
 

program_logic/sts.v

-From iris.algebra Require Export sts upred_tactics.
-From iris.program_logic Require Export invariants.
+From iris.program_logic Require Export pviewshifts.
+From iris.algebra Require Export sts.
 From iris.proofmode Require Import invariants.
 Import uPred.
 

tests/barrier_client.v

+From iris.program_logic Require Export weakestpre.
+From iris.heap_lang Require Export lang.
 From iris.heap_lang.lib.barrier Require Import proof.
 From iris.heap_lang Require Import par.
 From iris.program_logic Require Import auth sts saved_prop hoare ownership.
 From iris.heap_lang Require Import proofmode.
-Import uPred.
 
 Definition worker (n : Z) : val :=
   λ: "b" "y", wait "b" ;; !"y" #n.

tests/heap_lang.v

 (** This file is essentially a bunch of testcases. *)
-From iris.program_logic Require Import ownership hoare auth.
+From iris.program_logic Require Export weakestpre.
+From iris.heap_lang Require Export lang.
+From iris.program_logic Require Import ownership hoare.
 From iris.heap_lang Require Import proofmode notation.
 
 Section LangTests.

tests/joining_existentials.v

+From iris.program_logic Require Export weakestpre hoare.
+From iris.heap_lang Require Export lang.
 From iris.algebra Require Import excl agree csum.
-From iris.program_logic Require Import hoare.
 From iris.heap_lang.lib.barrier Require Import proof specification.
 From iris.heap_lang Require Import notation par proofmode.
 From iris.proofmode Require Import invariants.
@@ -54,7 +55,7 @@ Lemma Q_res_join γ : barrier_res γ Ψ1 ★ barrier_res γ Ψ2 ⊢ ▷ barrier_
 Proof.
   iIntros "[Hγ Hγ']";
   iDestruct "Hγ" as (x) "[#Hγ Hx]"; iDestruct "Hγ'" as (x') "[#Hγ' Hx']".
-  iAssert (▷ (x ≡ x'))%I as "Hxx" .
+  iAssert (▷ (x ≡ x'))%I as "Hxx".
   { iCombine "Hγ" "Hγ'" as "Hγ2". iClear "Hγ Hγ'".
     rewrite own_valid csum_validI /= agree_validI agree_equivI uPred.later_equivI /=.
     rewrite -{2}[x]cFunctor_id -{2}[x']cFunctor_id.

tests/list_reverse.v

 (** Correctness of in-place list reversal *)
+From iris.program_logic Require Export weakestpre hoare.
+From iris.heap_lang Require Export lang.
 From iris.proofmode Require Export tactics.
-From iris.program_logic Require Export hoare.
 From iris.heap_lang Require Import proofmode notation.
 
 Section list_reverse.

tests/one_shot.v

+From iris.program_logic Require Export weakestpre hoare.
+From iris.heap_lang Require Export lang.
 From iris.algebra Require Import excl dec_agree csum.
-From iris.program_logic Require Import hoare.
 From iris.heap_lang Require Import assert proofmode notation.
-From iris.proofmode Require Import invariants ghost_ownership.
+From iris.proofmode Require Import invariants.
 
 Definition one_shot_example : val := λ: <>,
   let: "x" := ref NONE in (

tests/tree_sum.v

+From iris.program_logic Require Export weakestpre.
+From iris.heap_lang Require Export lang.
 From iris.proofmode Require Export tactics.
 From iris.heap_lang Require Import proofmode notation.