diff --git a/mozilla/editor/txmgr/tests/TestTXMgr.cpp b/mozilla/editor/txmgr/tests/TestTXMgr.cpp
index 602e66b38ca..b5119275364 100644
--- a/mozilla/editor/txmgr/tests/TestTXMgr.cpp
+++ b/mozilla/editor/txmgr/tests/TestTXMgr.cpp
@@ -37,6 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdlib.h>
+#include <stdio.h>
 #include "nsXPCOM.h"
 #include "nsITransactionManager.h"
 #include "nsIComponentManager.h"
diff --git a/mozilla/intl/unicharutil/util/nsCompressedCharMap.cpp b/mozilla/intl/unicharutil/util/nsCompressedCharMap.cpp
index 1211e4ef699..5b26edb7709 100644
--- a/mozilla/intl/unicharutil/util/nsCompressedCharMap.cpp
+++ b/mozilla/intl/unicharutil/util/nsCompressedCharMap.cpp
@@ -37,6 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include <stdio.h>
 #include "prmem.h"
 #include "nsCRT.h"
 #include "nsICharRepresentable.h"
diff --git a/mozilla/rdf/tests/rdfcat/rdfcat.cpp b/mozilla/rdf/tests/rdfcat/rdfcat.cpp
index 3dbc0980fa1..f34bcf6316e 100644
--- a/mozilla/rdf/tests/rdfcat/rdfcat.cpp
+++ b/mozilla/rdf/tests/rdfcat/rdfcat.cpp
@@ -47,6 +47,7 @@
 
  */
 
+#include <stdio.h>
 #include "nsCOMPtr.h"
 #include "nsIComponentManager.h"
 #include "nsIEventQueueService.h"
@@ -67,7 +68,6 @@
 #include "prio.h"
 #include "prthread.h"
 
-
 ////////////////////////////////////////////////////////////////////////
 // CIDs
 
diff --git a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h
index 072a6bba139..4141053d27d 100644
--- a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h
+++ b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h
@@ -35,6 +35,7 @@
 #ifndef nsTraceMalloc_h___
 #define nsTraceMalloc_h___
 
+#include <stdio.h> /* for FILE */
 #include "prtypes.h"
 
 PR_BEGIN_EXTERN_C
diff --git a/mozilla/widget/src/xremoteclient/mozilla-xremote-client.cpp b/mozilla/widget/src/xremoteclient/mozilla-xremote-client.cpp
index ae063025d7b..b824fff79c8 100644
--- a/mozilla/widget/src/xremoteclient/mozilla-xremote-client.cpp
+++ b/mozilla/widget/src/xremoteclient/mozilla-xremote-client.cpp
@@ -33,6 +33,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include <stdio.h>
 #include "XRemoteClient.h"
 
 int main(int argc, char **argv)
diff --git a/mozilla/xpcom/base/nsTraceRefcntImpl.h b/mozilla/xpcom/base/nsTraceRefcntImpl.h
index aa6ba7a12b5..f0a4cf821a1 100644
--- a/mozilla/xpcom/base/nsTraceRefcntImpl.h
+++ b/mozilla/xpcom/base/nsTraceRefcntImpl.h
@@ -38,6 +38,7 @@
 #ifndef nsTraceRefcntImpl_h___
 #define nsTraceRefcntImpl_h___
 
+#include <stdio.h> // for FILE
 #include "nsITraceRefcnt.h"
 
 class nsTraceRefcntImpl : public nsITraceRefcnt
diff --git a/mozilla/xpcom/glue/nsTraceRefcnt.h b/mozilla/xpcom/glue/nsTraceRefcnt.h
index 38d9863ff0d..21db27ae891 100644
--- a/mozilla/xpcom/glue/nsTraceRefcnt.h
+++ b/mozilla/xpcom/glue/nsTraceRefcnt.h
@@ -39,7 +39,6 @@
 #define nsTraceRefcnt_h___
 
 #include "nscore.h"
-#include <stdio.h> // XXXldb We should remove this and add it where needed.
 
 class nsISupports;