4 files changed, 9 insertions, 5 deletions
diff --git a/proofs/logic.ml b/proofs/logic.ml
index 4934afa837..218b2671ec 100644
--- a/proofs/logic.ml
+++ b/proofs/logic.ml
@@ -481,7 +481,7 @@ and mk_arggoals sigma goal goalacc funty allargs =
       let env = Goal.V82.env sigma goal in
       raise (RefinerError (env,sigma,CannotApply (t, harg)))
   in
-  Array.smartfoldmap foldmap (goalacc, funty, sigma) allargs
+  Array.Smart.fold_left_map foldmap (goalacc, funty, sigma) allargs
 
 and mk_casegoals sigma goal goalacc p c =
   let env = Goal.V82.env sigma goal in
diff --git a/proofs/proof_global.ml b/proofs/proof_global.ml
index 97cfccb8de..d5cb5b09f9 100644
--- a/proofs/proof_global.ml
+++ b/proofs/proof_global.ml
@@ -78,9 +78,11 @@ type proof_object = {
   universes: UState.t;
 }
 
+type opacity_flag = Opaque | Transparent
+
 type proof_ending =
   | Admitted of Names.Id.t * Decl_kinds.goal_kind * Entries.parameter_entry * UState.t
-  | Proved of Vernacexpr.opacity_flag *
+  | Proved of opacity_flag *
               Misctypes.lident option *
               proof_object
 
diff --git a/proofs/proof_global.mli b/proofs/proof_global.mli
index bf35fd6599..de4cec488a 100644
--- a/proofs/proof_global.mli
+++ b/proofs/proof_global.mli
@@ -48,10 +48,12 @@ type proof_object = {
   universes: UState.t;
 }
 
+type opacity_flag = Opaque | Transparent
+
 type proof_ending =
   | Admitted of Names.Id.t * Decl_kinds.goal_kind * Entries.parameter_entry *
                 UState.t
-  | Proved of Vernacexpr.opacity_flag *
+  | Proved of opacity_flag *
               Misctypes.lident option *
               proof_object
 type proof_terminator
diff --git a/proofs/redexpr.ml b/proofs/redexpr.ml
index 6fb4119387..a75711baec 100644
--- a/proofs/redexpr.ml
+++ b/proofs/redexpr.ml
@@ -92,9 +92,9 @@ let cache_strategy (_,str) =
 
 let subst_strategy (subs,(local,obj)) =
   local,
-  List.smartmap
+  List.Smart.map
     (fun (k,ql as entry) ->
-      let ql' = List.smartmap (Mod_subst.subst_evaluable_reference subs) ql in
+      let ql' = List.Smart.map (Mod_subst.subst_evaluable_reference subs) ql in
       if ql==ql' then entry else (k,ql'))
     obj