--- a/docshell/base/nsDocShellEnumerator.h
+++ b/docshell/base/nsDocShellEnumerator.h
@@ -38,17 +38,16 @@
  * ***** END LICENSE BLOCK ***** */
 
 
 
 #include "nsIEnumerator.h"
 
 #include "nsCOMPtr.h"
 #include "nsTArray.h"
-#include "nsIWeakReference.h"
 #include "nsIWeakReferenceUtils.h"
 
 class nsIDocShellTreeItem;
 
 
 /*
 // {13cbc281-35ae-11d5-be5b-bde0edece43c}
 #define NS_DOCSHELL_FORWARDS_ENUMERATOR_CID  \

--- a/embedding/components/commandhandler/src/nsBaseCommandController.h
+++ b/embedding/components/commandhandler/src/nsBaseCommandController.h
@@ -44,17 +44,16 @@
 #define NS_BASECOMMANDCONTROLLER_CONTRACTID \
  "@mozilla.org/embedcomp/base-command-controller;1"
 
 
 #include "nsIController.h"
 #include "nsIControllerContext.h"
 #include "nsIControllerCommandTable.h"
 #include "nsIInterfaceRequestor.h"
-#include "nsIWeakReference.h"
 #include "nsIWeakReferenceUtils.h"
 
 // The base editor controller is used for both text widgets, 
 //   and all other text and html editing
 class nsBaseCommandController :  public nsIController,
                             public nsIControllerContext,
                             public nsIInterfaceRequestor,
                             public nsICommandController

--- a/xpcom/build/XPCOM.h
+++ b/xpcom/build/XPCOM.h
@@ -112,17 +112,16 @@
 #include "nsITimer.h"
 #include "nsITraceRefcnt.h"
 #include "nsIUUIDGenerator.h"
 #include "nsIUnicharInputStream.h"
 #include "nsIUnicharOutputStream.h"
 #include "nsIUnicharLineInputStream.h"
 #include "nsIVariant.h"
 #include "nsIVersionComparator.h"
-#include "nsIWeakReference.h"
 #include "nsIWritablePropertyBag2.h"
 
 // interfaces that include something above
 
 #include "nsIAsyncInputStream.h"
 #include "nsIAsyncOutputStream.h"
 #include "nsIBinaryInputStream.h"
 #include "nsIBinaryOutputStream.h"

--- a/xpcom/glue/nsIWeakReferenceUtils.h
+++ b/xpcom/glue/nsIWeakReferenceUtils.h
@@ -38,16 +38,18 @@
 
 #ifndef nsIWeakReferenceUtils_h__
 #define nsIWeakReferenceUtils_h__
 
 #ifndef nsCOMPtr_h__
 #include "nsCOMPtr.h"
 #endif
 
+#include "nsIWeakReference.h"
+
 typedef nsCOMPtr<nsIWeakReference> nsWeakPtr;
 
 /**
  *
  */
 
 // a type-safe shortcut for calling the |QueryReferent()| member function
 // T must inherit from nsIWeakReference, but the cast may be ambiguous.

--- a/xpcom/glue/nsWeakReference.h
+++ b/xpcom/glue/nsWeakReference.h
@@ -37,17 +37,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsWeakReference_h__
 #define nsWeakReference_h__
 
 // nsWeakReference.h
 
-#include "nsIWeakReference.h"
 #include "nsIWeakReferenceUtils.h"
 
 class nsWeakReference;
 
 // Set IMETHOD_VISIBILITY to empty so that the class-level NS_COM declaration
 // controls member method visibility.
 #undef  IMETHOD_VISIBILITY
 #define IMETHOD_VISIBILITY NS_COM_GLUE

--- a/xpcom/threads/nsProcess.h
+++ b/xpcom/threads/nsProcess.h
@@ -43,17 +43,16 @@
 #if defined(XP_WIN)
 #define PROCESSMODEL_WINAPI
 #endif
 
 #include "nsIProcess.h"
 #include "nsIFile.h"
 #include "nsIThread.h"
 #include "nsIObserver.h"
-#include "nsIWeakReference.h"
 #include "nsIWeakReferenceUtils.h"
 #include "nsIObserver.h"
 #include "nsString.h"
 #ifndef XP_MACOSX
 #include "prproces.h"
 #endif
 #if defined(PROCESSMODEL_WINAPI)
 #include <windows.h>