--- a/mailnews/local/src/nsMailboxProtocol.cpp
+++ b/mailnews/local/src/nsMailboxProtocol.cpp
@@ -17,35 +17,34 @@
 #include "nsICopyMsgStreamListener.h"
 #include "nsMsgMessageFlags.h"
 #include "prtime.h"
 #include "mozilla/Logging.h"
 #include "mozilla/SlicedInputStream.h"
 #include "prerror.h"
 #include "prprf.h"
 #include "nspr.h"
-
-static mozilla::LazyLogModule MAILBOX("MAILBOX");
-
 #include "nsIFileStreams.h"
 #include "nsIStreamTransportService.h"
 #include "nsIStreamConverterService.h"
 #include "nsIIOService.h"
 #include "nsNetUtil.h"
 #include "nsMsgUtils.h"
 #include "nsIMsgWindow.h"
 #include "nsIMimeHeaders.h"
 #include "nsIMsgPluggableStore.h"
 #include "nsISeekableStream.h"
 #include "nsStreamUtils.h"
 
 #include "nsIMsgMdnGenerator.h"
 
 using namespace mozilla;
 
+static LazyLogModule MAILBOX("MAILBOX");
+
 /* the output_buffer_size must be larger than the largest possible line
  * 2000 seems good for news
  *
  * jwz: I increased this to 4k since it must be big enough to hold the
  * entire button-bar HTML, and with the new "mailto" format, that can
  * contain arbitrarily long header fields like "references".
  *
  * fortezza: proxy auth is huge, buffer increased to 8k (sigh).
@@ -398,17 +397,17 @@ NS_IMETHODIMP nsMailboxProtocol::OnStopR
   // protocol connection....
   m_nextState = MAILBOX_DONE;
 
   // the following is for smoke test purposes. QA is looking at this "Mailbox Done" string which
   // is printed out to the console and determining if the mail app loaded up correctly...obviously
   // this solution is not very good so we should look at something better, but don't remove this
   // line before talking to me (mscott) and mailnews QA....
 
-  MOZ_LOG(MAILBOX, mozilla::LogLevel::Info, ("Mailbox Done\n"));
+  MOZ_LOG(MAILBOX, LogLevel::Info, ("Mailbox Done\n"));
 
   // when on stop binding is called, we as the protocol are done...let's close down the connection
   // releasing all of our interfaces. It's important to remember that this on stop binding call
   // is coming from netlib so they are never going to ping us again with on data available. This means
   // we'll never be going through the Process loop...
 
   if (m_multipleMsgMoveCopyStream)
   {

--- a/mailnews/news/src/nsNNTPProtocol.cpp
+++ b/mailnews/news/src/nsNNTPProtocol.cpp
@@ -18,20 +18,20 @@
 #include "nsMsgI18N.h"
 #include "nsINNTPNewsgroupPost.h"
 #include "nsMsgBaseCID.h"
 #include "nsMsgNewsCID.h"
 
 #include "nsINntpUrl.h"
 #include "prmem.h"
 #include "prtime.h"
-#include "mozilla/Logging.h"
 #include "prerror.h"
 #include "nsString.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Services.h"
 #include "mozilla/SlicedInputStream.h"
 #include "mozilla/mailnews/MimeHeaderParser.h"
 #include "nsContentUtils.h"
 
 #include "prprf.h"
 #include <algorithm>