From f55a15dcd502dd518594079978442cc212f2a78f Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Wed, 17 Dec 2025 21:31:08 +0800
Subject: [PATCH] fixes and miscellaneous

---
 lib/std/private/bitops_utils.nim | 1 +
 lib/system/countbits_impl.nim    | 2 --
 lib/system/dollars.nim           | 3 +--
 lib/system/reprjs.nim            | 3 ---
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/std/private/bitops_utils.nim b/lib/std/private/bitops_utils.nim
index a3db871fba..764f4e359b 100644
--- a/lib/std/private/bitops_utils.nim
+++ b/lib/std/private/bitops_utils.nim
@@ -4,6 +4,7 @@ const useGCC_builtins = (defined(gcc) or defined(llvm_gcc) or
                          defined(clang)) and useBuiltins
 const useICC_builtins = defined(icc) and useBuiltins
 const useVCC_builtins = defined(vcc) and useBuiltins
+const arch64 = sizeof(int) == 8
 
 template forwardImpl(impl, arg) {.dirty.} =
   when sizeof(x) <= 4:
diff --git a/lib/system/countbits_impl.nim b/lib/system/countbits_impl.nim
index 8159b5d7a1..cadc5c871e 100644
--- a/lib/system/countbits_impl.nim
+++ b/lib/system/countbits_impl.nim
@@ -11,8 +11,6 @@
 
 include std/private/bitops_utils
 
-const arch64 = sizeof(int) == 8
-
 template countBitsImpl(n: uint32): int =
   # generic formula is from: https://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetParallel
   var v = uint32(n)
diff --git a/lib/system/dollars.nim b/lib/system/dollars.nim
index cbe98f91f9..986a5a3e54 100644
--- a/lib/system/dollars.nim
+++ b/lib/system/dollars.nim
@@ -94,8 +94,7 @@ proc `$`*[T: tuple](x: T): string =
   tupleObjectDollar(result, x)
 
 when not defined(nimPreviewSlimSystem):
-  import std/objectdollar
-  export objectdollar
+  include std/objectdollar
 
 proc collectionToString[T](x: T, prefix, separator, suffix: string): string =
   result = prefix
diff --git a/lib/system/reprjs.nim b/lib/system/reprjs.nim
index 761d66aec4..526a66dca0 100644
--- a/lib/system/reprjs.nim
+++ b/lib/system/reprjs.nim
@@ -8,9 +8,6 @@
 #
 # The generic ``repr`` procedure for the javascript backend.
 
-when defined(nimPreviewSlimSystem):
-  import std/formatfloat
-
 proc reprInt(x: int64): string {.compilerproc.} = $x
 proc reprInt(x: uint64): string {.compilerproc.} = $x
 proc reprInt(x: int): string {.compilerproc.} = $x