Use new Import/Export syntax everywhere.

Also, make our redefinition of done more robust under different
orders of Importing modules.

algebra/agree.v

-Require Export algebra.cmra.
-Require Import algebra.functor.
+From algebra Require Export cmra.
+From algebra Require Import functor.
 Local Hint Extern 10 (_ ≤ _) => omega.
 
 Record agree (A : Type) : Type := Agree {

algebra/auth.v

-Require Export algebra.excl.
-Require Import algebra.functor.
+From algebra Require Export excl.
+From algebra Require Import functor.
 Local Arguments validN _ _ _ !_ /.
 
 Record auth (A : Type) : Type := Auth { authoritative : excl A ; own : A }.

algebra/base.v

-Require Export mathcomp.ssreflect.ssreflect.
-Require Export prelude.prelude.
+From mathcomp.ssreflect Require Export ssreflect.
+From prelude Require Export prelude.
 Global Set Bullet Behavior "Strict Subproofs".
-Global Open Scope general_if_scope.
\ No newline at end of file
+Global Open Scope general_if_scope.
+Ltac done := prelude.tactics.done.
\ No newline at end of file

algebra/cmra.v

-Require Export algebra.cofe.
+From algebra Require Export cofe.
 
 Class Unit (A : Type) := unit : A → A.
 Instance: Params (@unit) 2.

algebra/cmra_big_op.v

-Require Export algebra.cmra.
-Require Import prelude.fin_maps.
+From algebra Require Export cmra.
+From prelude Require Import fin_maps.
 
 Fixpoint big_op {A : cmraT} `{Empty A} (xs : list A) : A :=
   match xs with [] => ∅ | x :: xs => x ⋅ big_op xs end.

algebra/cmra_tactics.v

-Require Export algebra.cmra.
-Require Import algebra.cmra_big_op.
+From algebra Require Export cmra.
+From algebra Require Import cmra_big_op.
 
 (** * Simple solver for validity and inclusion by reflection *)
 Module ra_reflection. Section ra_reflection.

algebra/cofe.v

-Require Export algebra.base.
+From algebra Require Export base.
 
 (** Unbundeled version *)
 Class Dist A := dist : nat → relation A.

algebra/cofe_solver.v

-Require Export algebra.cofe.
+From algebra Require Export cofe.
 
 Record solution (F : cofeT → cofeT → cofeT) := Solution {
   solution_car :> cofeT;

algebra/dra.v

-Require Export algebra.cmra.
+From algebra Require Export cmra.
 
 (** From disjoint pcm *)
 Record validity {A} (P : A → Prop) : Type := Validity {

algebra/excl.v

-Require Export algebra.cmra.
-Require Import algebra.functor.
+From algebra Require Export cmra.
+From algebra Require Import functor.
 Local Arguments validN _ _ _ !_ /.
 Local Arguments valid _ _  !_ /.
 

algebra/fin_maps.v

-Require Export algebra.cmra prelude.gmap algebra.option.
-Require Import algebra.functor.
+From algebra Require Export cmra option.
+From prelude Require Export gmap.
+From algebra Require Import functor.
 
 Section cofe.
 Context `{Countable K} {A : cofeT}.

algebra/functor.v

-Require Export algebra.cmra.
+From algebra Require Export cmra.
 
 (** * Functors from COFE to CMRA *)
 (* TODO RJ: Maybe find a better name for this? It is not PL-specific any more. *)

algebra/iprod.v

-Require Export algebra.cmra.
-Require Import algebra.functor.
+From algebra Require Export cmra.
+From algebra Require Import functor.
 
 (** * Indexed product *)
 (** Need to put this in a definition to make canonical structures to work. *)

algebra/option.v

-Require Export algebra.cmra.
-Require Import algebra.functor.
+From algebra Require Export cmra.
+From algebra Require Import functor.
 
 (* COFE *)
 Section cofe.

algebra/sts.v

-Require Export algebra.cmra.
-Require Import prelude.sets algebra.dra.
+From algebra Require Export cmra.
+From prelude Require Import sets.
+From algebra Require Import dra.
 Local Arguments valid _ _ !_ /.
 Local Arguments op _ _ !_ !_ /.
 Local Arguments unit _ _ !_ /.

algebra/upred.v

-Require Export algebra.cmra.
+From algebra Require Export cmra.
 Local Hint Extern 1 (_ ≼ _) => etransitivity; [eassumption|].
 Local Hint Extern 1 (_ ≼ _) => etransitivity; [|eassumption].
 Local Hint Extern 10 (_ ≤ _) => omega.

heap_lang/derived.v

-Require Export heap_lang.lifting.
+From heap_lang Require Export lifting.
 Import uPred.
 
 (** Define some derived forms, and derived lemmas about them. *)

heap_lang/heap_lang.v

-Require Export program_logic.language prelude.strings.
-Require Import prelude.gmap.
+From program_logic Require Export language.
+From prelude Require Export strings.
+From prelude Require Import gmap.
 
 Module heap_lang.
 Open Scope Z_scope.

heap_lang/lifting.v

-Require Export program_logic.weakestpre heap_lang.heap_lang.
-Require Import program_logic.lifting.
-Require Import program_logic.ownership. (* for ownP *)
-Require Import heap_lang.tactics.
+From program_logic Require Export weakestpre.
+From heap_lang Require Export heap_lang.
+From program_logic Require Import lifting.
+From program_logic Require Import ownership. (* for ownP *)
+From heap_lang Require Import tactics.
 Export heap_lang. (* Prefer heap_lang names over language names. *)
 Import uPred.
 Local Hint Extern 0 (language.reducible _ _) => do_step ltac:(eauto 2).

heap_lang/notation.v

-Require Export heap_lang.derived.
+From heap_lang Require Export derived.
 
 (* What about Arguments for hoare triples?. *)
 Arguments wp {_ _} _ _%L _.
@@ -62,4 +62,4 @@ Notation "'rec:' f x y := e" := (RecV f x (Lam y e%L))
 Notation "'rec:' f x y z := e" := (Rec f x (Lam y (Lam z e%L)))
   (at level 102, f, x, y, z at level 1, e at level 200) : lang_scope.
 Notation "'rec:' f x y z := e" := (RecV f x (Lam y (Lam z e%L)))
-  (at level 102, f, x, y, z at level 1, e at level 200) : lang_scope.
\ No newline at end of file
+  (at level 102, f, x, y, z at level 1, e at level 200) : lang_scope.