diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index df4f76d0e35..96a51918220 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -20,6 +20,9 @@
  * Contributor(s): 
  */
 
+#include "nslog.h"
+#undef printf
+
 #include "nsPluginHostImpl.h"
 #include <stdio.h>
 #include "prio.h"
@@ -50,7 +53,6 @@
 #include "nsNetUtil.h"
 #include "nsIProgressEventSink.h"
 #include "nsIDocument.h"
-#include "nslog.h"
 
 NS_IMPL_LOG(nsPluginHostImplLog)
 #define PRINTF NS_LOG_PRINTF(nsPluginHostImplLog)
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
index df4f76d0e35..96a51918220 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@@ -20,6 +20,9 @@
  * Contributor(s): 
  */
 
+#include "nslog.h"
+#undef printf
+
 #include "nsPluginHostImpl.h"
 #include <stdio.h>
 #include "prio.h"
@@ -50,7 +53,6 @@
 #include "nsNetUtil.h"
 #include "nsIProgressEventSink.h"
 #include "nsIDocument.h"
-#include "nslog.h"
 
 NS_IMPL_LOG(nsPluginHostImplLog)
 #define PRINTF NS_LOG_PRINTF(nsPluginHostImplLog)