diff --git a/mozilla/base/tests/makefile.win b/mozilla/base/tests/makefile.win
index ae7dc770356..1f3e7f39166 100644
--- a/mozilla/base/tests/makefile.win
+++ b/mozilla/base/tests/makefile.win
@@ -90,7 +90,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/config/obj.inc b/mozilla/config/obj.inc
index 58afcd4f456..ba36bddb546 100644
--- a/mozilla/config/obj.inc
+++ b/mozilla/config/obj.inc
@@ -140,7 +140,7 @@ CONFIG_OBJ_INC=1
         $(LINCS)
         $(LINCS_1)
         $(INCS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).c
 <<
@@ -167,7 +167,7 @@ CONFIG_OBJ_INC=1
         $(LINCS)
         $(LINCS_1)
         $(INCS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         $(CURDIR)$(*B).c
 <<KEEP
diff --git a/mozilla/editor/txmgr/tests/makefile.win b/mozilla/editor/txmgr/tests/makefile.win
index 617b9c8ade8..8eee8f80f03 100644
--- a/mozilla/editor/txmgr/tests/makefile.win
+++ b/mozilla/editor/txmgr/tests/makefile.win
@@ -58,7 +58,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/intl/locale/tests/makefile.win b/mozilla/intl/locale/tests/makefile.win
index 05cd2c959d9..c2bec7c13ff 100644
--- a/mozilla/intl/locale/tests/makefile.win
+++ b/mozilla/intl/locale/tests/makefile.win
@@ -58,7 +58,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/intl/lwbrk/tests/makefile.win b/mozilla/intl/lwbrk/tests/makefile.win
index df2cb6fab7e..bbcd4be9f89 100644
--- a/mozilla/intl/lwbrk/tests/makefile.win
+++ b/mozilla/intl/lwbrk/tests/makefile.win
@@ -53,7 +53,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/intl/strres/tests/makefile.win b/mozilla/intl/strres/tests/makefile.win
index 6ffb3fa52f8..664f834b949 100644
--- a/mozilla/intl/strres/tests/makefile.win
+++ b/mozilla/intl/strres/tests/makefile.win
@@ -58,7 +58,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/intl/unicharutil/tests/makefile.win b/mozilla/intl/unicharutil/tests/makefile.win
index 7a6a65939f3..5e96ee05ffe 100644
--- a/mozilla/intl/unicharutil/tests/makefile.win
+++ b/mozilla/intl/unicharutil/tests/makefile.win
@@ -52,7 +52,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/intl/unicharutil/tools/makefile.win b/mozilla/intl/unicharutil/tools/makefile.win
index 1264a5cc9cf..f3e8185eb19 100644
--- a/mozilla/intl/unicharutil/tools/makefile.win
+++ b/mozilla/intl/unicharutil/tools/makefile.win
@@ -46,7 +46,7 @@ include <$(DEPTH)\config\rules.mak>
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).c
diff --git a/mozilla/js/src/xpconnect/tests/makefile.win b/mozilla/js/src/xpconnect/tests/makefile.win
index a84cbaf0521..79160d04e53 100644
--- a/mozilla/js/src/xpconnect/tests/makefile.win
+++ b/mozilla/js/src/xpconnect/tests/makefile.win
@@ -57,7 +57,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/xpcom/libxpt/tests/makefile.win b/mozilla/xpcom/libxpt/tests/makefile.win
index 1674e0c8f29..2d4672006d5 100644
--- a/mozilla/xpcom/libxpt/tests/makefile.win
+++ b/mozilla/xpcom/libxpt/tests/makefile.win
@@ -54,7 +54,7 @@ install:: $(PROGRAMS)
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).c
diff --git a/mozilla/xpcom/libxpt/tools/makefile.win b/mozilla/xpcom/libxpt/tools/makefile.win
index a7ed765799b..20689142db9 100644
--- a/mozilla/xpcom/libxpt/tools/makefile.win
+++ b/mozilla/xpcom/libxpt/tools/makefile.win
@@ -54,7 +54,7 @@ install:: $(PROGRAMS)
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).c
diff --git a/mozilla/xpcom/libxpt/xptcall/tests/makefile.win b/mozilla/xpcom/libxpt/xptcall/tests/makefile.win
index 157a1236a12..5f9dfdad14a 100644
--- a/mozilla/xpcom/libxpt/xptcall/tests/makefile.win
+++ b/mozilla/xpcom/libxpt/xptcall/tests/makefile.win
@@ -57,7 +57,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/xpcom/libxpt/xptinfo/tests/makefile.win b/mozilla/xpcom/libxpt/xptinfo/tests/makefile.win
index 943342a6423..c259bf0c4cf 100644
--- a/mozilla/xpcom/libxpt/xptinfo/tests/makefile.win
+++ b/mozilla/xpcom/libxpt/xptinfo/tests/makefile.win
@@ -55,7 +55,7 @@ install:: $(PROGRAMS)
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/xpcom/reflect/xptcall/tests/makefile.win b/mozilla/xpcom/reflect/xptcall/tests/makefile.win
index 157a1236a12..5f9dfdad14a 100644
--- a/mozilla/xpcom/reflect/xptcall/tests/makefile.win
+++ b/mozilla/xpcom/reflect/xptcall/tests/makefile.win
@@ -57,7 +57,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win
index 943342a6423..c259bf0c4cf 100644
--- a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win
+++ b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win
@@ -55,7 +55,7 @@ install:: $(PROGRAMS)
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/xpcom/tests/makefile.win b/mozilla/xpcom/tests/makefile.win
index 4e17318517b..87e2742ecf0 100644
--- a/mozilla/xpcom/tests/makefile.win
+++ b/mozilla/xpcom/tests/makefile.win
@@ -61,7 +61,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/xpcom/tests/windows/makefile.win b/mozilla/xpcom/tests/windows/makefile.win
index a1a4416b4c6..c462dd7cdfc 100644
--- a/mozilla/xpcom/tests/windows/makefile.win
+++ b/mozilla/xpcom/tests/windows/makefile.win
@@ -53,7 +53,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/xpcom/tools/windows/makefile.win b/mozilla/xpcom/tools/windows/makefile.win
index 53a7f0acda7..c06158edd32 100644
--- a/mozilla/xpcom/tools/windows/makefile.win
+++ b/mozilla/xpcom/tools/windows/makefile.win
@@ -46,7 +46,7 @@ clobber::
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).cpp
diff --git a/mozilla/xpcom/typelib/xpt/tests/makefile.win b/mozilla/xpcom/typelib/xpt/tests/makefile.win
index 1674e0c8f29..2d4672006d5 100644
--- a/mozilla/xpcom/typelib/xpt/tests/makefile.win
+++ b/mozilla/xpcom/typelib/xpt/tests/makefile.win
@@ -54,7 +54,7 @@ install:: $(PROGRAMS)
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).c
diff --git a/mozilla/xpcom/typelib/xpt/tools/makefile.win b/mozilla/xpcom/typelib/xpt/tools/makefile.win
index a7ed765799b..20689142db9 100644
--- a/mozilla/xpcom/typelib/xpt/tools/makefile.win
+++ b/mozilla/xpcom/typelib/xpt/tools/makefile.win
@@ -54,7 +54,7 @@ install:: $(PROGRAMS)
         $(INCS)
         $(LLIBS)
         $(OS_LIBS)
-        -Fd$(PBDFILE)
+        -Fd$(PDBFILE)
         -Fe.\$(OBJDIR)\
         -Fo.\$(OBJDIR)\
         $(CURDIR)$(*B).c