diff --git a/config/WIN32 b/config/WIN32
index 041f9703464..0a46f79a118 100644
--- a/config/WIN32
+++ b/config/WIN32
@@ -72,10 +72,11 @@ OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:$(PDBFILE)
 # an optimized build with debugging symbols. Useful for debugging
 # compiler optimization bugs, as well as running with Quantify.
 
-!ifdef MOZ_PROFILE
-OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:NONE /OPT:REF /OPT:nowin98
+!if defined(MOZ_COVERAGE) || defined (MOZ_PROFILE)
+OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:$(PDBFILE) /OPT:REF /OPT:nowin98
 OPTIMIZER=-Zi -O1 -UDEBUG -DNDEBUG
 !else
+
 # MOZ_PROFILE not set.
 # optimize it, no symbols
 #
diff --git a/config/makefile.win b/config/makefile.win
index 2c77415ad85..e3c0320b2ff 100644
--- a/config/makefile.win
+++ b/config/makefile.win
@@ -106,10 +106,10 @@ trace.dll:: trace.obj pldhash.obj
     $(LD) /nologo /debug /libpath:$(DIST)/lib /dll /out:$@ $** nspr4.lib imagehlp.lib
 
 pldhash.obj:: $(DEPTH)/xpcom/ds/pldhash.c
-    $(CC) /c /nologo /Od /Z7 /I$(DEPTH)/xpcom/ds /I$(DEPTH)/dist/include $**
+    $(CC) /c /nologo /Od /Z7 /I$(DEPTH)/xpcom/ds /I$(DEPTH)/dist/include/nspr $**
  
 trace.obj:: trace.cpp
-    $(CC) /c /nologo /Od /Z7 /DMOZ_SRC=\"$(MOZ_SRC)\" /I$(DEPTH)/xpcom/ds /I$(DEPTH)/dist/include $**
+    $(CC) /c /nologo /Od /Z7 /DMOZ_SRC=\"$(MOZ_SRC)\" /I$(DEPTH)/xpcom/ds /I$(DEPTH)/dist/include/nspr $**
 !endif
 
 export:: \
diff --git a/config/trace.cpp b/config/trace.cpp
index c2ea85cf9a9..c6d7522b371 100644
--- a/config/trace.cpp
+++ b/config/trace.cpp
@@ -40,6 +40,7 @@ public:
 };
 
 static Reporter theReporter;
+static FILE* logfile;
 
 /* 
    Hash of function names, and call counts]
@@ -162,24 +163,24 @@ DumpFiles(PLDHashTable* table, PLDHashEntryHdr* hdr,
 {
     ModulesEntry* entry = (ModulesEntry*) hdr;    
     Node*         cur = entry->byCount;
-    char          dest[256];
-    char          pdbName[256];
+    char          dest[MAX_PATH];
+    char          pdbName[MAX_PATH];
     FILE*         orderFile;
 
     strcpy(pdbName, entry->moduleName);
     strcat(pdbName, ".pdb");
 
-    if ( !::FindExecutableImage(pdbName, MOZ_SRC, dest) ) {
-        printf("+++ERROR Could not find %s\n",pdbName);
+    if (!::SearchTreeForFile(MOZ_SRC, pdbName, dest) ) {
+        fprintf(logfile,"+++ERROR Could not find %s\n",pdbName);
         return PL_DHASH_NEXT;
     }
     dest[strlen(dest)-strlen(pdbName)-strlen("WIN32_D.OBJ\\")] = 0;
     strcat(dest,"win32.order");
     orderFile = fopen(dest,"w");
-    printf("Creating order file %s\n",dest);
+    fprintf(logfile,"Creating order file %s\n",dest);
     
-    while( cur ) {
-	if(cur->function[0] == '_' && cur->function[1] == '_')
+    while (cur) {
+        if (cur->function[0] == '_')  // demangle "C" style function names
             fprintf(orderFile,"%s ; %d\n", cur->function+1, cur->count );
         else
             fprintf(orderFile,"%s ; %d\n", cur->function, cur->count );
@@ -223,6 +224,8 @@ ListCounts(PLDHashTable* table, PLDHashEntryHdr* hdr,
 
     if (ok)
     {
+        if (displacement > 0) 
+            return PL_DHASH_NEXT;
         static int modInitialized = 0;
         if (! modInitialized) {
             modInitialized = 1;
@@ -249,16 +252,16 @@ ListCounts(PLDHashTable* table, PLDHashEntryHdr* hdr,
             foo->function = strdup(symbol->Name);
             foo->count = entry->count;
 
-            if ( cur->count < entry->count ) {
+            if (cur->count < entry->count) {
                 if (!strcmp(cur->function,symbol->Name)) 
                     return PL_DHASH_NEXT;
                 foo->next = mod->byCount;
                 mod->byCount = foo;                
             } else {
-                while ( cur->next ) {
+                while (cur->next) {
                     if (!strcmp(cur->function,symbol->Name)) 
                         return PL_DHASH_NEXT;
-                    if ( cur->next->count > entry->count ) { cur = cur->next; }
+                    if (cur->next->count > entry->count) { cur = cur->next; }
                     else { break; }
                 }
                 foo->next = cur->next;  
@@ -278,13 +281,18 @@ Reporter::~Reporter()
     // We want the nasty name, as we'll have to pass it back to the
     // linker.
     options &= ~SYMOPT_UNDNAME;
-
     SymSetOptions(options);
 
+    char logName[MAX_PATH];
+    strcpy(logName,MOZ_SRC);
+    strcat(logName,"\\tracelog");
+    logfile = fopen(logName,"w");
+
     // break the function names out by module and sort them.
     PL_DHashTableEnumerate(&Calls, ListCounts, NULL);
     // dump the order files for each module.
     PL_DHashTableEnumerate(&Modules, DumpFiles, NULL);
 
+    fclose(logfile);
     SymCleanup(GetCurrentProcess());
 }