diff --git a/std/outbuffer.d b/std/outbuffer.d
@@ -3,9 +3,6 @@
 /**
 Serialize data to $(D ubyte) arrays.
 
- * Macros:
- *      WIKI = Phobos/StdOutbuffer
- *
  * Copyright: Copyright Digital Mars 2000 - 2015.
  * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   $(WEB digitalmars.com, Walter Bright)

diff --git a/std/path.d b/std/path.d
@@ -48,8 +48,6 @@
         $(WEB boost.org/LICENSE_1_0.txt, Boost License 1.0)
     Source:
         $(PHOBOSSRC std/_path.d)
-    Macros:
-        WIKI = Phobos/StdPath
 */
 module std.path;
 

diff --git a/std/process.d b/std/process.d
@@ -80,7 +80,6 @@ License:
 Source:
     $(PHOBOSSRC std/_process.d)
 Macros:
-    WIKI=Phobos/StdProcess
     OBJECTREF=$(D $(LINK2 object.html#$0,$0))
     LREF=$(D $(LINK2 #.$0,$0))
 */
@@ -3256,10 +3255,6 @@ unittest
 
 
 /*
-Macros:
-
-WIKI=Phobos/StdProcess
-
 Copyright: Copyright Digital Mars 2007 - 2009.
 License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
 Authors:   $(WEB digitalmars.com, Walter Bright),

diff --git a/std/random.d b/std/random.d
@@ -39,9 +39,6 @@ Source:    $(PHOBOSSRC std/_random.d)
 
 Macros:
 
-WIKI = Phobos/StdRandom
-
-
 Copyright: Copyright Andrei Alexandrescu 2008 - 2009, Joseph Rushton Wakeling 2012.
 License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
 Authors:   $(WEB erdani.org, Andrei Alexandrescu)

diff --git a/std/range/interfaces.d b/std/range/interfaces.d
@@ -54,10 +54,6 @@ $(BOOKTABLE ,
 
 Source: $(PHOBOSSRC std/range/_interfaces.d)
 
-Macros:
-
-WIKI = Phobos/StdRange
-
 Copyright: Copyright by authors 2008-.
 
 License: $(WEB boost.org/LICENSE_1_0.txt, Boost License 1.0).

diff --git a/std/range/package.d b/std/range/package.d
@@ -175,10 +175,6 @@ _range operations that take advantage of the fact that the _range is sorted.
 
 Source: $(PHOBOSSRC std/_range/_package.d)
 
-Macros:
-
-WIKI = Phobos/StdRange
-
 Copyright: Copyright by authors 2008-.
 
 License: $(WEB boost.org/LICENSE_1_0.txt, Boost License 1.0).

diff --git a/std/range/primitives.d b/std/range/primitives.d
@@ -101,10 +101,6 @@ $(BOOKTABLE ,
 
 Source: $(PHOBOSSRC std/range/_primitives.d)
 
-Macros:
-
-WIKI = Phobos/StdRange
-
 Copyright: Copyright by authors 2008-.
 
 License: $(WEB boost.org/LICENSE_1_0.txt, Boost License 1.0).

diff --git a/std/signals.d b/std/signals.d
@@ -46,7 +46,6 @@
  *      Not safe for multiple threads operating on the same signals
  *      or slots.
  * Macros:
- *      WIKI = Phobos/StdSignals
  *      SIGNALS=signals
  *
  * Copyright: Copyright Digital Mars 2000 - 2009.

diff --git a/std/socket.d b/std/socket.d
@@ -40,8 +40,6 @@
  * Authors: Christopher E. Miller, $(WEB klickverbot.at, David Nadlinger),
  *      $(WEB thecybershadow.net, Vladimir Panteleev)
  * Source:  $(PHOBOSSRC std/_socket.d)
- * Macros:
- *      WIKI=Phobos/StdSocket
  */
 
 module std.socket;

diff --git a/std/socketstream.d b/std/socketstream.d
@@ -33,7 +33,6 @@
  * References:
  *      $(MREF std, stream)
  * Source:    $(PHOBOSSRC std/_socketstream.d)
- * Macros: WIKI=Phobos/StdSocketstream
  */
 deprecated("It will be removed from Phobos in October 2016. If you still need it, go to https://github.com/DigitalMars/undeaD") module std.socketstream;
 // @@@DEPRECATED_2016-10@@@

diff --git a/std/stdint.d b/std/stdint.d
@@ -113,7 +113,6 @@
     ))
 
  * Macros:
- *  WIKI=Phobos/StdStdint
  *  ATABLE=<table border="1" cellspacing="0" cellpadding="5">$0</table>
  *
  * Copyright: Copyright Digital Mars 2000 - 2009.

diff --git a/std/stdio.d b/std/stdio.d
@@ -5,9 +5,6 @@ Standard I/O functions that extend $(B core.stdc.stdio).  $(B core.stdc.stdio)
 is $(D_PARAM public)ally imported when importing $(B std.stdio).
 
 Source: $(PHOBOSSRC std/_stdio.d)
-Macros:
-WIKI=Phobos/StdStdio
-
 Copyright: Copyright Digital Mars 2007-.
 License:   $(WEB boost.org/LICENSE_1_0.txt, Boost License 1.0).
 Authors:   $(WEB digitalmars.com, Walter Bright),

diff --git a/std/stream.d b/std/stream.d
@@ -5,8 +5,6 @@
  *       current standards. It will be remove in October 2016.)
  *
  * Source:    $(PHOBOSSRC std/_stream.d)
- * Macros:
- *      WIKI = Phobos/StdStream
  */
 
 /*

diff --git a/std/string.d b/std/string.d
@@ -134,7 +134,7 @@ See_Also:
     for functions that work with unicode strings
     )
 
-Macros: WIKI = Phobos/StdString
+Macros:
         SHORTXREF=$(XREF2 $1, $2, $(TT $2))
         SHORTXREF_PACK=$(XREF_PACK_NAMED $1,$2,$3, $(TT $3))
 

diff --git a/std/system.d b/std/system.d
@@ -3,9 +3,6 @@
 /**
  * Information about the target operating system, environment, and CPU.
  *
- * Macros:
- *      WIKI = Phobos/StdSystem
- *
  *  Copyright: Copyright Digital Mars 2000 - 2011
  *  License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  *  Authors:   $(WEB digitalmars.com, Walter Bright) and Jonathan M Davis

diff --git a/std/traits.d b/std/traits.d
@@ -136,9 +136,6 @@
  * )
  * )
  *
- * Macros:
- *  WIKI = Phobos/StdTraits
- *
  * Copyright: Copyright Digital Mars 2005 - 2009.
  * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   $(WEB digitalmars.com, Walter Bright),

diff --git a/std/typecons.d b/std/typecons.d
@@ -6,10 +6,6 @@ that allow construction of new, useful general-purpose types.
 
 Source:    $(PHOBOSSRC std/_typecons.d)
 
-Macros:
-
-WIKI = Phobos/StdVariant
-
 Synopsis:
 
 ----

diff --git a/std/uni.d b/std/uni.d
@@ -597,9 +597,6 @@
     Trademarks:
         Unicode(tm) is a trademark of Unicode, Inc.
 
-    Macros:
-        WIKI=Phobos/StdUni
-
     Copyright: Copyright 2013 -
     License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
     Authors:   Dmitry Olshansky

diff --git a/std/uri.d b/std/uri.d
@@ -11,9 +11,6 @@
  * See_Also:
  *  $(LINK2 http://www.ietf.org/rfc/rfc3986.txt, RFC 3986)<br>
  *  $(LINK2 http://en.wikipedia.org/wiki/Uniform_resource_identifier, Wikipedia)
- * Macros:
- *  WIKI = Phobos/StdUri
- *
  * Copyright: Copyright Digital Mars 2000 - 2009.
  * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   $(WEB digitalmars.com, Walter Bright)

diff --git a/std/utf.d b/std/utf.d
@@ -10,9 +10,6 @@
         $(LINK2 http://en.wikipedia.org/wiki/Unicode, Wikipedia)<br>
         $(LINK http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8)<br>
         $(LINK http://anubis.dkuug.dk/JTC1/SC2/WG2/docs/n1335)
-    Macros:
-        WIKI = Phobos/StdUtf
-
     Copyright: Copyright Digital Mars 2000 - 2012.
     License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
     Authors:   $(WEB digitalmars.com, Walter Bright) and Jonathan M Davis

diff --git a/std/variant.d b/std/variant.d
@@ -10,9 +10,6 @@ Such types are useful
 for type-uniform binary interfaces, interfacing with scripting
 languages, and comfortable exploratory programming.
 
-Macros:
- WIKI = Phobos/StdVariant
-
 Synopsis:
 ----
 Variant a; // Must assign before use, otherwise exception ensues

diff --git a/std/windows/charset.d b/std/windows/charset.d
@@ -3,9 +3,6 @@
 /**
  * Support UTF-8 on Windows 95, 98 and ME systems.
  *
- * Macros:
- *      WIKI = Phobos/StdWindowsCharset
- *
  * Copyright: Copyright Digital Mars 2005 - 2009.
  * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   $(WEB digitalmars.com, Walter Bright)

diff --git a/std/xml.d b/std/xml.d
@@ -112,9 +112,6 @@ void main()
     writefln(join(doc.pretty(3),"\n"));
 }
 -------------------------------------------------------------------------------
-Macros:
-    WIKI=Phobos/StdXml
-
 Copyright: Copyright Janice Caron 2008 - 2009.
 License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
 Authors:   Janice Caron

diff --git a/std/zip.d b/std/zip.d
@@ -14,9 +14,6 @@
  *      $(LI $(BUGZILLA 2137))
  *      )
  *
- * Macros:
- *      WIKI = Phobos/StdZip
- *
  * Example:
  * ---
 // Read existing zip file.

diff --git a/std/zlib.d b/std/zlib.d
@@ -43,9 +43,6 @@
  * References:
  *  $(WEB en.wikipedia.org/wiki/Zlib, Wikipedia)
  *
- * Macros:
- *  WIKI = Phobos/StdZlib
- *
  * Copyright: Copyright Digital Mars 2000 - 2011.
  * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   $(WEB digitalmars.com, Walter Bright)
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,10 +6,6 @@ that allow construction of new, useful general-purpose types. @@
     Source:    $(PHOBOSSRC std/_typecons.d)
-    Macros:
-    WIKI = Phobos/StdVariant
     Synopsis:
     ----
@@ Expand Down @@