diff --git a/docs/contributing/directory_structure.rst b/docs/contributing/directory_structure.rst
index c50ed013d495..fd447278c2b4 100644
--- a/docs/contributing/directory_structure.rst
+++ b/docs/contributing/directory_structure.rst
@@ -38,7 +38,7 @@ accessible
 ----------
 
 Files for accessibility (i.e., MSAA (Microsoft Active Accessibility),
-ATK (Accessibility Toolkit, used by GTK+ 2) support files). See
+ATK (Accessibility Toolkit, used by GTK) support files). See
 `Accessibility <https://developer.mozilla.org/docs/Web/Accessibility>`__.
 
 
@@ -46,8 +46,8 @@ browser
 -------
 
 Contains the front end code (in XUL, Javascript, XBL, and C++) for the
-Firefox browser. Many of these files started off as a copy of files in
-`xpfe <https://developer.mozilla.org/docs/Mozilla/Developer_guide/Source_Code/Directory_structure#xpfe>`__/.
+Firefox desktop browser. Many of these files started off as a copy of files in
+`xpfe <#xpfe>`__.
 
 browser/extensions
 ------------------
@@ -64,8 +64,7 @@ Mac and Windows)
 build
 -----
 
-Miscellaneous files used by the build process. See also
-`config <https://developer.mozilla.org/docs/Mozilla/Developer_guide/Source_Code/Directory_structure#config>`__/.
+Miscellaneous files used by the build process. See also `config <#config>`__.
 
 caps
 ----
@@ -78,10 +77,8 @@ Security <https://www.mozilla.org/projects/security/components/>`__ .
 chrome
 ------
 
-Chrome registry (See
-`here <https://developer.mozilla.org/en/docs/Chrome_Registration>`__)
-used with `toolkit <#toolkit>`__/. These files were originally copies of
-files in `rdf/chrome/`.
+:ref:`Chrome registry <Chrome Registration>` used with `toolkit <#toolkit>`__/.
+These files were originally copies of files in `rdf/chrome/`.
 
 config
 ------
@@ -115,10 +112,10 @@ an application.
 dom
 ---
 
--  `IDL definitions <https://developer.mozilla.org/docs/Mozilla/Tech/XPIDL>`__ of the interfaces defined by
+-  :ref:`IDL definitions <XPIDL>` of the interfaces defined by
    the DOM specifications and Mozilla extensions to those interfaces
    (implementations of these interfaces are primarily, but not
-   completely, in `content <https://developer.mozilla.org/docs/Mozilla/Developer_guide/Source_Code/Directory_structure#content>`__).
+   completely, in `content <#content>`__).
 -  The parts of the connection between JavaScript and the
    implementations of DOM objects that are specific both to JavaScript
    and to the DOM.
@@ -240,7 +237,7 @@ js/src
 ------
 
 The JavaScript engine, also known as
-`SpiderMonkey <https://developer.mozilla.org/docs/Mozilla/Projects/SpiderMonkey>`__.
+:ref:`SpiderMonkey <SpiderMonkey>`.
 See also `JavaScript <https://developer.mozilla.org/docs/JavaScript>`__.
 
 js/xpconnect
@@ -312,8 +309,7 @@ mfbt
 ----
 
 Implementations of classes like *WeakPtr*. Multi-platform *assertions*
-etc. `More on
-MFBT <https://developer.mozilla.org/docs/Mozilla/MFBT>`__
+etc.
 
 mobile
 ------
@@ -355,7 +351,7 @@ dynamic linker for Android, a DLL block list for Windows, etc.
 netwerk
 -------
 
-`Networking library <https://developer.mozilla.org/docs/Necko>`__, also known as Necko.
+:ref:`Networking library <Networking>`, also known as Necko.
 Responsible for doing actual transfers from and to servers, as well as
 for URI handling and related stuff.
 
@@ -418,15 +414,14 @@ Cross module python code.
 python/mach
 -----------
 
-The code for the `Mach <https://developer.mozilla.org/docs/Mozilla/Developer_guide/mach>`__ building
-tool.
+The code for the :ref:`Mach` building tool.
 
 security
 --------
 
 Contains NSS and PSM, to support cryptographic functions in mozilla
-(like S/MIME, SSL, etc). See `Network Security Services
-(NSS) <https://www.mozilla.org/projects/security/pki/nss/>`__ and
+(like S/MIME, SSL, etc). See :ref:`Network Security Services (NSS)`
+and
 `Personal Security Manager
 (PSM) <https://www.mozilla.org/projects/security/pki/psm/>`__.