diff --git a/std.ddoc b/std.ddoc
index 9332e61f9..2e4b2b921 100644
--- a/std.ddoc
+++ b/std.ddoc
@@ -127,6 +127,7 @@ NAVIGATION_PHOBOS=
 	$(LI <a href="std_demangle.html" title="Demangle D names">std.demangle</a>)
 	$(LI <a href="std_file.html" title="Basic file operations">std.file</a>)
 	$(LI <a href="std_format.html" title="Formatted conversions of values to strings">std.format</a>)
+	$(LI <a href="std_functional.html" title="functional">std.functional</a>)
 	$(LI <a href="std_gc.html" title="Control the garbage collector">std.gc</a>)
 	$(LI <a href="std_getopt.html" title="Command line options">std.getopt</a>)
 	$(LI <a href="std_intrinsic.html" title="Compiler built in intrinsic functions">std.intrinsic</a>)
@@ -143,6 +144,7 @@ NAVIGATION_PHOBOS=
 	$(LI <a href="std_random.html" title="Random number generation">std.random</a>)
 	$(LI <a href="std_regexp.html" title="regular expressions">std.regexp</a>)
 	$(LI <a href="std_signals.html" title="Signals">std.signals</a>)
+	$(LI <a href="std_slist.html" title="Singly linked list">std.slist</a>)
 	$(LI <a href="std_socket.html" title="Sockets">std.socket</a>)
 	$(LI <a href="std_socketstream.html" title="Stream for a blocking, connected Socket">std.socketstream</a>)
 	$(LI <a href="std_stdint.html" title="Integral types for various purposes">std.stdint</a>)
diff --git a/unittest.d b/unittest.d
index fa2990b82..84b483e45 100644
--- a/unittest.d
+++ b/unittest.d
@@ -25,7 +25,63 @@
 // to run the unit tests on them.
 // Then, it prints out the arguments passed to main().
 
-import all_std_modules_generated;
+public import std.array;
+public import std.asserterror;
+public import std.base64;
+public import std.bind;
+public import std.bitarray;
+public import std.boxer;
+public import std.compiler;
+public import std.contracts;
+public import std.conv;
+public import std.cover;
+public import std.cpuid;
+public import std.cstream;
+public import std.ctype;
+public import std.date;
+public import std.dateparse;
+public import std.demangle;
+public import std.file;
+public import std.format;
+public import std.gc;
+public import std.getopt;
+public import std.hiddenfunc;
+public import std.intrinsic;
+public import std.loader;
+public import std.math;
+public import std.math2;
+public import std.md5;
+public import std.metastrings;
+public import std.mmfile;
+public import std.moduleinit;
+public import std.openrj;
+public import std.outbuffer;
+public import std.outofmemory;
+public import std.path;
+public import std.perf;
+public import std.process;
+public import std.random;
+public import std.regexp;
+public import std.signals;
+//public import std.slist;
+public import std.socket;
+public import std.socketstream;
+public import std.stdint;
+public import std.stdio;
+public import std.stream;
+public import std.string;
+public import std.switcherr;
+public import std.syserror;
+public import std.system;
+public import std.thread;
+public import std.traits;
+public import std.typetuple;
+public import std.uni;
+public import std.uri;
+public import std.utf;
+public import std.variant;
+public import std.zip;
+public import std.zlib;
 
 int main(char[][] args)
 {
diff --git a/win32.mak b/win32.mak
index a6a8a00a0..9df8910f9 100644
--- a/win32.mak
+++ b/win32.mak
@@ -123,6 +123,7 @@ DOCS=	$(DOC)\std_path.html $(DOC)\std_math.html $(DOC)\std_outbuffer.html \
 	$(DOC)\std_process.html \
 	$(DOC)\std_regexp.html \
 	$(DOC)\std_signals.html \
+	$(DOC)\std_slist.html \
 	$(DOC)\std_socket.html \
 	$(DOC)\std_socketstream.html \
 	$(DOC)\std_stdint.html \
@@ -791,6 +792,9 @@ $(DOC)\std_regexp.html : std.ddoc std\regexp.d
 $(DOC)\std_signals.html : std.ddoc std\signals.d
 	$(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_signals.html std.ddoc std\signals.d
 
+$(DOC)\std_slist.html : std.ddoc std\slist.d
+	$(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_slist.html std.ddoc std\slist.d
+
 $(DOC)\std_socket.html : std.ddoc std\socket.d
 	$(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_socket.html std.ddoc std\socket.d