diff --git a/dstep/translator/HeaderIndex.d b/dstep/translator/HeaderIndex.d
index ae1b2531..95ee556e 100644
--- a/dstep/translator/HeaderIndex.d
+++ b/dstep/translator/HeaderIndex.d
@@ -220,6 +220,92 @@ class IncludeGraph
     }
 }
 
+package immutable string[string] knownIncludes;
+
+shared static this ()
+{
+    knownIncludes = [
+        // standard c library
+        "assert.h" : "core.stdc.assert_",
+        "ctype.h" : "core.stdc.ctype",
+        "errno.h" : "core.stdc.errno",
+        "float.h" : "core.stdc.float_",
+        "limits.h" : "core.stdc.limits",
+        "locale.h" : "core.stdc.locale",
+        "math.h" : "core.stdc.math",
+        "signal.h" : "core.stdc.signal",
+        "stdarg.h" : "core.stdc.stdarg",
+        "stddef.h" : "core.stdc.stddef",
+        "stdio.h" : "core.stdc.stdio",
+        "stdlib.h" : "core.stdc.stdlib",
+        "string.h" : "core.stdc.string",
+        "time.h" : "core.stdc.time",
+        "wctype.h" : "core.stdc.wctype",
+        "wchar.h" : "core.stdc.wchar_",
+        "complex.h" : "core.stdc.complex",
+        "fenv.h" : "core.stdc.fenv",
+        "inttypes.h" : "core.stdc.inttypes",
+        "tgmath.h" : "core.stdc.tgmath",
+        "stdint.h" : "core.stdc.stdint",
+        "config.h" : "core.stdc.config",
+
+        // posix library
+        "dirent.h" : "core.sys.posix.dirent",
+        "dlfcn.h" : "core.sys.posix.dlfcn",
+        "fcntl.h" : "core.sys.posix.fcntl",
+        "netdb.h" : "core.sys.posix.netdb",
+        "poll.h" : "core.sys.posix.poll",
+        "pthread.h" : "core.sys.posix.pthread",
+        "pwd.h" : "core.sys.posix.pwd",
+        "sched.h" : "core.sys.posix.sched",
+        "semaphore.h" : "core.sys.posix.semaphore",
+        "setjmp.h" : "core.sys.posix.setjmp",
+        "signal.h" : "core.sys.posix.signal",
+        "termios.h" : "core.sys.posix.termios",
+        "ucontext.h" : "core.sys.posix.ucontext",
+        "unistd.h" : "core.sys.posix.unistd",
+        "utime.h" : "core.sys.posix.utime",
+        "arpa/inet.h" : "core.sys.posix.arpa.inet",
+        "net/if.h" : "core.sys.posix.net.if_",
+        "netinet/in.h" : "core.sys.posix.netinet.in_",
+        "netinet/tcp.h" : "core.sys.posix.netinet.tcp",
+        "sys/ipc.h" : "core.sys.posix.sys.ipc",
+        "sys/mman.h" : "core.sys.posix.sys.mman",
+        "sys/select.h" : "core.sys.posix.sys.select",
+        "sys/shm.h" : "core.sys.posix.sys.shm",
+        "sys/socket.h" : "core.sys.posix.sys.socket",
+        "sys/stat.h" : "core.sys.posix.sys.stat",
+        "sys/time.h" : "core.sys.posix.sys.time",
+        "sys/types.h" : "core.sys.posix.sys.types",
+        "sys/_types.h" : "core.sys.posix.sys.types",
+        "sys/uio.h" : "core.sys.posix.sys.uio",
+        "sys/un.h" : "core.sys.posix.sys.un",
+        "sys/utsname.h" : "core.sys.posix.sys.utsname",
+        "sys/wait.h" : "core.sys.posix.sys.wait",
+        "sys/ioctl.h" : "core.sys.posix.sys.ioctl",
+
+        // windows library
+        "windows.h" : "core.sys.windows.windows",
+        "windows" : "core.sys.windows.windows",
+        "corecrt_wstdio" : "core.stdc.stdio",
+        "corecrt" : "core.stdc.time",
+        "crtdefs" : "core.stdc.time",
+
+        // other
+        "_int8_t" : "core.stdc.stdint",
+        "_int16_t" : "core.stdc.stdint",
+        "_int32_t" : "core.stdc.stdint",
+        "_int64_t" : "core.stdc.stdint",
+        "_uint8_t" : "core.stdc.stdint",
+        "_uint16_t" : "core.stdc.stdint",
+        "_uint32_t" : "core.stdc.stdint",
+        "_uint64_t" : "core.stdc.stdint",
+        "_stdio" : "core.stdc.stdio",
+        "_time_t" : "core.stdc.time",
+        "config" : "core.stdc.config"
+    ];
+}
+
 class HeaderIndex
 {
     private IncludeGraph includeGraph_;
@@ -229,68 +315,7 @@ class HeaderIndex
 
     public this(TranslationUnit translationUnit)
     {
-        immutable string[string] standardModuleMapping = [
-            // standard c library
-            "assert.h" : "core.stdc.assert_",
-            "ctype.h" : "core.stdc.ctype",
-            "errno.h" : "core.stdc.errno",
-            "float.h" : "core.stdc.float_",
-            "limits.h" : "core.stdc.limits",
-            "locale.h" : "core.stdc.locale",
-            "math.h" : "core.stdc.math",
-            "signal.h" : "core.stdc.signal",
-            "stdarg.h" : "core.stdc.stdarg",
-            "stddef.h" : "core.stdc.stddef",
-            "stdio.h" : "core.stdc.stdio",
-            "stdlib.h" : "core.stdc.stdlib",
-            "string.h" : "core.stdc.string",
-            "time.h" : "core.stdc.time",
-            "wctype.h" : "core.stdc.wctype",
-            "wchar.h" : "core.stdc.wchar_",
-            "complex.h" : "core.stdc.complex",
-            "fenv.h" : "core.stdc.fenv",
-            "inttypes.h" : "core.stdc.inttypes",
-            "tgmath.h" : "core.stdc.tgmath",
-            "stdint.h" : "core.stdc.stdint",
-            // posix library
-            "dirent.h" : "core.sys.posix.dirent",
-            "dlfcn.h" : "core.sys.posix.dlfcn",
-            "fcntl.h" : "core.sys.posix.fcntl",
-            "netdb.h" : "core.sys.posix.netdb",
-            "poll.h" : "core.sys.posix.poll",
-            "pthread.h" : "core.sys.posix.pthread",
-            "pwd.h" : "core.sys.posix.pwd",
-            "sched.h" : "core.sys.posix.sched",
-            "semaphore.h" : "core.sys.posix.semaphore",
-            "setjmp.h" : "core.sys.posix.setjmp",
-            "signal.h" : "core.sys.posix.signal",
-            "termios.h" : "core.sys.posix.termios",
-            "ucontext.h" : "core.sys.posix.ucontext",
-            "unistd.h" : "core.sys.posix.unistd",
-            "utime.h" : "core.sys.posix.utime",
-            "arpa/inet.h" : "core.sys.posix.arpa.inet",
-            "net/if.h" : "core.sys.posix.net.if_",
-            "netinet/in.h" : "core.sys.posix.netinet.in_",
-            "netinet/tcp.h" : "core.sys.posix.netinet.tcp",
-            "sys/ipc.h" : "core.sys.posix.sys.ipc",
-            "sys/mman.h" : "core.sys.posix.sys.mman",
-            "sys/select.h" : "core.sys.posix.sys.select",
-            "sys/shm.h" : "core.sys.posix.sys.shm",
-            "sys/socket.h" : "core.sys.posix.sys.socket",
-            "sys/stat.h" : "core.sys.posix.sys.stat",
-            "sys/time.h" : "core.sys.posix.sys.time",
-            "sys/types.h" : "core.sys.posix.sys.types",
-            "sys/_types.h" : "core.sys.posix.sys.types",
-            "sys/uio.h" : "core.sys.posix.sys.uio",
-            "sys/un.h" : "core.sys.posix.sys.un",
-            "sys/utsname.h" : "core.sys.posix.sys.utsname",
-            "sys/wait.h" : "core.sys.posix.sys.wait",
-            "sys/ioctl.h" : "core.sys.posix.sys.ioctl",
-            // windows library
-            "windows" : "core.sys.windows.windows"
-        ];
-
-        this (translationUnit, standardModuleMapping);
+        this (translationUnit, knownIncludes);
     }
 
     public this(
diff --git a/dstep/translator/IncludeHandler.d b/dstep/translator/IncludeHandler.d
index 24aeb49b..c1cf324f 100644
--- a/dstep/translator/IncludeHandler.d
+++ b/dstep/translator/IncludeHandler.d
@@ -29,87 +29,6 @@ class IncludeHandler
     private bool[string] imports;
     private Set!string publicImports;
     private HeaderIndex headerIndex;
-    immutable static string[string] knownIncludes;
-
-    shared static this ()
-    {
-        knownIncludes = [
-            "complex" : "core.stdc.complex",
-            "config" : "core.stdc.config",
-            "ctype" : "core.stdc.ctype",
-            "errno" : "core.stdc.errno",
-            "fenv" : "core.stdc.fenv",
-            "float" : "core.stdc.float",
-            "inttypes" : "core.stdc.inttypes",
-            "limits" : "core.stdc.limits",
-            "locale" : "core.stdc.locale",
-            "math" : "core.stdc.math",
-            "signal" : "core.stdc.signal",
-            "stdarg" : "core.stdc.stdarg",
-            "stddef" : "core.stdc.stddef",
-            "stdint" : "core.stdc.stdint",
-            "_int8_t" : "core.stdc.stdint",
-            "_int16_t" : "core.stdc.stdint",
-            "_int32_t" : "core.stdc.stdint",
-            "_int64_t" : "core.stdc.stdint",
-            "_uint8_t" : "core.stdc.stdint",
-            "_uint16_t" : "core.stdc.stdint",
-            "_uint32_t" : "core.stdc.stdint",
-            "_uint64_t" : "core.stdc.stdint",
-            "stdio" : "core.stdc.stdio",
-            "_stdio" : "core.stdc.stdio",
-            "corecrt_wstdio" : "core.stdc.stdio",
-            "stdlib" : "core.stdc.stdlib",
-            "string" : "core.stdc.string",
-            "tgmath" : "core.stdc.tgmath",
-            "time" : "core.stdc.time",
-            "_time_t" : "core.stdc.time",
-            "corecrt" : "core.stdc.time",
-            "crtdefs" : "core.stdc.time",
-            "wchar" : "core.stdc.wchar_",
-            "wctype" : "core.stdc.wctype",
-
-            "dirent" : "core.sys.posix.dirent",
-            "dlfcn" : "core.sys.posix.dlfcn",
-            "fcntl" : "core.sys.posix.fcntl",
-            "netdb" : "core.sys.posix.netdb",
-            "poll" : "core.sys.posix.poll",
-            "pthread" : "core.sys.posix.pthread",
-            "pwd" : "core.sys.posix.pwd",
-            "sched" : "core.sys.posix.sched",
-            "semaphore" : "core.sys.posix.semaphore",
-            "setjmp" : "core.sys.posix.setjmp",
-            "signal" : "core.sys.posix.signal",
-            "termios" : "core.sys.posix.termios",
-            "ucontext" : "core.sys.posix.ucontext",
-            "unistd" : "core.sys.posix.unistd",
-            "utime" : "core.sys.posix.utime",
-
-            "arpa/inet" : "core.sys.posix.arpa.inet",
-
-            "net/if" : "core.sys.posix.net.if_",
-
-            "netinet/in" : "core.sys.posix.netinet.in_",
-            "netinet/tcp" : "core.sys.posix.netinet.tcp",
-
-            "sys/ipc" : "core.sys.posix.sys.ipc",
-            "sys/mman" : "core.sys.posix.sys.mman",
-            "sys/select" : "core.sys.posix.sys.select",
-            "sys/shm" : "core.sys.posix.sys.shm",
-            "sys/socket" : "core.sys.posix.sys.socket",
-            "sys/stat" : "core.sys.posix.sys.stat",
-            "sys/time" : "core.sys.posix.sys.time",
-            "_time_t" : "core.stdc.time",
-            "sys/types" : "core.sys.posix.sys.types",
-            "sys/_types" : "core.sys.posix.sys.types",
-            "sys/uio" : "core.sys.posix.sys.uio",
-            "sys/un" : "core.sys.posix.sys.un",
-            "sys/utsname" : "core.sys.posix.sys.utsname",
-            "sys/wait" : "core.sys.posix.sys.wait",
-
-            "windows" : "core.sys.windows.windows"
-        ];
-    }
 
     this (HeaderIndex headerIndex, Options options)
     {
@@ -248,10 +167,6 @@ private:
 
     string isKnownInclude (string include)
     {
-        import std.path : stripExtension, baseName;
-
-        include = stripExtension(baseName(include));
-
         if (auto ptr = include in knownIncludes)
             return *ptr;
         else