diff --git a/basis/bootstrap/tools/tools.factor b/basis/bootstrap/tools/tools.factor
index 6017469925..da8128de7c 100644
--- a/basis/bootstrap/tools/tools.factor
+++ b/basis/bootstrap/tools/tools.factor
@@ -8,6 +8,7 @@ IN: bootstrap.tools
     "tools.crossref"
     "tools.errors"
     "tools.deploy"
+    "tools.deprecation"
     "tools.disassembler"
     "tools.memory"
     "tools.profiler"
diff --git a/basis/deprecation/authors.txt b/basis/tools/deprecation/authors.txt
similarity index 100%
rename from basis/deprecation/authors.txt
rename to basis/tools/deprecation/authors.txt
diff --git a/basis/deprecation/deprecation-docs.factor b/basis/tools/deprecation/deprecation-docs.factor
similarity index 52%
rename from basis/deprecation/deprecation-docs.factor
rename to basis/tools/deprecation/deprecation-docs.factor
index 79ade7ab51..28d771c170 100644
--- a/basis/deprecation/deprecation-docs.factor
+++ b/basis/tools/deprecation/deprecation-docs.factor
@@ -1,13 +1,13 @@
 ! (c)2009 Joe Groff bsd license
 USING: help.markup help.syntax kernel words ;
-IN: deprecation
+IN: tools.deprecation
 
 HELP: :deprecations
 { $description "Prints all deprecation notes." } ;
 
-ARTICLE: "deprecation" "Deprecation tracking"
-"Factor's core syntax defines a " { $link POSTPONE: deprecated } " word that can be applied to words to mark them as deprecated. When the " { $vocab-link "deprecation" } " vocabulary is loaded, notes will be collected and reported by the " { $link "tools.errors" } " mechanism when deprecated words are used to define other words."
+ARTICLE: "tools.deprecation" "Deprecation tracking"
+"Factor's core syntax defines a " { $link POSTPONE: deprecated } " word that can be applied to words to mark them as deprecated. When the " { $vocab-link "tools.deprecation" } " vocabulary is loaded, notes will be collected and reported by the " { $link "tools.errors" } " mechanism when deprecated words are used to define other words."
 { $subsection POSTPONE: deprecated }
 { $subsection :deprecations } ;
 
-ABOUT: "deprecation"
+ABOUT: "tools.deprecation"
diff --git a/basis/deprecation/deprecation.factor b/basis/tools/deprecation/deprecation.factor
similarity index 92%
rename from basis/deprecation/deprecation.factor
rename to basis/tools/deprecation/deprecation.factor
index 4774ba7ff9..397fc8719d 100644
--- a/basis/deprecation/deprecation.factor
+++ b/basis/tools/deprecation/deprecation.factor
@@ -1,9 +1,9 @@
 ! (c)2009 Joe Groff bsd license
 USING: accessors arrays assocs compiler.units
 debugger io kernel namespaces prettyprint sequences
-source-files.errors summary tools.crossref.private
-tools.errors words ;
-IN: deprecation
+source-files.errors summary tools.crossref
+tools.crossref.private tools.errors words ;
+IN: tools.deprecation
 
 SYMBOL: +deprecation-note+
 SYMBOL: deprecation-notes
@@ -42,7 +42,7 @@ T{ error-type
 : check-deprecations ( word -- )
     dup "forgotten" word-prop
     [ clear-deprecation-note ] [
-        dup def>> [ deprecated? ] filter
+        dup def>> uses [ deprecated? ] filter
         [ clear-deprecation-note ] [ >array deprecation-note ] if-empty
     ] if ;
 
diff --git a/basis/deprecation/summary.txt b/basis/tools/deprecation/summary.txt
similarity index 100%
rename from basis/deprecation/summary.txt
rename to basis/tools/deprecation/summary.txt
diff --git a/core/syntax/syntax-docs.factor b/core/syntax/syntax-docs.factor
index 320387e506..a988e57365 100644
--- a/core/syntax/syntax-docs.factor
+++ b/core/syntax/syntax-docs.factor
@@ -193,7 +193,7 @@ HELP: delimiter
 
 HELP: deprecated
 { $syntax ": foo ... ; deprecated" }
-{ $description "Declares the most recently defined word as deprecated. If the " { $vocab-link "deprecation" } " vocabulary is loaded, usages of deprecated words will be noted as they are made." } ;
+{ $description "Declares the most recently defined word as deprecated. If the " { $vocab-link "tools.deprecation" } " vocabulary is loaded, usages of deprecated words will be noted as they are made." } ;
 
 HELP: SYNTAX:
 { $syntax "SYNTAX: foo ... ;" }