diff --git a/src/sage/rings/lazy_series.py b/src/sage/rings/lazy_series.py
index a07327a07da..c5034928ab6 100644
--- a/src/sage/rings/lazy_series.py
+++ b/src/sage/rings/lazy_series.py
@@ -2972,12 +2972,12 @@ def approximate_series(self, prec, name=None):
             name = S.variable_name()
 
         if self.valuation() < 0:
-            from sage.rings.all import LaurentSeriesRing
+            from sage.rings.laurent_series_ring import LaurentSeriesRing
             R = LaurentSeriesRing(S.base_ring(), name=name)
             n = self.valuation()
             return R([self[i] for i in range(n, prec)], n).add_bigoh(prec)
         else:
-            from sage.rings.all import PowerSeriesRing
+            from sage.rings.power_series_ring import PowerSeriesRing
             R = PowerSeriesRing(S.base_ring(), name=name)
             return R([self[i] for i in range(prec)]).add_bigoh(prec)
 
diff --git a/src/sage/rings/polynomial/infinite_polynomial_ring.py b/src/sage/rings/polynomial/infinite_polynomial_ring.py
index 9ce33af686d..68e20e1aa74 100644
--- a/src/sage/rings/polynomial/infinite_polynomial_ring.py
+++ b/src/sage/rings/polynomial/infinite_polynomial_ring.py
@@ -1337,7 +1337,7 @@ def krull_dimension(self, *args, **kwds):
             sage: R.krull_dimension()
             +Infinity
         """
-        from sage.rings.all import Infinity
+        from sage.rings.infinity import Infinity
         return Infinity
 
     def order(self):
@@ -1351,7 +1351,7 @@ def order(self):
             sage: R.order()
             +Infinity
         """
-        from sage.rings.all import Infinity
+        from sage.rings.infinity import Infinity
         return Infinity
 
 
diff --git a/src/sage/rings/valuation/valuation_space.py b/src/sage/rings/valuation/valuation_space.py
index 332fede825d..b6fbf04534f 100644
--- a/src/sage/rings/valuation/valuation_space.py
+++ b/src/sage/rings/valuation/valuation_space.py
@@ -761,7 +761,7 @@ def separating_element(self, others):
                 else:  # others[i](ret) > 0
                     # construct an element which approximates a unit with respect to others[i]
                     # and has negative valuation with respect to others[:i]
-                    from sage.rings.all import NN
+                    from sage.rings.semirings.non_negative_integer_semiring import NN
                     for r in iter(NN):
                         # When we enter this loop we are essentially out of
                         # luck.  The size of the coefficients is likely going
diff --git a/src/sage/rings/valuation/value_group.py b/src/sage/rings/valuation/value_group.py
index 4ef2038f70f..d02fd5ed617 100644
--- a/src/sage/rings/valuation/value_group.py
+++ b/src/sage/rings/valuation/value_group.py
@@ -471,7 +471,7 @@ def __classcall__(cls, generators):
             for h in generators:
                 if g == h:
                     continue
-                from sage.rings.all import NN
+                from sage.rings.semirings.non_negative_integer_semiring import NN
                 if h/g in NN:
                     simplified_generators.remove(h)
                     break
@@ -525,7 +525,7 @@ def _solve_linear_program(self, target):
                 return None
 
         if len(self._generators) == 1:
-            from sage.rings.all import NN
+            from sage.rings.semirings.non_negative_integer_semiring import NN
             exp = target / self._generators[0]
             if exp not in NN:
                 return None