7 files changed, 9 insertions, 7 deletions
diff --git a/lib/pure/distros.nim b/lib/pure/distros.nim
index 052b58b07..25c961197 100644
--- a/lib/pure/distros.nim
+++ b/lib/pure/distros.nim
@@ -31,7 +31,7 @@ from std/strutils import contains, toLowerAscii
 
 when not defined(nimscript):
   from std/osproc import execProcess
-  from std/os import existsEnv
+  from std/envvars import existsEnv
 
 type
   Distribution* {.pure.} = enum ## the list of known distributions
diff --git a/lib/pure/memfiles.nim b/lib/pure/memfiles.nim
index d0877b311..48c07b149 100644
--- a/lib/pure/memfiles.nim
+++ b/lib/pure/memfiles.nim
@@ -24,7 +24,8 @@ elif defined(posix):
 else:
   {.error: "the memfiles module is not supported on your operating system!".}
 
-import os, streams
+import streams
+import std/oserrors
 
 when defined(nimPreviewSlimSystem):
   import std/[syncio, assertions]
diff --git a/lib/pure/reservedmem.nim b/lib/pure/reservedmem.nim
index 99fbe1429..d11539214 100644
--- a/lib/pure/reservedmem.nim
+++ b/lib/pure/reservedmem.nim
@@ -18,7 +18,7 @@
 ##
 ## Unstable API.
 
-from os import raiseOSError, osLastError
+from std/oserrors import raiseOSError, osLastError
 
 template distance*(lhs, rhs: pointer): int =
   cast[int](rhs) - cast[int](lhs)
diff --git a/lib/pure/selectors.nim b/lib/pure/selectors.nim
index ab7e104fc..be5037fe2 100644
--- a/lib/pure/selectors.nim
+++ b/lib/pure/selectors.nim
@@ -27,7 +27,8 @@
 ##
 ## TODO: `/dev/poll`, `event ports` and filesystem events.
 
-import os, nativesockets
+import nativesockets
+import std/oserrors
 
 when defined(nimPreviewSlimSystem):
   import std/assertions
diff --git a/lib/pure/strtabs.nim b/lib/pure/strtabs.nim
index aa2886cfa..c72e6f876 100644
--- a/lib/pure/strtabs.nim
+++ b/lib/pure/strtabs.nim
@@ -61,7 +61,7 @@ when defined(js) or defined(nimscript) or defined(Standalone):
   {.pragma: rtlFunc.}
 else:
   {.pragma: rtlFunc, rtl.}
-  import os
+  import std/envvars
 
 include "system/inclrtl"
 
diff --git a/lib/std/sysrand.nim b/lib/std/sysrand.nim
index 9467f5033..eeaa23d72 100644
--- a/lib/std/sysrand.nim
+++ b/lib/std/sysrand.nim
@@ -57,7 +57,7 @@ runnableExamples:
 
 
 when not defined(js):
-  import os
+  import std/oserrors
 
 when defined(posix):
   import posix
diff --git a/lib/windows/registry.nim b/lib/windows/registry.nim
index 6abc41a89..207172f8c 100644
--- a/lib/windows/registry.nim
+++ b/lib/windows/registry.nim
@@ -9,7 +9,7 @@
 
 ## This module is experimental and its interface may change.
 
-import winlean, os
+import std/oserrors
 
 when defined(nimPreviewSlimSystem):
   import std/widestrs