diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index afbe4e109b5..afe17bbdcae 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -29,6 +29,21 @@
 // which is why this fix is here instead of in _os2.h
 typedef unsigned long HMTX;
 #endif
+
+#ifdef DEBUG
+#undef NOISY_LINKS
+#undef NOISY_WEBSHELL_LEAKS
+#else
+#undef NOISY_LINKS
+#undef NOISY_WEBSHELL_LEAKS
+#endif
+
+#define NOISY_WEBSHELL_LEAKS
+#ifdef NOISY_WEBSHELL_LEAKS
+#undef DETECT_WEBSHELL_LEAKS
+#define DETECT_WEBSHELL_LEAKS
+#endif
+
 #include "nsDocShell.h"
 #include "nsIWebShell.h"
 #include "nsWebShell.h"
@@ -118,21 +133,6 @@ static NS_DEFINE_CID(kCharsetConverterManagerCID,  NS_ICHARSETCONVERTERMANAGER_C
 //XXX for nsIPostData; this is wrong; we shouldn't see the nsIDocument type
 #include "nsIDocument.h"
 
-
-#ifdef DEBUG
-#undef NOISY_LINKS
-#undef NOISY_WEBSHELL_LEAKS
-#else
-#undef NOISY_LINKS
-#undef NOISY_WEBSHELL_LEAKS
-#endif
-
-#define NOISY_WEBSHELL_LEAKS
-#ifdef NOISY_WEBSHELL_LEAKS
-#undef DETECT_WEBSHELL_LEAKS
-#define DETECT_WEBSHELL_LEAKS
-#endif
-
 #define SH_IN_FRAMES 1
 
 #ifdef NS_DEBUG
diff --git a/mozilla/docshell/base/nsWebShell.h b/mozilla/docshell/base/nsWebShell.h
index 9c320b18dda..3e575ce3e36 100644
--- a/mozilla/docshell/base/nsWebShell.h
+++ b/mozilla/docshell/base/nsWebShell.h
@@ -145,7 +145,8 @@ protected:
 private:
   // We're counting the number of |nsWebShells| to help find leaks
   static unsigned long gNumberOfWebShells;
-#endif
+#endif /* DETECT_WEBSHELL_LEAKS */
 };
 
-#endif
\ No newline at end of file
+#endif /* webshell____h */
+