diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 422d5e8793d..7617589f13f 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -781,21 +781,22 @@ nsWebShell::DestroyChildren()
 NS_IMPL_ADDREF(nsWebShell)
 NS_IMPL_RELEASE(nsWebShell)
 
-NS_IMPL_QUERY_HEAD(nsWebShell)
-   NS_IMPL_QUERY_BODY(nsIWebShell)
-   NS_IMPL_QUERY_BODY(nsIWebShellServices)
-   NS_IMPL_QUERY_BODY(nsIContentViewerContainer)
-   NS_IMPL_QUERY_BODY(nsIScriptContextOwner)
-   NS_IMPL_QUERY_BODY(nsIDocumentLoaderObserver)
-   NS_IMPL_QUERY_BODY(nsIProgressEventSink)
-   NS_IMPL_QUERY_BODY(nsIWebShellContainer)
-   NS_IMPL_QUERY_BODY(nsILinkHandler)
-   NS_IMPL_QUERY_BODY(nsIPrompt)
-   NS_IMPL_QUERY_BODY(nsIRefreshURI)
-   NS_IMPL_QUERY_BODY(nsIClipboardCommands)
-   NS_IMPL_QUERY_BODY(nsIInterfaceRequestor)
-   NS_IMPL_QUERY_BODY(nsIURIContentListener)
-NS_IMPL_QUERY_TAIL(nsIWebShell)
+NS_INTERFACE_MAP_BEGIN(nsWebShell)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebShell)
+   NS_INTERFACE_MAP_ENTRY(nsIWebShell)
+   NS_INTERFACE_MAP_ENTRY(nsIWebShellServices)
+   NS_INTERFACE_MAP_ENTRY(nsIContentViewerContainer)
+   NS_INTERFACE_MAP_ENTRY(nsIScriptContextOwner)
+   NS_INTERFACE_MAP_ENTRY(nsIDocumentLoaderObserver)
+   NS_INTERFACE_MAP_ENTRY(nsIProgressEventSink)
+   NS_INTERFACE_MAP_ENTRY(nsIWebShellContainer)
+   NS_INTERFACE_MAP_ENTRY(nsILinkHandler)
+   NS_INTERFACE_MAP_ENTRY(nsIPrompt)
+   NS_INTERFACE_MAP_ENTRY(nsIRefreshURI)
+   NS_INTERFACE_MAP_ENTRY(nsIClipboardCommands)
+   NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
+   NS_INTERFACE_MAP_ENTRY(nsIURIContentListener)
+NS_INTERFACE_MAP_END
 
 NS_IMETHODIMP
 nsWebShell::GetInterface(const nsIID &aIID, void** aInstancePtr)
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index 422d5e8793d..7617589f13f 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -781,21 +781,22 @@ nsWebShell::DestroyChildren()
 NS_IMPL_ADDREF(nsWebShell)
 NS_IMPL_RELEASE(nsWebShell)
 
-NS_IMPL_QUERY_HEAD(nsWebShell)
-   NS_IMPL_QUERY_BODY(nsIWebShell)
-   NS_IMPL_QUERY_BODY(nsIWebShellServices)
-   NS_IMPL_QUERY_BODY(nsIContentViewerContainer)
-   NS_IMPL_QUERY_BODY(nsIScriptContextOwner)
-   NS_IMPL_QUERY_BODY(nsIDocumentLoaderObserver)
-   NS_IMPL_QUERY_BODY(nsIProgressEventSink)
-   NS_IMPL_QUERY_BODY(nsIWebShellContainer)
-   NS_IMPL_QUERY_BODY(nsILinkHandler)
-   NS_IMPL_QUERY_BODY(nsIPrompt)
-   NS_IMPL_QUERY_BODY(nsIRefreshURI)
-   NS_IMPL_QUERY_BODY(nsIClipboardCommands)
-   NS_IMPL_QUERY_BODY(nsIInterfaceRequestor)
-   NS_IMPL_QUERY_BODY(nsIURIContentListener)
-NS_IMPL_QUERY_TAIL(nsIWebShell)
+NS_INTERFACE_MAP_BEGIN(nsWebShell)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebShell)
+   NS_INTERFACE_MAP_ENTRY(nsIWebShell)
+   NS_INTERFACE_MAP_ENTRY(nsIWebShellServices)
+   NS_INTERFACE_MAP_ENTRY(nsIContentViewerContainer)
+   NS_INTERFACE_MAP_ENTRY(nsIScriptContextOwner)
+   NS_INTERFACE_MAP_ENTRY(nsIDocumentLoaderObserver)
+   NS_INTERFACE_MAP_ENTRY(nsIProgressEventSink)
+   NS_INTERFACE_MAP_ENTRY(nsIWebShellContainer)
+   NS_INTERFACE_MAP_ENTRY(nsILinkHandler)
+   NS_INTERFACE_MAP_ENTRY(nsIPrompt)
+   NS_INTERFACE_MAP_ENTRY(nsIRefreshURI)
+   NS_INTERFACE_MAP_ENTRY(nsIClipboardCommands)
+   NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
+   NS_INTERFACE_MAP_ENTRY(nsIURIContentListener)
+NS_INTERFACE_MAP_END
 
 NS_IMETHODIMP
 nsWebShell::GetInterface(const nsIID &aIID, void** aInstancePtr)