4 files changed, 7 insertions, 34 deletions
diff --git a/plugins/firstorder/g_ground.mlg b/plugins/firstorder/g_ground.mlg
index b9274cf6b8..a212d13453 100644
--- a/plugins/firstorder/g_ground.mlg
+++ b/plugins/firstorder/g_ground.mlg
@@ -66,7 +66,7 @@ let default_intuition_tac =
   let name = { Tacexpr.mltac_plugin = "ground_plugin"; mltac_tactic = "auto_with"; } in
   let entry = { Tacexpr.mltac_name = name; mltac_index = 0 } in
   Tacenv.register_ml_tactic name [| tac |];
-  Tacexpr.TacML (Loc.tag (entry, []))
+  Tacexpr.TacML (CAst.make (entry, []))
 
 let (set_default_solver, default_solver, print_default_solver) = 
   Tactic_option.declare_tactic_option ~default:default_intuition_tac "Firstorder default solver"
@@ -89,8 +89,6 @@ END
 
 {
 
-let fail_solver=tclFAIL 0 (Pp.str "GTauto failed")
-
 let gen_ground_tac flag taco ids bases =
   let backup= !qflag in
   Proofview.tclOR begin
diff --git a/plugins/firstorder/ground.ml b/plugins/firstorder/ground.ml
index 516b04ea21..6a80525200 100644
--- a/plugins/firstorder/ground.ml
+++ b/plugins/firstorder/ground.ml
@@ -18,16 +18,16 @@ open Tacticals.New
 open Globnames
 
 let update_flags ()=
-  let f acc coe =
-    match coe.Classops.coe_value with
-    | ConstRef c -> Names.Cpred.add c acc
-    | _ -> acc
+  let open TransparentState in
+  let f accu coe = match coe.Classops.coe_value with
+    | ConstRef kn -> { accu with tr_cst = Names.Cpred.remove kn accu.tr_cst }
+    | _ -> accu
   in
-    let pred = List.fold_left f Names.Cpred.empty (Classops.coercions ()) in
+  let flags = List.fold_left f TransparentState.full (Classops.coercions ()) in
     red_flags:=
     CClosure.RedFlags.red_add_transparent
       CClosure.betaiotazeta
-      (Names.Id.Pred.full,Names.Cpred.complement pred)
+      flags
 
 let ground_tac solver startseq =
   Proofview.Goal.enter begin fun gl ->
diff --git a/plugins/firstorder/rules.ml b/plugins/firstorder/rules.ml
index b0c4785d7a..832a98b7f8 100644
--- a/plugins/firstorder/rules.ml
+++ b/plugins/firstorder/rules.ml
@@ -21,7 +21,6 @@ open Termops
 open Formula
 open Sequent
 open Globnames
-open Locus
 
 module NamedDecl = Context.Named.Declaration
 
@@ -56,10 +55,6 @@ let wrap n b continue seq =
     continue seq2
   end
 
-let basename_of_global=function
-    VarRef id->id
-  | _->assert false
-
 let clear_global=function
     VarRef id-> clear [id]
   | _->tclIDTAC
@@ -230,19 +225,3 @@ let ll_forall_tac prod backtrack id continue seq=
     backtrack
 
 (* rules for instantiation with unification moved to instances.ml *)
-
-(* special for compatibility with old Intuition *)
-
-let constant str = Coqlib.lib_ref str
-
-let defined_connectives = lazy
-  [AllOccurrences, EvalConstRef (destConstRef (constant "core.not.type"));
-   AllOccurrences, EvalConstRef (destConstRef (constant "core.iff.type"))]
-
-let normalize_evaluables=
-  Proofview.Goal.enter begin fun gl ->
-    unfold_in_concl (Lazy.force defined_connectives) <*>
-    tclMAP
-      (fun id -> unfold_in_hyp (Lazy.force defined_connectives) (id,InHypTypeOnly))
-      (pf_ids_of_hyps gl)
-  end
diff --git a/plugins/firstorder/rules.mli b/plugins/firstorder/rules.mli
index 924c26790c..97bc992b26 100644
--- a/plugins/firstorder/rules.mli
+++ b/plugins/firstorder/rules.mli
@@ -22,8 +22,6 @@ type 'a with_backtracking = tactic -> 'a
 
 val wrap : int -> bool -> seqtac
 
-val basename_of_global: GlobRef.t -> Id.t
-
 val clear_global: GlobRef.t -> tactic
 
 val axiom_tac : constr -> Sequent.t -> tactic
@@ -51,5 +49,3 @@ val forall_tac : seqtac with_backtracking
 val left_exists_tac : pinductive -> lseqtac with_backtracking
 
 val ll_forall_tac : types -> lseqtac with_backtracking
-
-val normalize_evaluables : tactic