14 files changed, 35 insertions, 4 deletions
diff --git a/lib/impure/rdstdin.nim b/lib/impure/rdstdin.nim
index f23657fa9..935c83671 100644
--- a/lib/impure/rdstdin.nim
+++ b/lib/impure/rdstdin.nim
@@ -26,6 +26,9 @@ when defined(nimPreviewSlimSystem):
   import std/syncio
 
 when defined(windows):
+  when defined(nimPreviewSlimSystem):
+    import std/syncio
+
   proc readLineFromStdin*(prompt: string): string {.
                           tags: [ReadIOEffect, WriteIOEffect].} =
     ## Reads a line from stdin.
diff --git a/lib/nimhcr.nim b/lib/nimhcr.nim
index b35ecf8df..8bccfc22e 100644
--- a/lib/nimhcr.nim
+++ b/lib/nimhcr.nim
@@ -200,6 +200,9 @@ batchable: false
 #     block. Perhaps something can be done about this - some way of re-allocating
 #     the state and transferring the old...
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 when not defined(js) and (defined(hotcodereloading) or
                           defined(createNimHcr) or
                           defined(testNimHcr)):
diff --git a/lib/packages/docutils/highlite.nim b/lib/packages/docutils/highlite.nim
index 5d34ac4c8..3f65c8cc4 100644
--- a/lib/packages/docutils/highlite.nim
+++ b/lib/packages/docutils/highlite.nim
@@ -61,7 +61,7 @@ import
 from algorithm import binarySearch
 
 when defined(nimPreviewSlimSystem):
-  import std/assertions
+  import std/[assertions, syncio]
 
 
 type
diff --git a/lib/posix/inotify.nim b/lib/posix/inotify.nim
index 7c3cb46c5..109d3680e 100644
--- a/lib/posix/inotify.nim
+++ b/lib/posix/inotify.nim
@@ -7,6 +7,9 @@
 #    distribution, for details about the copyright.
 #
 
+when defined(nimPreviewSlimSystem):
+  import std/syncio
+
 # Get the platform-dependent flags.
 # Structure describing an inotify event.
 type
diff --git a/lib/posix/posix_utils.nim b/lib/posix/posix_utils.nim
index a9a6413f4..0bd83b27b 100644
--- a/lib/posix/posix_utils.nim
+++ b/lib/posix/posix_utils.nim
@@ -14,6 +14,9 @@
 import posix, parsecfg, os
 import std/private/since
 
+when defined(nimPreviewSlimSystem):
+  import std/syncio
+
 type Uname* = object
   sysname*, nodename*, release*, version*, machine*: string
 
diff --git a/lib/pure/asyncfile.nim b/lib/pure/asyncfile.nim
index 0a748a5fb..88fa90406 100644
--- a/lib/pure/asyncfile.nim
+++ b/lib/pure/asyncfile.nim
@@ -27,7 +27,7 @@ import asyncdispatch, os
 
 when defined(nimPreviewSlimSystem):
   import std/[assertions, syncio]
-  when defined(windows):
+  when defined(windows) or defined(nimdoc):
     import std/widestrs
 
 # TODO: Fix duplication introduced by PR #4683.
diff --git a/lib/pure/asyncftpclient.nim b/lib/pure/asyncftpclient.nim
index 6cae65721..c242b388b 100644
--- a/lib/pure/asyncftpclient.nim
+++ b/lib/pure/asyncftpclient.nim
@@ -84,6 +84,11 @@
 import asyncdispatch, asyncnet, nativesockets, strutils, parseutils, os, times
 from net import BufferSize, SslContext
 
+
+when defined(nimPreviewSlimSystem):
+  import std/syncio
+
+
 when defined(ssl):
   from net import SslHandshakeType, newContext, SslCVerifyMode
   var defaultSslContext {.threadvar.}: SslContext
diff --git a/lib/pure/coro.nim b/lib/pure/coro.nim
index aaf442a83..47dfdd791 100644
--- a/lib/pure/coro.nim
+++ b/lib/pure/coro.nim
@@ -33,6 +33,9 @@ import os
 import lists
 include system/timers
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 const defaultStackSize = 512 * 1024
 const useOrcArc = defined(gcArc) or defined(gcOrc)
 
diff --git a/lib/pure/nimprof.nim b/lib/pure/nimprof.nim
index 6ee9de0a4..fe497c645 100644
--- a/lib/pure/nimprof.nim
+++ b/lib/pure/nimprof.nim
@@ -23,6 +23,9 @@ when defined(nimHasUsed):
 
 import hashes, algorithm, strutils, tables, sets
 
+when defined(nimPreviewSlimSystem):
+  import std/syncio
+
 when not defined(memProfiler):
   include "system/timers"
 
diff --git a/lib/pure/parsexml.nim b/lib/pure/parsexml.nim
index 3ba5a19d5..884f258f3 100644
--- a/lib/pure/parsexml.nim
+++ b/lib/pure/parsexml.nim
@@ -150,7 +150,7 @@ import
   strutils, lexbase, streams, unicode
 
 when defined(nimPreviewSlimSystem):
-  import std/assertions
+  import std/[assertions, syncio]
 
 # the parser treats ``<br />`` as ``<br></br>``
 
diff --git a/lib/pure/reservedmem.nim b/lib/pure/reservedmem.nim
index d11539214..bf14fc574 100644
--- a/lib/pure/reservedmem.nim
+++ b/lib/pure/reservedmem.nim
@@ -20,6 +20,9 @@
 
 from std/oserrors import raiseOSError, osLastError
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 template distance*(lhs, rhs: pointer): int =
   cast[int](rhs) - cast[int](lhs)
 
diff --git a/lib/pure/smtp.nim b/lib/pure/smtp.nim
index f5196ce1e..70c869a06 100644
--- a/lib/pure/smtp.nim
+++ b/lib/pure/smtp.nim
@@ -46,6 +46,9 @@
 import net, strutils, strtabs, base64, os, strutils
 import asyncnet, asyncdispatch
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 export Port
 
 type
diff --git a/lib/std/private/globs.nim b/lib/std/private/globs.nim
index 28a810372..5e3e33cb4 100644
--- a/lib/std/private/globs.nim
+++ b/lib/std/private/globs.nim
@@ -9,7 +9,7 @@ when defined(windows):
   from strutils import replace
 
 when defined(nimPreviewSlimSystem):
-  import std/assertions
+  import std/[assertions, objectdollar]
 
 
 when defined(nimHasEffectsOf):
diff --git a/lib/wrappers/openssl.nim b/lib/wrappers/openssl.nim
index 9a4cb4121..35b7f29a8 100644
--- a/lib/wrappers/openssl.nim
+++ b/lib/wrappers/openssl.nim
@@ -884,6 +884,8 @@ when not defined(nimDisableCertificateValidation) and not defined(windows):
   {.pop.}
 
   when isMainModule:
+    when defined(nimPreviewSlimSystem):
+      import std/assertions
     # A simple certificate test
     let certbytes = readFile("certificate.der")
     let cert = d2i_X509(certbytes)