4 files changed, 11 insertions, 6 deletions
diff --git a/mathcomp/solvable/Make b/mathcomp/solvable/Make
index 6101659..fd00057 100644
--- a/mathcomp/solvable/Make
+++ b/mathcomp/solvable/Make
@@ -26,4 +26,4 @@ sylow.v
 -arg -w -arg -notation-overridden
 -arg -w -arg -duplicate-clear
 -arg -w -arg -ambiguous-paths
--arg -w -arg -undeclared-scope
-\ No newline at end of file
+-arg -w -arg +undeclared-scope
+\ No newline at end of file
diff --git a/mathcomp/solvable/gfunctor.v b/mathcomp/solvable/gfunctor.v
index 3417d84..2fcb8ac 100644
--- a/mathcomp/solvable/gfunctor.v
+++ b/mathcomp/solvable/gfunctor.v
@@ -81,12 +81,14 @@ From mathcomp Require Import quotient gproduct.
 (* structures when F1 is monotonic or hereditary, respectively.               *)
 (******************************************************************************)
 
-Import GroupScope.
-
 Set Implicit Arguments.
 Unset Strict Implicit.
 Unset Printing Implicit Defensive.
 
+Declare Scope gFun_scope.
+
+Import GroupScope.
+
 Delimit Scope gFun_scope with gF.
 
 Module GFunctor.
diff --git a/mathcomp/solvable/gseries.v b/mathcomp/solvable/gseries.v
index 73188a6..43ed7db 100644
--- a/mathcomp/solvable/gseries.v
+++ b/mathcomp/solvable/gseries.v
@@ -32,6 +32,8 @@ Set Implicit Arguments.
 Unset Strict Implicit.
 Unset Printing Implicit Defensive.
 
+Declare Scope group_rel_scope.
+
 Import GroupScope.
 
 Section GroupDefs.
diff --git a/mathcomp/solvable/jordanholder.v b/mathcomp/solvable/jordanholder.v
index cd121cb..075c209 100644
--- a/mathcomp/solvable/jordanholder.v
+++ b/mathcomp/solvable/jordanholder.v
@@ -49,13 +49,14 @@ From mathcomp Require Import automorphism quotient action gseries.
 (* by Assia Mahboubi.                                                         *)
 (******************************************************************************)
 
-
-Import GroupScope.
-
 Set Implicit Arguments.
 Unset Strict Implicit.
 Unset Printing Implicit Defensive.
 
+Declare Scope section_scope.
+
+Import GroupScope.
+
 Inductive section (gT : finGroupType) := GSection of {group gT} * {group gT}.
 
 Delimit Scope section_scope with sec.