Revert the change from r7406; see bug #476540.

svn path=/trunk/; revision=7426

38 files changed, 38 insertions, 38 deletions

diff --git a/embed/mozilla/AutoJSContextStack.cpp b/embed/mozilla/AutoJSContextStack.cpp
index 2dc435625..97fa84f33 100644
--- a/embed/mozilla/AutoJSContextStack.cpp
+++ b/embed/mozilla/AutoJSContextStack.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <nsServiceManagerUtils.h>
diff --git a/embed/mozilla/AutoWindowModalState.cpp b/embed/mozilla/AutoWindowModalState.cpp
index 4cb435a01..0ff11e4ab 100644
--- a/embed/mozilla/AutoWindowModalState.cpp
+++ b/embed/mozilla/AutoWindowModalState.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include <mozilla-config.h>
 #include "config.h"
 
 #include "AutoWindowModalState.h"
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 7f5160adc..0510aa3f1 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -21,7 +21,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib/gi18n.h>
diff --git a/embed/mozilla/EphyAboutModule.cpp b/embed/mozilla/EphyAboutModule.cpp
index c0f01f622..8e0d760b9 100644
--- a/embed/mozilla/EphyAboutModule.cpp
+++ b/embed/mozilla/EphyAboutModule.cpp
@@ -21,7 +21,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <string.h>
diff --git a/embed/mozilla/EphyBadCertRejector.cpp b/embed/mozilla/EphyBadCertRejector.cpp
index 5aad7d92f..99ffe4393 100644
--- a/embed/mozilla/EphyBadCertRejector.cpp
+++ b/embed/mozilla/EphyBadCertRejector.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include "EphyBadCertRejector.h"
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index fc9c9af5b..9ea302360 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -19,7 +19,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <unistd.h>
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp
index 52750d6ad..fc367c2b1 100644
--- a/embed/mozilla/EphyContentPolicy.cpp
+++ b/embed/mozilla/EphyContentPolicy.cpp
@@ -19,7 +19,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <nsStringAPI.h>
diff --git a/embed/mozilla/EphyDirectoryProvider.cpp b/embed/mozilla/EphyDirectoryProvider.cpp
index a3b604434..f8ec21042 100644
--- a/embed/mozilla/EphyDirectoryProvider.cpp
+++ b/embed/mozilla/EphyDirectoryProvider.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <string.h>
diff --git a/embed/mozilla/EphyFind.cpp b/embed/mozilla/EphyFind.cpp
index 4b217a4f5..effc8da05 100644
--- a/embed/mozilla/EphyFind.cpp
+++ b/embed/mozilla/EphyFind.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib.h>
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 2cd659afa..722ea8672 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -39,7 +39,7 @@
  * $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib/gi18n.h>
diff --git a/embed/mozilla/EphyHistoryListener.cpp b/embed/mozilla/EphyHistoryListener.cpp
index 8576adae4..232c3ccb9 100644
--- a/embed/mozilla/EphyHistoryListener.cpp
+++ b/embed/mozilla/EphyHistoryListener.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <nsStringAPI.h>
diff --git a/embed/mozilla/EphyPromptService.cpp b/embed/mozilla/EphyPromptService.cpp
index 7b848fe0c..29813f300 100644
--- a/embed/mozilla/EphyPromptService.cpp
+++ b/embed/mozilla/EphyPromptService.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib.h>
diff --git a/embed/mozilla/EphyRedirectChannel.cpp b/embed/mozilla/EphyRedirectChannel.cpp
index af6dd2f91..6e493bfad 100644
--- a/embed/mozilla/EphyRedirectChannel.cpp
+++ b/embed/mozilla/EphyRedirectChannel.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include "EphyRedirectChannel.h"
diff --git a/embed/mozilla/EphySidebar.cpp b/embed/mozilla/EphySidebar.cpp
index 6c03773aa..94bd52b8a 100644
--- a/embed/mozilla/EphySidebar.cpp
+++ b/embed/mozilla/EphySidebar.cpp
@@ -19,7 +19,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <nsStringAPI.h>
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index 3d2f9c9eb..74eaf21d6 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -19,7 +19,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <nsStringAPI.h>
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp
index d4fbe20e6..885a49f08 100644
--- a/embed/mozilla/EphyUtils.cpp
+++ b/embed/mozilla/EphyUtils.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <nsStringAPI.h>
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index 7482d7dd6..6e22fce8a 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -20,7 +20,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <gdk/gdkkeysyms.h>
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index c33d474c9..78cc8f50d 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -19,7 +19,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib/gconvert.h>
diff --git a/embed/mozilla/GeckoCookiePromptService.cpp b/embed/mozilla/GeckoCookiePromptService.cpp
index 5425d6ed7..fa33e8bfb 100644
--- a/embed/mozilla/GeckoCookiePromptService.cpp
+++ b/embed/mozilla/GeckoCookiePromptService.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */ 
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib/gi18n.h>
diff --git a/embed/mozilla/GeckoFormSigningDialog.cpp b/embed/mozilla/GeckoFormSigningDialog.cpp
index 12fd2b221..309b3c11e 100644
--- a/embed/mozilla/GeckoFormSigningDialog.cpp
+++ b/embed/mozilla/GeckoFormSigningDialog.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib.h>
diff --git a/embed/mozilla/GeckoPrintService.cpp b/embed/mozilla/GeckoPrintService.cpp
index 330477ca0..71c5a6a6d 100644
--- a/embed/mozilla/GeckoPrintService.cpp
+++ b/embed/mozilla/GeckoPrintService.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib.h>
diff --git a/embed/mozilla/GeckoPrintSession.cpp b/embed/mozilla/GeckoPrintSession.cpp
index 5b755ec16..ddf968283 100644
--- a/embed/mozilla/GeckoPrintSession.cpp
+++ b/embed/mozilla/GeckoPrintSession.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <unistd.h>
diff --git a/embed/mozilla/GeckoSpellCheckEngine.cpp b/embed/mozilla/GeckoSpellCheckEngine.cpp
index 9df979c57..59ab5df2d 100644
--- a/embed/mozilla/GeckoSpellCheckEngine.cpp
+++ b/embed/mozilla/GeckoSpellCheckEngine.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 //#include <bonobo.h>
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index 2a3154724..efcda79f9 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -20,7 +20,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <nsStringAPI.h>
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index 3dc585792..410827166 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -20,7 +20,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib/gi18n.h>
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index a4bca8110..ba36d817d 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -25,7 +25,7 @@
  * or expired certificate.
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <time.h>
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
index ac3afdfde..3b9e405cc 100644
--- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -25,7 +25,7 @@
  * dialogs.
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib/gi18n.h>
diff --git a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
index 08f5e664a..b50b3762a 100644
--- a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
+++ b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
@@ -41,7 +41,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib/gi18n.h>
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 38ed4162a..b5efe085a 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -41,7 +41,7 @@
  * $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index fc9ad200d..e712bbc5d 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -20,7 +20,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <glib/gmessages.h>
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index 5b8d521f4..0b420547c 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-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 53b57886f..9b5b06d85 100644
--- a/embed/mozilla/mozilla-embed-event.cpp
+++ b/embed/mozilla/mozilla-embed-event.cpp
@@ -19,7 +19,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-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 6b2d60676..576d8ec11 100644
--- a/embed/mozilla/mozilla-embed-find.cpp
+++ b/embed/mozilla/mozilla-embed-find.cpp
@@ -19,7 +19,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-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 e6b3f64cf..16909b49c 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-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 4d81b54bb..77a982007 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -21,7 +21,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 
 #include "config.h"
 
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index dac208769..3fadccc38 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -19,7 +19,7 @@
  *  $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <nsStringAPI.h>
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index fbd8dd766..9901bdbe2 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -20,7 +20,7 @@
 *  $Id$
 */
 
-#include <xpcom-config.h>
+#include "mozilla-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 2b9597fc9..8774425cd 100644
--- a/embed/mozilla/mozilla-x509-cert.cpp
+++ b/embed/mozilla/mozilla-x509-cert.cpp
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-#include <xpcom-config.h>
+#include "mozilla-config.h"
 #include "config.h"
 
 #include <nsStringAPI.h>