14 files changed, 14 insertions, 12 deletions

diff --git a/changelog.md b/changelog.md
index a3f16738f..15ee5fcfe 100644
--- a/changelog.md
+++ b/changelog.md
@@ -247,3 +247,5 @@ proc bar {.deprecated: "use foo instead".} =
 
 bar()
 ```
+
+- The ``securehash`` module is now deprecated. Instead import ``std / sha1``.
diff --git a/compiler/ast.nim b/compiler/ast.nim
index a19dbf7de..0639ebf8e 100644
--- a/compiler/ast.nim
+++ b/compiler/ast.nim
@@ -10,7 +10,7 @@
 # abstract syntax tree + symbol table
 
 import
-  msgs, hashes, nversion, options, strutils, sha1, ropes, idents,
+  msgs, hashes, nversion, options, strutils, std / sha1, ropes, idents,
   intsets, idgen
 
 type
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 6051f2804..83c8501a4 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -11,7 +11,7 @@
 
 import
   ast, astalgo, hashes, trees, platform, magicsys, extccomp, options, intsets,
-  nversion, nimsets, msgs, sha1, bitsets, idents, types,
+  nversion, nimsets, msgs, std / sha1, bitsets, idents, types,
   ccgutils, os, ropes, math, passes, rodread, wordrecg, treetab, cgmeth,
   condsyms, rodutils, renderer, idgen, cgendata, ccgmerge, semfold, aliases,
   lowerings, semparallel, tables, sets, ndi
diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim
index 3a6fcde5a..8b5a3bf3d 100644
--- a/compiler/extccomp.nim
+++ b/compiler/extccomp.nim
@@ -14,7 +14,7 @@
 
 import
   ropes, os, strutils, osproc, platform, condsyms, options, msgs,
-  sha1, streams
+  std / sha1, streams
 
 #from debuginfo import writeDebugInfo
 
diff --git a/compiler/gorgeimpl.nim b/compiler/gorgeimpl.nim
index 9cc6eb2ba..80302b4b5 100644
--- a/compiler/gorgeimpl.nim
+++ b/compiler/gorgeimpl.nim
@@ -9,7 +9,7 @@
 
 ## Module that implements ``gorge`` for the compiler.
 
-import msgs, sha1, os, osproc, streams, strutils, options
+import msgs, std / sha1, os, osproc, streams, strutils, options
 
 proc readOutput(p: Process): (string, int) =
   result[0] = ""
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim
index 3288241d9..dc74fa933 100644
--- a/compiler/jsgen.nim
+++ b/compiler/jsgen.nim
@@ -31,7 +31,7 @@ implements the required case distinction.
 
 import
   ast, astalgo, strutils, hashes, trees, platform, magicsys, extccomp, options,
-  nversion, nimsets, msgs, sha1, bitsets, idents, types, os,
+  nversion, nimsets, msgs, std / sha1, bitsets, idents, types, os,
   times, ropes, math, passes, ccgutils, wordrecg, renderer, rodread, rodutils,
   intsets, cgmeth, lowerings
 
diff --git a/compiler/modules.nim b/compiler/modules.nim
index e94c5c162..cba152e21 100644
--- a/compiler/modules.nim
+++ b/compiler/modules.nim
@@ -10,7 +10,7 @@
 ## Implements the module handling, including the caching of modules.
 
 import
-  ast, astalgo, magicsys, sha1, rodread, msgs, cgendata, sigmatch, options,
+  ast, astalgo, magicsys, std / sha1, rodread, msgs, cgendata, sigmatch, options,
   idents, os, lexer, idgen, passes, syntaxes, llstream, modulegraphs
 
 when false:
diff --git a/compiler/rodread.nim b/compiler/rodread.nim
index 5abac1d79..6e952606e 100644
--- a/compiler/rodread.nim
+++ b/compiler/rodread.nim
@@ -90,7 +90,7 @@
 
 import
   os, options, strutils, nversion, ast, astalgo, msgs, platform, condsyms,
-  ropes, idents, sha1, idgen, types, rodutils, memfiles, tables
+  ropes, idents, std / sha1, idgen, types, rodutils, memfiles, tables
 
 type
   TReasonForRecompile* = enum ## all the reasons that can trigger recompilation
diff --git a/compiler/rodwrite.nim b/compiler/rodwrite.nim
index 24d897fb1..b9f33236d 100644
--- a/compiler/rodwrite.nim
+++ b/compiler/rodwrite.nim
@@ -13,7 +13,7 @@
 
 import
   intsets, os, options, strutils, nversion, ast, astalgo, msgs, platform,
-  condsyms, ropes, idents, sha1, rodread, passes, idgen,
+  condsyms, ropes, idents, std / sha1, rodread, passes, idgen,
   rodutils, modulepaths
 
 from modulegraphs import ModuleGraph
diff --git a/doc/lib.rst b/doc/lib.rst
index 755c11899..0932b25e4 100644
--- a/doc/lib.rst
+++ b/doc/lib.rst
@@ -384,7 +384,7 @@ Cryptography and Hashing
 * `base64 <base64.html>`_
   This module implements a base64 encoder and decoder.
 
-* `securehash <securehash.html>`_
+* `sha1 <sha1.html>`_
   This module implements a sha1 encoder and decoder.
 
 
diff --git a/lib/pure/securehash.nim b/lib/pure/securehash.nim
index 06da80e4c..c6cde599a 100644
--- a/lib/pure/securehash.nim
+++ b/lib/pure/securehash.nim
@@ -3,4 +3,4 @@
 ## This module is a deprecated alias for the ``sha1`` module.
 {.deprecated.}
 
-include sha1
+include "../std/sha1"
diff --git a/lib/pure/sha1.nim b/lib/std/sha1.nim
index b18095ff6..b18095ff6 100644
--- a/lib/pure/sha1.nim
+++ b/lib/std/sha1.nim
diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim
index c2fe79087..c2816a0ef 100644
--- a/tools/niminst/niminst.nim
+++ b/tools/niminst/niminst.nim
@@ -15,7 +15,7 @@ when haveZipLib:
 
 import
   os, osproc, strutils, parseopt, parsecfg, strtabs, streams, debcreation,
-  sha1
+  std / sha1
 
 const
   maxOS = 20 # max number of OSes
diff --git a/web/website.ini b/web/website.ini
index 4420915ab..7edaaa712 100644
--- a/web/website.ini
+++ b/web/website.ini
@@ -65,7 +65,7 @@ srcdoc2: "pure/asyncfile;pure/asyncftpclient;pure/lenientops"
 srcdoc2: "pure/md5;pure/rationals"
 srcdoc2: "posix/posix;pure/distros;pure/oswalkdir"
 srcdoc2: "pure/collections/heapqueue"
-srcdoc2: "pure/fenv;pure/sha1;impure/rdstdin;pure/strformat"
+srcdoc2: "pure/fenv;std/sha1;impure/rdstdin;pure/strformat"
 srcdoc2: "pure/segfaults"
 srcdoc2: "pure/basic2d;pure/basic3d;pure/mersenne;pure/coro;pure/httpcore"
 srcdoc2: "pure/bitops;pure/nimtracker;pure/punycode;pure/volatile;js/asyncjs"