diff --git a/mozilla/netwerk/base/public/nsIURLParser.idl b/mozilla/netwerk/base/public/nsIURLParser.idl
index 2c1128438ce..39cfab3355c 100644
--- a/mozilla/netwerk/base/public/nsIURLParser.idl
+++ b/mozilla/netwerk/base/public/nsIURLParser.idl
@@ -95,3 +95,23 @@ interface nsIURLParser : nsISupports
                        out string o_FileExtension);
 
 };
+
+%{C++
+
+#define NS_NOAUTHORITYURLPARSER_CID                  \
+{ /* 9eeb1b89-c87e-4404-9de6-dbd41aeaf3d7 */         \
+    0x9eeb1b89,                                      \
+    0xc87e,                                          \
+    0x4404,                                          \
+    {0x9d, 0xe6, 0xdb, 0xd4, 0x1a, 0xea, 0xf3, 0xd7} \
+}
+
+#define NS_AUTHORITYURLPARSER_CID                    \
+{ /* 90012125-1616-4fa1-ae14-4e7fa5766eb6 */         \
+    0x90012125,                                      \
+    0x1616,                                          \
+    0x4fa1,                                          \
+    {0xae, 0x14, 0x4e, 0x7f, 0xa5, 0x76, 0x6e, 0xb6} \
+}
+
+%}
diff --git a/mozilla/netwerk/base/src/nsAuthURLParser.h b/mozilla/netwerk/base/src/nsAuthURLParser.h
index a4352326a3a..b1048742a47 100644
--- a/mozilla/netwerk/base/src/nsAuthURLParser.h
+++ b/mozilla/netwerk/base/src/nsAuthURLParser.h
@@ -28,14 +28,6 @@
 #include "nsAgg.h"
 #include "nsCRT.h"
 
-#define NS_AUTHORITYURLPARSER_CID                    \
-{ /* 90012125-1616-4fa1-ae14-4e7fa5766eb6 */         \
-    0x90012125,                                      \
-    0x1616,                                          \
-    0x4fa1,                                          \
-    {0xae, 0x14, 0x4e, 0x7f, 0xa5, 0x76, 0x6e, 0xb6} \
-}
-
 class nsAuthURLParser : public nsIURLParser
 {
 public:
diff --git a/mozilla/netwerk/base/src/nsNoAuthURLParser.h b/mozilla/netwerk/base/src/nsNoAuthURLParser.h
index 741651b3870..325cb620447 100644
--- a/mozilla/netwerk/base/src/nsNoAuthURLParser.h
+++ b/mozilla/netwerk/base/src/nsNoAuthURLParser.h
@@ -28,14 +28,6 @@
 #include "nsAgg.h"
 #include "nsCRT.h"
 
-#define NS_NOAUTHORITYURLPARSER_CID                  \
-{ /* 9eeb1b89-c87e-4404-9de6-dbd41aeaf3d7 */         \
-    0x9eeb1b89,                                      \
-    0xc87e,                                          \
-    0x4404,                                          \
-    {0x9d, 0xe6, 0xdb, 0xd4, 0x1a, 0xea, 0xf3, 0xd7} \
-}
-
 class nsNoAuthURLParser : public nsIURLParser
 {
 public:
diff --git a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp
index eb4df7e03be..7b52f4f4842 100644
--- a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp
@@ -23,7 +23,6 @@
 #include "nsFileChannel.h"
 #include "nsFileProtocolHandler.h"
 #include "nsIURL.h"
-#include "nsNoAuthURLParser.h"
 #include "nsCRT.h"
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
index c5f77386f64..841f5b81483 100644
--- a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
@@ -23,7 +23,6 @@
 #include "nsFtpProtocolHandler.h"
 #include "nsFTPChannel.h"
 #include "nsIURL.h"
-#include "nsAuthURLParser.h"
 #include "nsCRT.h"
 #include "nsIComponentManager.h"
 #include "nsIInterfaceRequestor.h"
diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp
index c7e07df6dfa..d8a5351fd40 100644
--- a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp
@@ -39,7 +39,6 @@
 #include "nsHTTPEncodeStream.h" 
 #include "nsHTTPAtoms.h"
 #include "nsFileSpec.h"
-#include "nsAuthURLParser.h"
 
 #include "nsIPref.h" // preferences stuff
 #ifdef DEBUG_gagan