diff --git a/src/sage/algebras/steenrod/steenrod_algebra.py b/src/sage/algebras/steenrod/steenrod_algebra.py
index d9e1c31a215..e7a01937e10 100644
--- a/src/sage/algebras/steenrod/steenrod_algebra.py
+++ b/src/sage/algebras/steenrod/steenrod_algebra.py
@@ -591,7 +591,7 @@ def __init__(self, p=2, basis='milnor', **kwds):
         from sage.sets.set_from_iterator import EnumeratedSetFromIterator
         from functools import partial
         from .steenrod_algebra_bases import steenrod_algebra_basis
-        from sage.rings.all import GF
+        from sage.rings.finite_rings.finite_field_constructor import GF
         profile = kwds.get('profile', None)
         truncation_type = kwds.get('truncation_type', 'auto')
         self._generic = kwds.get('generic')
@@ -1088,7 +1088,7 @@ def homogeneous_component(self, n):
             sage: max([H[n].dimension() - G[n].dimension() for n in range(100)])
             0
         """
-        from sage.rings.all import GF
+        from sage.rings.finite_rings.finite_field_constructor import GF
         basis = self._basis_fcn(n)
         M = CombinatorialFreeModule(GF(self.prime()), basis,
                                     element_class=self.Element,
@@ -1780,7 +1780,7 @@ def _change_basis_on_basis(self, t, basis='milnor'):
             P^4 P^2 + P^5 P^1 + P^6
         """
         from sage.matrix.constructor import matrix
-        from sage.rings.all import GF
+        from sage.rings.finite_rings.finite_field_constructor import GF
         from .steenrod_algebra_bases import steenrod_algebra_basis,\
             convert_from_milnor_matrix
         from .steenrod_algebra_misc import get_basis_name
@@ -2153,7 +2153,7 @@ def __contains__(self, x):
             sage: A_3.P(1) * A_3.Q(2) in B_3
             False
         """
-        from sage.rings.all import GF
+        from sage.rings.finite_rings.finite_field_constructor import GF
         p = self.prime()
         if x in GF(p):
             return True
@@ -2478,7 +2478,7 @@ def an_element(self):
             sage: SteenrodAlgebra(basis='pst', profile=[3,2,1]).an_element()
             P^0_1
         """
-        from sage.rings.all import GF
+        from sage.rings.finite_rings.finite_field_constructor import GF
         basis = self.basis_name()
         p = self.prime()
 
diff --git a/src/sage/algebras/steenrod/steenrod_algebra_bases.py b/src/sage/algebras/steenrod/steenrod_algebra_bases.py
index dd3b8912d79..65b5fc89f6a 100644
--- a/src/sage/algebras/steenrod/steenrod_algebra_bases.py
+++ b/src/sage/algebras/steenrod/steenrod_algebra_bases.py
@@ -163,7 +163,7 @@ def convert_to_milnor_matrix(n, basis, p=2, generic='auto'):
         [1 2 0]
     """
     from sage.matrix.constructor import matrix
-    from sage.rings.all import GF
+    from sage.rings.finite_rings.finite_field_constructor import GF
     from .steenrod_algebra import SteenrodAlgebra
     if generic == 'auto':
         generic = False if p==2 else True
diff --git a/src/sage/algebras/steenrod/steenrod_algebra_mult.py b/src/sage/algebras/steenrod/steenrod_algebra_mult.py
index 3de17e9c138..2a359410217 100644
--- a/src/sage/algebras/steenrod/steenrod_algebra_mult.py
+++ b/src/sage/algebras/steenrod/steenrod_algebra_mult.py
@@ -437,7 +437,7 @@ def milnor_multiplication_odd(m1,m2,p):
     iterate through the possible matrices: see
     http://mathweb.scranton.edu/monks/software/Steenrod/steen.html.
     """
-    from sage.rings.all import GF
+    from sage.rings.finite_rings.finite_field_constructor import GF
     F = GF(p)
     (f,s) = m2
     # First compute Q_e0 Q_e1 ... P(r1, r2, ...) Q_f0 Q_f1 ...
@@ -890,7 +890,7 @@ def make_mono_admissible(mono, p=2, generic=None):
         sage: SteenrodAlgebra(p=2, basis='adem').Q(2) * (Sq(6) * Sq(2)) # indirect doctest
         Sq^10 Sq^4 Sq^1 + Sq^10 Sq^5 + Sq^12 Sq^3 + Sq^13 Sq^2
     """
-    from sage.rings.all import GF
+    from sage.rings.finite_rings.finite_field_constructor import GF
     if generic is None:
         generic = False if p==2 else True
     F = GF(p)
diff --git a/src/sage/groups/matrix_gps/unitary.py b/src/sage/groups/matrix_gps/unitary.py
index cefb9b5223b..c144e3b701b 100644
--- a/src/sage/groups/matrix_gps/unitary.py
+++ b/src/sage/groups/matrix_gps/unitary.py
@@ -49,7 +49,7 @@
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
-from sage.rings.all import GF
+from sage.rings.finite_rings.finite_field_constructor import GF
 from sage.rings.finite_rings.finite_field_base import is_FiniteField
 from sage.misc.latex import latex
 from sage.misc.cachefunc import cached_method
diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py
index 4c5cf3dfd6b..08f5bcafb5b 100644
--- a/src/sage/interfaces/singular.py
+++ b/src/sage/interfaces/singular.py
@@ -1629,7 +1629,7 @@ def sage_global_ring(self):
         else:
             # it ought to be a finite field
             q = ZZ(charstr[0].lstrip('ZZ/'))
-            from sage.all import GF
+            from sage.rings.finite_rings.finite_field_constructor import GF
             if q.is_prime():
                 br = GF(q)
             else:
diff --git a/src/sage/modular/modform/ambient_R.py b/src/sage/modular/modform/ambient_R.py
index 9bac23c8970..a99b080062f 100644
--- a/src/sage/modular/modform/ambient_R.py
+++ b/src/sage/modular/modform/ambient_R.py
@@ -109,7 +109,7 @@ def _compute_q_expansion_basis(self, prec=None):
         elif c.is_prime_power():
             K = self.base_ring()
             p = K.characteristic().prime_factors()[0]
-            from sage.rings.all import GF
+            from sage.rings.finite_rings.finite_field_constructor import GF
             Kp = GF(p)
             newB = [f.change_ring(K) for f in list(self.__M.cuspidal_subspace().q_integral_basis(prec))]
             A = Kp**prec
diff --git a/src/sage/modules/free_quadratic_module_integer_symmetric.py b/src/sage/modules/free_quadratic_module_integer_symmetric.py
index d09578682ea..d872452021b 100644
--- a/src/sage/modules/free_quadratic_module_integer_symmetric.py
+++ b/src/sage/modules/free_quadratic_module_integer_symmetric.py
@@ -1050,7 +1050,7 @@ def maximal_overlattice(self, p=None):
         # and trac:11940
         if not self.is_even() and (p is None or p==2):
             raise ValueError("This lattice must be even to admit an even overlattice")
-        from sage.rings.all import GF
+        from sage.rings.finite_rings.finite_field_constructor import GF
         L = self
         if p is None:
             P = ZZ(self.determinant()).prime_factors()
diff --git a/src/sage/rings/fraction_field_FpT.pyx b/src/sage/rings/fraction_field_FpT.pyx
index b81535fe5bd..58ee9bf3050 100644
--- a/src/sage/rings/fraction_field_FpT.pyx
+++ b/src/sage/rings/fraction_field_FpT.pyx
@@ -13,7 +13,7 @@ from cysignals.signals cimport sig_on, sig_off
 from sage.rings.finite_rings.stdint cimport INTEGER_MOD_INT32_LIMIT
 
 from sage.libs.gmp.mpz cimport *
-from sage.rings.all import GF
+from sage.rings.finite_rings.finite_field_constructor import GF
 from sage.libs.flint.nmod_poly cimport *
 from sage.libs.flint.ulong_extras cimport n_jacobi
 from sage.structure.element cimport Element, ModuleElement, FieldElement
diff --git a/src/sage/rings/padics/padic_capped_absolute_element.pyx b/src/sage/rings/padics/padic_capped_absolute_element.pyx
index 387dd7c8b65..12ecdc457e8 100644
--- a/src/sage/rings/padics/padic_capped_absolute_element.pyx
+++ b/src/sage/rings/padics/padic_capped_absolute_element.pyx
@@ -249,7 +249,7 @@ cdef class pAdicCappedAbsoluteElement(CAElement):
         cdef Integer selfvalue = Integer.__new__(Integer)
         mpz_set(selfvalue.value, self.value)
         if field:
-            from sage.rings.finite_rings.all import GF
+            from sage.rings.finite_rings.finite_field_constructor import GF
             return GF(self.parent().prime())(selfvalue)
         else:
             return Mod(selfvalue, modulus)
diff --git a/src/sage/rings/padics/padic_capped_relative_element.pyx b/src/sage/rings/padics/padic_capped_relative_element.pyx
index bea6c17af19..7626d36cba5 100644
--- a/src/sage/rings/padics/padic_capped_relative_element.pyx
+++ b/src/sage/rings/padics/padic_capped_relative_element.pyx
@@ -353,7 +353,7 @@ cdef class pAdicCappedRelativeElement(CRElement):
             # Need to do this better.
             mpz_mul(selfvalue.value, self.prime_pow.pow_mpz_t_tmp(self.ordp), self.unit)
         if field:
-            from sage.rings.finite_rings.all import GF
+            from sage.rings.finite_rings.finite_field_constructor import GF
             return GF(self.parent().prime())(selfvalue)
         else:
             return Mod(selfvalue, modulus)
diff --git a/src/sage/rings/padics/padic_fixed_mod_element.pyx b/src/sage/rings/padics/padic_fixed_mod_element.pyx
index e012cbba9fc..9a663986b19 100644
--- a/src/sage/rings/padics/padic_fixed_mod_element.pyx
+++ b/src/sage/rings/padics/padic_fixed_mod_element.pyx
@@ -319,7 +319,7 @@ cdef class pAdicFixedModElement(FMElement):
         selfvalue = PY_NEW(Integer)
         mpz_set(selfvalue.value, self.value)
         if field:
-            from sage.rings.finite_rings.all import GF
+            from sage.rings.finite_rings.finite_field_constructor import GF
             return GF(self.parent().prime())(selfvalue)
         else:
             return Mod(selfvalue, modulus)
diff --git a/src/sage/rings/padics/padic_floating_point_element.pyx b/src/sage/rings/padics/padic_floating_point_element.pyx
index b3eb407918e..2111fa50934 100644
--- a/src/sage/rings/padics/padic_floating_point_element.pyx
+++ b/src/sage/rings/padics/padic_floating_point_element.pyx
@@ -316,7 +316,7 @@ cdef class pAdicFloatingPointElement(FPElement):
             # Need to do this better.
             mpz_mul(selfvalue.value, self.prime_pow.pow_mpz_t_tmp(self.ordp), self.unit)
         if field:
-            from sage.rings.finite_rings.all import GF
+            from sage.rings.finite_rings.finite_field_constructor import GF
             return GF(self.parent().prime())(selfvalue)
         else:
             return Mod(selfvalue, modulus)
diff --git a/src/sage/rings/padics/padic_valuation.py b/src/sage/rings/padics/padic_valuation.py
index 5e552bd05f6..190c7cd5f89 100644
--- a/src/sage/rings/padics/padic_valuation.py
+++ b/src/sage/rings/padics/padic_valuation.py
@@ -1149,7 +1149,7 @@ def residue_ring(self):
             Finite Field of size 3
 
         """
-        from sage.rings.all import GF
+        from sage.rings.finite_rings.finite_field_constructor import GF
         return GF(self.p())
 
     def _ge_(self, other):
diff --git a/src/sage/rings/polynomial/polynomial_quotient_ring.py b/src/sage/rings/polynomial/polynomial_quotient_ring.py
index b069cdd749c..52b7e1ff9f9 100644
--- a/src/sage/rings/polynomial/polynomial_quotient_ring.py
+++ b/src/sage/rings/polynomial/polynomial_quotient_ring.py
@@ -1888,7 +1888,7 @@ def _isomorphic_ring(self):
             # for a finite field, we return the isomorphic simple extensions of
             # the underlying prime field
             N = self.cardinality()
-            from sage.rings.all import GF
+            from sage.rings.finite_rings.finite_field_constructor import GF
             isomorphic_ring = GF(N)
 
             # the map to GF(N) maps our generator to a root of our modulus in the isomorphic_ring
diff --git a/src/sage/schemes/elliptic_curves/saturation.py b/src/sage/schemes/elliptic_curves/saturation.py
index 14b172cacbb..3af4d7e712b 100644
--- a/src/sage/schemes/elliptic_curves/saturation.py
+++ b/src/sage/schemes/elliptic_curves/saturation.py
@@ -50,7 +50,7 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.rings.finite_rings.all import GF
+from sage.rings.finite_rings.finite_field_constructor import GF
 from sage.rings.integer_ring import ZZ
 from sage.arith.all import kronecker_symbol as kro
 from sage.structure.sage_object import SageObject