aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--embed/mozilla/AutoJSContextStack.cpp2
-rw-r--r--embed/mozilla/AutoWindowModalState.cpp2
-rw-r--r--embed/mozilla/ContentHandler.cpp2
-rw-r--r--embed/mozilla/EphyAboutModule.cpp2
-rw-r--r--embed/mozilla/EphyBadCertRejector.cpp2
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/EphyContentPolicy.cpp2
-rw-r--r--embed/mozilla/EphyDirectoryProvider.cpp2
-rw-r--r--embed/mozilla/EphyFind.cpp2
-rw-r--r--embed/mozilla/EphyHeaderSniffer.cpp2
-rw-r--r--embed/mozilla/EphyHistoryListener.cpp2
-rw-r--r--embed/mozilla/EphyPromptService.cpp2
-rw-r--r--embed/mozilla/EphyRedirectChannel.cpp2
-rw-r--r--embed/mozilla/EphySidebar.cpp2
-rw-r--r--embed/mozilla/EphySingle.cpp2
-rw-r--r--embed/mozilla/EphyUtils.cpp2
-rw-r--r--embed/mozilla/EventContext.cpp2
-rw-r--r--embed/mozilla/FilePicker.cpp2
-rw-r--r--embed/mozilla/GeckoCookiePromptService.cpp2
-rw-r--r--embed/mozilla/GeckoFormSigningDialog.cpp2
-rw-r--r--embed/mozilla/GeckoPrintService.cpp2
-rw-r--r--embed/mozilla/GeckoPrintSession.cpp2
-rw-r--r--embed/mozilla/GeckoSpellCheckEngine.cpp2
-rw-r--r--embed/mozilla/GlobalHistory.cpp2
-rw-r--r--embed/mozilla/GtkNSSClientAuthDialogs.cpp2
-rw-r--r--embed/mozilla/GtkNSSDialogs.cpp2
-rw-r--r--embed/mozilla/GtkNSSKeyPairDialogs.cpp2
-rw-r--r--embed/mozilla/GtkNSSSecurityWarningDialogs.cpp2
-rw-r--r--embed/mozilla/MozDownload.cpp2
-rw-r--r--embed/mozilla/MozRegisterComponents.cpp2
-rw-r--r--embed/mozilla/mozilla-download.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-event.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-find.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-persist.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp2
-rw-r--r--embed/mozilla/mozilla-embed.cpp2
-rw-r--r--embed/mozilla/mozilla-notifiers.cpp2
-rw-r--r--embed/mozilla/mozilla-x509-cert.cpp2
-rw-r--r--embed/xulrunner/embed/AutoJSContextStack.cpp2
-rw-r--r--embed/xulrunner/embed/AutoWindowModalState.cpp2
-rw-r--r--embed/xulrunner/embed/ContentHandler.cpp2
-rw-r--r--embed/xulrunner/embed/EphyAboutModule.cpp2
-rw-r--r--embed/xulrunner/embed/EphyBadCertRejector.cpp2
-rw-r--r--embed/xulrunner/embed/EphyBrowser.cpp2
-rw-r--r--embed/xulrunner/embed/EphyContentPolicy.cpp2
-rw-r--r--embed/xulrunner/embed/EphyDirectoryProvider.cpp2
-rw-r--r--embed/xulrunner/embed/EphyFind.cpp2
-rw-r--r--embed/xulrunner/embed/EphyHeaderSniffer.cpp2
-rw-r--r--embed/xulrunner/embed/EphyHistoryListener.cpp2
-rw-r--r--embed/xulrunner/embed/EphyPromptService.cpp2
-rw-r--r--embed/xulrunner/embed/EphyRedirectChannel.cpp2
-rw-r--r--embed/xulrunner/embed/EphySidebar.cpp2
-rw-r--r--embed/xulrunner/embed/EphySingle.cpp2
-rw-r--r--embed/xulrunner/embed/EphyUtils.cpp2
-rw-r--r--embed/xulrunner/embed/EventContext.cpp2
-rw-r--r--embed/xulrunner/embed/FilePicker.cpp2
-rw-r--r--embed/xulrunner/embed/GeckoCookiePromptService.cpp2
-rw-r--r--embed/xulrunner/embed/GeckoFormSigningDialog.cpp2
-rw-r--r--embed/xulrunner/embed/GeckoPrintService.cpp2
-rw-r--r--embed/xulrunner/embed/GeckoPrintSession.cpp2
-rw-r--r--embed/xulrunner/embed/GeckoSpellCheckEngine.cpp2
-rw-r--r--embed/xulrunner/embed/GlobalHistory.cpp2
-rw-r--r--embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp2
-rw-r--r--embed/xulrunner/embed/GtkNSSDialogs.cpp2
-rw-r--r--embed/xulrunner/embed/GtkNSSKeyPairDialogs.cpp2
-rw-r--r--embed/xulrunner/embed/GtkNSSSecurityWarningDialogs.cpp2
-rw-r--r--embed/xulrunner/embed/MozDownload.cpp2
-rw-r--r--embed/xulrunner/embed/MozRegisterComponents.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-download.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-embed-event.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-embed-find.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-embed-persist.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-embed-single.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-embed.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-notifiers.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-x509-cert.cpp2
-rw-r--r--embed/xulrunner/src/AutoJSContextStack.cpp2
-rw-r--r--embed/xulrunner/src/AutoWindowModalState.cpp2
-rw-r--r--embed/xulrunner/src/EmbedContentListener.cpp2
-rw-r--r--embed/xulrunner/src/EmbedEventListener.cpp2
-rw-r--r--embed/xulrunner/src/EmbedProgress.cpp2
-rw-r--r--embed/xulrunner/src/EmbedStream.cpp2
-rw-r--r--embed/xulrunner/src/EmbedWindow.cpp2
-rw-r--r--embed/xulrunner/src/EmbedWindowCreator.cpp2
-rw-r--r--embed/xulrunner/src/GeckoBrowser.cpp2
-rw-r--r--embed/xulrunner/src/GeckoPromptService.cpp2
-rw-r--r--embed/xulrunner/src/GeckoSingle.cpp2
-rw-r--r--embed/xulrunner/src/GeckoUtils.cpp2
-rw-r--r--embed/xulrunner/src/gecko-dom-event.cpp2
-rw-r--r--embed/xulrunner/src/gecko-embed-single.cpp2
-rw-r--r--embed/xulrunner/src/gecko-embed.cpp2
-rw-r--r--embed/xulrunner/src/gecko-init.cpp2
-rw-r--r--embed/xulrunner/tests/testgeckoembed.cpp2
-rw-r--r--m4/libxul.m42
-rw-r--r--plugins/desktop-file/plugin.cpp2
95 files changed, 95 insertions, 95 deletions
diff --git a/embed/mozilla/AutoJSContextStack.cpp b/embed/mozilla/AutoJSContextStack.cpp
index 97fa84f33..2dc435625 100644
--- a/embed/mozilla/AutoJSContextStack.cpp
+++ b/embed/mozilla/AutoJSContextStack.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsServiceManagerUtils.h>
diff --git a/embed/mozilla/AutoWindowModalState.cpp b/embed/mozilla/AutoWindowModalState.cpp
index 0ff11e4ab..4cb435a01 100644
--- a/embed/mozilla/AutoWindowModalState.cpp
+++ b/embed/mozilla/AutoWindowModalState.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include "AutoWindowModalState.h"
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 0510aa3f1..7f5160adc 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -21,7 +21,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/mozilla/EphyAboutModule.cpp b/embed/mozilla/EphyAboutModule.cpp
index 8e0d760b9..c0f01f622 100644
--- a/embed/mozilla/EphyAboutModule.cpp
+++ b/embed/mozilla/EphyAboutModule.cpp
@@ -21,7 +21,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <string.h>
diff --git a/embed/mozilla/EphyBadCertRejector.cpp b/embed/mozilla/EphyBadCertRejector.cpp
index 99ffe4393..5aad7d92f 100644
--- a/embed/mozilla/EphyBadCertRejector.cpp
+++ b/embed/mozilla/EphyBadCertRejector.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include "EphyBadCertRejector.h"
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 9ea302360..fc9c9af5b 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <unistd.h>
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp
index fc367c2b1..52750d6ad 100644
--- a/embed/mozilla/EphyContentPolicy.cpp
+++ b/embed/mozilla/EphyContentPolicy.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/mozilla/EphyDirectoryProvider.cpp b/embed/mozilla/EphyDirectoryProvider.cpp
index f8ec21042..a3b604434 100644
--- a/embed/mozilla/EphyDirectoryProvider.cpp
+++ b/embed/mozilla/EphyDirectoryProvider.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <string.h>
diff --git a/embed/mozilla/EphyFind.cpp b/embed/mozilla/EphyFind.cpp
index effc8da05..4b217a4f5 100644
--- a/embed/mozilla/EphyFind.cpp
+++ b/embed/mozilla/EphyFind.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib.h>
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 722ea8672..2cd659afa 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -39,7 +39,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/mozilla/EphyHistoryListener.cpp b/embed/mozilla/EphyHistoryListener.cpp
index 232c3ccb9..8576adae4 100644
--- a/embed/mozilla/EphyHistoryListener.cpp
+++ b/embed/mozilla/EphyHistoryListener.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/mozilla/EphyPromptService.cpp b/embed/mozilla/EphyPromptService.cpp
index 29813f300..7b848fe0c 100644
--- a/embed/mozilla/EphyPromptService.cpp
+++ b/embed/mozilla/EphyPromptService.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib.h>
diff --git a/embed/mozilla/EphyRedirectChannel.cpp b/embed/mozilla/EphyRedirectChannel.cpp
index 6e493bfad..af6dd2f91 100644
--- a/embed/mozilla/EphyRedirectChannel.cpp
+++ b/embed/mozilla/EphyRedirectChannel.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include "EphyRedirectChannel.h"
diff --git a/embed/mozilla/EphySidebar.cpp b/embed/mozilla/EphySidebar.cpp
index 94bd52b8a..6c03773aa 100644
--- a/embed/mozilla/EphySidebar.cpp
+++ b/embed/mozilla/EphySidebar.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index 74eaf21d6..3d2f9c9eb 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp
index 885a49f08..d4fbe20e6 100644
--- a/embed/mozilla/EphyUtils.cpp
+++ b/embed/mozilla/EphyUtils.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index 6e22fce8a..7482d7dd6 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -20,7 +20,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <gdk/gdkkeysyms.h>
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 78cc8f50d..c33d474c9 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gconvert.h>
diff --git a/embed/mozilla/GeckoCookiePromptService.cpp b/embed/mozilla/GeckoCookiePromptService.cpp
index fa33e8bfb..5425d6ed7 100644
--- a/embed/mozilla/GeckoCookiePromptService.cpp
+++ b/embed/mozilla/GeckoCookiePromptService.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/mozilla/GeckoFormSigningDialog.cpp b/embed/mozilla/GeckoFormSigningDialog.cpp
index 309b3c11e..12fd2b221 100644
--- a/embed/mozilla/GeckoFormSigningDialog.cpp
+++ b/embed/mozilla/GeckoFormSigningDialog.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib.h>
diff --git a/embed/mozilla/GeckoPrintService.cpp b/embed/mozilla/GeckoPrintService.cpp
index 71c5a6a6d..330477ca0 100644
--- a/embed/mozilla/GeckoPrintService.cpp
+++ b/embed/mozilla/GeckoPrintService.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib.h>
diff --git a/embed/mozilla/GeckoPrintSession.cpp b/embed/mozilla/GeckoPrintSession.cpp
index ddf968283..5b755ec16 100644
--- a/embed/mozilla/GeckoPrintSession.cpp
+++ b/embed/mozilla/GeckoPrintSession.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <unistd.h>
diff --git a/embed/mozilla/GeckoSpellCheckEngine.cpp b/embed/mozilla/GeckoSpellCheckEngine.cpp
index 59ab5df2d..9df979c57 100644
--- a/embed/mozilla/GeckoSpellCheckEngine.cpp
+++ b/embed/mozilla/GeckoSpellCheckEngine.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
//#include <bonobo.h>
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index efcda79f9..2a3154724 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -20,7 +20,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index 410827166..3dc585792 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -20,7 +20,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index ba36d817d..a4bca8110 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -25,7 +25,7 @@
* or expired certificate.
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <time.h>
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
index 3b9e405cc..ac3afdfde 100644
--- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -25,7 +25,7 @@
* dialogs.
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
index b50b3762a..08f5e664a 100644
--- a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
+++ b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
@@ -41,7 +41,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index b5efe085a..38ed4162a 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -41,7 +41,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <stdlib.h>
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index e712bbc5d..fc9ad200d 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -20,7 +20,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gmessages.h>
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index 0b420547c..5b8d521f4 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/mozilla/mozilla-embed-event.cpp b/embed/mozilla/mozilla-embed-event.cpp
index 9b5b06d85..53b57886f 100644
--- a/embed/mozilla/mozilla-embed-event.cpp
+++ b/embed/mozilla/mozilla-embed-event.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/ghash.h>
diff --git a/embed/mozilla/mozilla-embed-find.cpp b/embed/mozilla/mozilla-embed-find.cpp
index 576d8ec11..6b2d60676 100644
--- a/embed/mozilla/mozilla-embed-find.cpp
+++ b/embed/mozilla/mozilla-embed-find.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include "ephy-debug.h"
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index 16909b49c..e6b3f64cf 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <stddef.h>
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 77a982007..4d81b54bb 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -21,7 +21,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 3fadccc38..dac208769 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index 9901bdbe2..fbd8dd766 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -20,7 +20,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <stdio.h>
diff --git a/embed/mozilla/mozilla-x509-cert.cpp b/embed/mozilla/mozilla-x509-cert.cpp
index 8774425cd..2b9597fc9 100644
--- a/embed/mozilla/mozilla-x509-cert.cpp
+++ b/embed/mozilla/mozilla-x509-cert.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/xulrunner/embed/AutoJSContextStack.cpp b/embed/xulrunner/embed/AutoJSContextStack.cpp
index 97fa84f33..2dc435625 100644
--- a/embed/xulrunner/embed/AutoJSContextStack.cpp
+++ b/embed/xulrunner/embed/AutoJSContextStack.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsServiceManagerUtils.h>
diff --git a/embed/xulrunner/embed/AutoWindowModalState.cpp b/embed/xulrunner/embed/AutoWindowModalState.cpp
index ca25834b0..79fb2c15a 100644
--- a/embed/xulrunner/embed/AutoWindowModalState.cpp
+++ b/embed/xulrunner/embed/AutoWindowModalState.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include "AutoWindowModalState.h"
diff --git a/embed/xulrunner/embed/ContentHandler.cpp b/embed/xulrunner/embed/ContentHandler.cpp
index 85c9ad650..cf5782e1f 100644
--- a/embed/xulrunner/embed/ContentHandler.cpp
+++ b/embed/xulrunner/embed/ContentHandler.cpp
@@ -21,7 +21,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/xulrunner/embed/EphyAboutModule.cpp b/embed/xulrunner/embed/EphyAboutModule.cpp
index e27608e83..4a9548f29 100644
--- a/embed/xulrunner/embed/EphyAboutModule.cpp
+++ b/embed/xulrunner/embed/EphyAboutModule.cpp
@@ -21,7 +21,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <string.h>
diff --git a/embed/xulrunner/embed/EphyBadCertRejector.cpp b/embed/xulrunner/embed/EphyBadCertRejector.cpp
index 99ffe4393..5aad7d92f 100644
--- a/embed/xulrunner/embed/EphyBadCertRejector.cpp
+++ b/embed/xulrunner/embed/EphyBadCertRejector.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include "EphyBadCertRejector.h"
diff --git a/embed/xulrunner/embed/EphyBrowser.cpp b/embed/xulrunner/embed/EphyBrowser.cpp
index 4c9991a0d..4b95c49a7 100644
--- a/embed/xulrunner/embed/EphyBrowser.cpp
+++ b/embed/xulrunner/embed/EphyBrowser.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <unistd.h>
diff --git a/embed/xulrunner/embed/EphyContentPolicy.cpp b/embed/xulrunner/embed/EphyContentPolicy.cpp
index fc367c2b1..52750d6ad 100644
--- a/embed/xulrunner/embed/EphyContentPolicy.cpp
+++ b/embed/xulrunner/embed/EphyContentPolicy.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/xulrunner/embed/EphyDirectoryProvider.cpp b/embed/xulrunner/embed/EphyDirectoryProvider.cpp
index 0dade7bd2..f33e4b576 100644
--- a/embed/xulrunner/embed/EphyDirectoryProvider.cpp
+++ b/embed/xulrunner/embed/EphyDirectoryProvider.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <string.h>
diff --git a/embed/xulrunner/embed/EphyFind.cpp b/embed/xulrunner/embed/EphyFind.cpp
index e6d7cdb04..c0c012c4b 100644
--- a/embed/xulrunner/embed/EphyFind.cpp
+++ b/embed/xulrunner/embed/EphyFind.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib.h>
diff --git a/embed/xulrunner/embed/EphyHeaderSniffer.cpp b/embed/xulrunner/embed/EphyHeaderSniffer.cpp
index 6ef9318de..ab140e69a 100644
--- a/embed/xulrunner/embed/EphyHeaderSniffer.cpp
+++ b/embed/xulrunner/embed/EphyHeaderSniffer.cpp
@@ -39,7 +39,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/xulrunner/embed/EphyHistoryListener.cpp b/embed/xulrunner/embed/EphyHistoryListener.cpp
index 232c3ccb9..8576adae4 100644
--- a/embed/xulrunner/embed/EphyHistoryListener.cpp
+++ b/embed/xulrunner/embed/EphyHistoryListener.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/xulrunner/embed/EphyPromptService.cpp b/embed/xulrunner/embed/EphyPromptService.cpp
index 29813f300..7b848fe0c 100644
--- a/embed/xulrunner/embed/EphyPromptService.cpp
+++ b/embed/xulrunner/embed/EphyPromptService.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib.h>
diff --git a/embed/xulrunner/embed/EphyRedirectChannel.cpp b/embed/xulrunner/embed/EphyRedirectChannel.cpp
index 6e493bfad..af6dd2f91 100644
--- a/embed/xulrunner/embed/EphyRedirectChannel.cpp
+++ b/embed/xulrunner/embed/EphyRedirectChannel.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include "EphyRedirectChannel.h"
diff --git a/embed/xulrunner/embed/EphySidebar.cpp b/embed/xulrunner/embed/EphySidebar.cpp
index 1f02453d7..4db2a00dc 100644
--- a/embed/xulrunner/embed/EphySidebar.cpp
+++ b/embed/xulrunner/embed/EphySidebar.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/xulrunner/embed/EphySingle.cpp b/embed/xulrunner/embed/EphySingle.cpp
index b8abe7585..12986f327 100644
--- a/embed/xulrunner/embed/EphySingle.cpp
+++ b/embed/xulrunner/embed/EphySingle.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/xulrunner/embed/EphyUtils.cpp b/embed/xulrunner/embed/EphyUtils.cpp
index 816651b55..c5bd79c50 100644
--- a/embed/xulrunner/embed/EphyUtils.cpp
+++ b/embed/xulrunner/embed/EphyUtils.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/xulrunner/embed/EventContext.cpp b/embed/xulrunner/embed/EventContext.cpp
index 6e22fce8a..7482d7dd6 100644
--- a/embed/xulrunner/embed/EventContext.cpp
+++ b/embed/xulrunner/embed/EventContext.cpp
@@ -20,7 +20,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <gdk/gdkkeysyms.h>
diff --git a/embed/xulrunner/embed/FilePicker.cpp b/embed/xulrunner/embed/FilePicker.cpp
index 78cc8f50d..c33d474c9 100644
--- a/embed/xulrunner/embed/FilePicker.cpp
+++ b/embed/xulrunner/embed/FilePicker.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gconvert.h>
diff --git a/embed/xulrunner/embed/GeckoCookiePromptService.cpp b/embed/xulrunner/embed/GeckoCookiePromptService.cpp
index fa33e8bfb..5425d6ed7 100644
--- a/embed/xulrunner/embed/GeckoCookiePromptService.cpp
+++ b/embed/xulrunner/embed/GeckoCookiePromptService.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/xulrunner/embed/GeckoFormSigningDialog.cpp b/embed/xulrunner/embed/GeckoFormSigningDialog.cpp
index 309b3c11e..12fd2b221 100644
--- a/embed/xulrunner/embed/GeckoFormSigningDialog.cpp
+++ b/embed/xulrunner/embed/GeckoFormSigningDialog.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib.h>
diff --git a/embed/xulrunner/embed/GeckoPrintService.cpp b/embed/xulrunner/embed/GeckoPrintService.cpp
index 8a8b67d5a..6ca464590 100644
--- a/embed/xulrunner/embed/GeckoPrintService.cpp
+++ b/embed/xulrunner/embed/GeckoPrintService.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib.h>
diff --git a/embed/xulrunner/embed/GeckoPrintSession.cpp b/embed/xulrunner/embed/GeckoPrintSession.cpp
index ddf968283..5b755ec16 100644
--- a/embed/xulrunner/embed/GeckoPrintSession.cpp
+++ b/embed/xulrunner/embed/GeckoPrintSession.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <unistd.h>
diff --git a/embed/xulrunner/embed/GeckoSpellCheckEngine.cpp b/embed/xulrunner/embed/GeckoSpellCheckEngine.cpp
index 3f8de02fa..b5126a054 100644
--- a/embed/xulrunner/embed/GeckoSpellCheckEngine.cpp
+++ b/embed/xulrunner/embed/GeckoSpellCheckEngine.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <stdio.h>
diff --git a/embed/xulrunner/embed/GlobalHistory.cpp b/embed/xulrunner/embed/GlobalHistory.cpp
index 84c2d475b..c78335abc 100644
--- a/embed/xulrunner/embed/GlobalHistory.cpp
+++ b/embed/xulrunner/embed/GlobalHistory.cpp
@@ -20,7 +20,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp b/embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp
index 410827166..3dc585792 100644
--- a/embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp
+++ b/embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp
@@ -20,7 +20,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/xulrunner/embed/GtkNSSDialogs.cpp b/embed/xulrunner/embed/GtkNSSDialogs.cpp
index 1004c1a9b..cea1ab460 100644
--- a/embed/xulrunner/embed/GtkNSSDialogs.cpp
+++ b/embed/xulrunner/embed/GtkNSSDialogs.cpp
@@ -25,7 +25,7 @@
* or expired certificate.
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <time.h>
diff --git a/embed/xulrunner/embed/GtkNSSKeyPairDialogs.cpp b/embed/xulrunner/embed/GtkNSSKeyPairDialogs.cpp
index 3b9e405cc..ac3afdfde 100644
--- a/embed/xulrunner/embed/GtkNSSKeyPairDialogs.cpp
+++ b/embed/xulrunner/embed/GtkNSSKeyPairDialogs.cpp
@@ -25,7 +25,7 @@
* dialogs.
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/xulrunner/embed/GtkNSSSecurityWarningDialogs.cpp b/embed/xulrunner/embed/GtkNSSSecurityWarningDialogs.cpp
index b50b3762a..08f5e664a 100644
--- a/embed/xulrunner/embed/GtkNSSSecurityWarningDialogs.cpp
+++ b/embed/xulrunner/embed/GtkNSSSecurityWarningDialogs.cpp
@@ -41,7 +41,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gi18n.h>
diff --git a/embed/xulrunner/embed/MozDownload.cpp b/embed/xulrunner/embed/MozDownload.cpp
index e6ec318a7..f4857e363 100644
--- a/embed/xulrunner/embed/MozDownload.cpp
+++ b/embed/xulrunner/embed/MozDownload.cpp
@@ -41,7 +41,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <stdlib.h>
diff --git a/embed/xulrunner/embed/MozRegisterComponents.cpp b/embed/xulrunner/embed/MozRegisterComponents.cpp
index 4780b71de..3d1120d27 100644
--- a/embed/xulrunner/embed/MozRegisterComponents.cpp
+++ b/embed/xulrunner/embed/MozRegisterComponents.cpp
@@ -20,7 +20,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/gmessages.h>
diff --git a/embed/xulrunner/embed/mozilla-download.cpp b/embed/xulrunner/embed/mozilla-download.cpp
index 0b420547c..5b8d521f4 100644
--- a/embed/xulrunner/embed/mozilla-download.cpp
+++ b/embed/xulrunner/embed/mozilla-download.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/xulrunner/embed/mozilla-embed-event.cpp b/embed/xulrunner/embed/mozilla-embed-event.cpp
index 9b5b06d85..53b57886f 100644
--- a/embed/xulrunner/embed/mozilla-embed-event.cpp
+++ b/embed/xulrunner/embed/mozilla-embed-event.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <glib/ghash.h>
diff --git a/embed/xulrunner/embed/mozilla-embed-find.cpp b/embed/xulrunner/embed/mozilla-embed-find.cpp
index 576d8ec11..6b2d60676 100644
--- a/embed/xulrunner/embed/mozilla-embed-find.cpp
+++ b/embed/xulrunner/embed/mozilla-embed-find.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include "ephy-debug.h"
diff --git a/embed/xulrunner/embed/mozilla-embed-persist.cpp b/embed/xulrunner/embed/mozilla-embed-persist.cpp
index 16909b49c..e6b3f64cf 100644
--- a/embed/xulrunner/embed/mozilla-embed-persist.cpp
+++ b/embed/xulrunner/embed/mozilla-embed-persist.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <stddef.h>
diff --git a/embed/xulrunner/embed/mozilla-embed-single.cpp b/embed/xulrunner/embed/mozilla-embed-single.cpp
index 70abb6dd0..f7db9e0ad 100644
--- a/embed/xulrunner/embed/mozilla-embed-single.cpp
+++ b/embed/xulrunner/embed/mozilla-embed-single.cpp
@@ -21,7 +21,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
diff --git a/embed/xulrunner/embed/mozilla-embed.cpp b/embed/xulrunner/embed/mozilla-embed.cpp
index c14a549b3..4fefece2f 100644
--- a/embed/xulrunner/embed/mozilla-embed.cpp
+++ b/embed/xulrunner/embed/mozilla-embed.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/xulrunner/embed/mozilla-notifiers.cpp b/embed/xulrunner/embed/mozilla-notifiers.cpp
index 9901bdbe2..fbd8dd766 100644
--- a/embed/xulrunner/embed/mozilla-notifiers.cpp
+++ b/embed/xulrunner/embed/mozilla-notifiers.cpp
@@ -20,7 +20,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <stdio.h>
diff --git a/embed/xulrunner/embed/mozilla-x509-cert.cpp b/embed/xulrunner/embed/mozilla-x509-cert.cpp
index 8774425cd..2b9597fc9 100644
--- a/embed/xulrunner/embed/mozilla-x509-cert.cpp
+++ b/embed/xulrunner/embed/mozilla-x509-cert.cpp
@@ -19,7 +19,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <nsStringAPI.h>
diff --git a/embed/xulrunner/src/AutoJSContextStack.cpp b/embed/xulrunner/src/AutoJSContextStack.cpp
index 1e02b60fd..9c918fc3b 100644
--- a/embed/xulrunner/src/AutoJSContextStack.cpp
+++ b/embed/xulrunner/src/AutoJSContextStack.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include "AutoJSContextStack.h"
diff --git a/embed/xulrunner/src/AutoWindowModalState.cpp b/embed/xulrunner/src/AutoWindowModalState.cpp
index f64790214..5f38acec5 100644
--- a/embed/xulrunner/src/AutoWindowModalState.cpp
+++ b/embed/xulrunner/src/AutoWindowModalState.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include "AutoWindowModalState.h"
diff --git a/embed/xulrunner/src/EmbedContentListener.cpp b/embed/xulrunner/src/EmbedContentListener.cpp
index 8a3280488..9c5c0be78 100644
--- a/embed/xulrunner/src/EmbedContentListener.cpp
+++ b/embed/xulrunner/src/EmbedContentListener.cpp
@@ -32,7 +32,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include <strings.h>
diff --git a/embed/xulrunner/src/EmbedEventListener.cpp b/embed/xulrunner/src/EmbedEventListener.cpp
index e4803b8bd..0d51764dc 100644
--- a/embed/xulrunner/src/EmbedEventListener.cpp
+++ b/embed/xulrunner/src/EmbedEventListener.cpp
@@ -33,7 +33,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include <nsCOMPtr.h>
diff --git a/embed/xulrunner/src/EmbedProgress.cpp b/embed/xulrunner/src/EmbedProgress.cpp
index d31e9f850..1f1cd0e2b 100644
--- a/embed/xulrunner/src/EmbedProgress.cpp
+++ b/embed/xulrunner/src/EmbedProgress.cpp
@@ -33,7 +33,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include "EmbedProgress.h"
diff --git a/embed/xulrunner/src/EmbedStream.cpp b/embed/xulrunner/src/EmbedStream.cpp
index 6cd08d400..c6c2778e0 100644
--- a/embed/xulrunner/src/EmbedStream.cpp
+++ b/embed/xulrunner/src/EmbedStream.cpp
@@ -32,7 +32,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include <config.h>
#include <nsIPipe.h>
diff --git a/embed/xulrunner/src/EmbedWindow.cpp b/embed/xulrunner/src/EmbedWindow.cpp
index 15c098f28..436d6065b 100644
--- a/embed/xulrunner/src/EmbedWindow.cpp
+++ b/embed/xulrunner/src/EmbedWindow.cpp
@@ -33,7 +33,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include <config.h>
#include <nsCWebBrowser.h>
diff --git a/embed/xulrunner/src/EmbedWindowCreator.cpp b/embed/xulrunner/src/EmbedWindowCreator.cpp
index 1c05add95..e27f0ca37 100644
--- a/embed/xulrunner/src/EmbedWindowCreator.cpp
+++ b/embed/xulrunner/src/EmbedWindowCreator.cpp
@@ -32,7 +32,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include "EmbedWindowCreator.h"
diff --git a/embed/xulrunner/src/GeckoBrowser.cpp b/embed/xulrunner/src/GeckoBrowser.cpp
index 5a91a98bf..f4facf0ff 100644
--- a/embed/xulrunner/src/GeckoBrowser.cpp
+++ b/embed/xulrunner/src/GeckoBrowser.cpp
@@ -33,7 +33,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include "nsIDocShell.h"
diff --git a/embed/xulrunner/src/GeckoPromptService.cpp b/embed/xulrunner/src/GeckoPromptService.cpp
index c9c5b03c2..db4eece1d 100644
--- a/embed/xulrunner/src/GeckoPromptService.cpp
+++ b/embed/xulrunner/src/GeckoPromptService.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include <glib.h>
diff --git a/embed/xulrunner/src/GeckoSingle.cpp b/embed/xulrunner/src/GeckoSingle.cpp
index 4b5d8e467..beb4b245a 100644
--- a/embed/xulrunner/src/GeckoSingle.cpp
+++ b/embed/xulrunner/src/GeckoSingle.cpp
@@ -33,7 +33,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include <config.h>
#include <stdlib.h>
diff --git a/embed/xulrunner/src/GeckoUtils.cpp b/embed/xulrunner/src/GeckoUtils.cpp
index b9d6e3f53..c71fce4ba 100644
--- a/embed/xulrunner/src/GeckoUtils.cpp
+++ b/embed/xulrunner/src/GeckoUtils.cpp
@@ -26,7 +26,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include "GeckoUtils.h"
diff --git a/embed/xulrunner/src/gecko-dom-event.cpp b/embed/xulrunner/src/gecko-dom-event.cpp
index 2acdac583..3eb81929e 100644
--- a/embed/xulrunner/src/gecko-dom-event.cpp
+++ b/embed/xulrunner/src/gecko-dom-event.cpp
@@ -18,7 +18,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include "gecko-dom-event.h"
diff --git a/embed/xulrunner/src/gecko-embed-single.cpp b/embed/xulrunner/src/gecko-embed-single.cpp
index dd147e512..a38558147 100644
--- a/embed/xulrunner/src/gecko-embed-single.cpp
+++ b/embed/xulrunner/src/gecko-embed-single.cpp
@@ -35,7 +35,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include "gecko-embed-single.h"
diff --git a/embed/xulrunner/src/gecko-embed.cpp b/embed/xulrunner/src/gecko-embed.cpp
index 1db324c44..6ad9a3ae4 100644
--- a/embed/xulrunner/src/gecko-embed.cpp
+++ b/embed/xulrunner/src/gecko-embed.cpp
@@ -35,7 +35,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include "config.h"
#include "gecko-embed.h"
diff --git a/embed/xulrunner/src/gecko-init.cpp b/embed/xulrunner/src/gecko-init.cpp
index cbad02a67..5b4f62a93 100644
--- a/embed/xulrunner/src/gecko-init.cpp
+++ b/embed/xulrunner/src/gecko-init.cpp
@@ -33,7 +33,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include <config.h>
#include <stdlib.h>
diff --git a/embed/xulrunner/tests/testgeckoembed.cpp b/embed/xulrunner/tests/testgeckoembed.cpp
index 1b9a888b6..decdf9b2d 100644
--- a/embed/xulrunner/tests/testgeckoembed.cpp
+++ b/embed/xulrunner/tests/testgeckoembed.cpp
@@ -32,7 +32,7 @@
* $Id$
*/
-#include <mozilla-config.h>
+#include <xpcom-config.h>
#include <config.h>
#include "gecko-init.h"
diff --git a/m4/libxul.m4 b/m4/libxul.m4
index 6004b3062..16cf0d448 100644
--- a/m4/libxul.m4
+++ b/m4/libxul.m4
@@ -111,7 +111,7 @@ CPPFLAGS="$CPPFLAGS $LIBXUL_CXXCPPFLAGS $LIBXUL_INCLUDES"
AC_MSG_CHECKING([[whether we have a libxul debug build]])
AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE([[#include <mozilla-config.h>
+ [AC_LANG_SOURCE([[#include <xpcom-config.h>
#if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP)
#error No
#endif]]
diff --git a/plugins/desktop-file/plugin.cpp b/plugins/desktop-file/plugin.cpp
index bd6031dae..52b94c8d3 100644
--- a/plugins/desktop-file/plugin.cpp
+++ b/plugins/desktop-file/plugin.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "mozilla-config.h"
+#include <xpcom-config.h>
#include "config.h"
#include <string.h>