4 files changed, 17 insertions, 6 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 1ad9095ff..32a18ca96 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -35,6 +35,7 @@
 
 #include "ephy-prefs.h"
 #include "eel-gconf-extensions.h"
+#include "ephy-embed-single.h"
 #include "ephy-embed-shell.h"
 
 #include <libgnomevfs/gnome-vfs-mime.h>
@@ -79,7 +80,7 @@ NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher,
 	rv = Init ();
 	if (NS_FAILED (rv)) return rv;
 
-	single = ephy_embed_shell_get_embed_single (embed_shell);
+	single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (embed_shell));
 	g_signal_emit_by_name (single, "handle_content", mMimeType,
 			       mUrl.get(), &handled);
 
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index b6bc1ffb0..cfd61913f 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -49,6 +49,8 @@
 #include "EphyHeaderSniffer.h"
 #include "netCore.h"
 
+#include "ephy-embed-single.h"
+#include "ephy-embed-shell.h"
 #include "ephy-file-chooser.h"
 #include "ephy-prefs.h"
 #include "ephy-gui.h"
@@ -101,7 +103,7 @@ EphyHeaderSniffer::HandleContent ()
 	if (mPostData) return NS_ERROR_FAILURE;
 
 	mURL->GetSpec (uriSpec);	
-	single = ephy_embed_shell_get_embed_single (embed_shell);
+	single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (embed_shell));
 	g_signal_emit_by_name (single, "handle_content", mContentType.get(),
 			       uriSpec.get(), &handled);
 
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index a2c2c5861..3e87d84ca 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -14,13 +14,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "ephy-embed-shell.h"
+
 #include "GlobalHistory.h"
 #include "nsString.h"
 
@@ -28,7 +31,7 @@ NS_IMPL_ISUPPORTS2(MozGlobalHistory, nsIGlobalHistory, nsIBrowserHistory)
 
 MozGlobalHistory::MozGlobalHistory ()
 {
-	mGlobalHistory = ephy_embed_shell_get_global_history (embed_shell);
+	mGlobalHistory = EPHY_HISTORY (ephy_embed_shell_get_global_history (embed_shell));
 }
 
 MozGlobalHistory::~MozGlobalHistory ()
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index b742a3bfe..fdf6529b1 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -1,5 +1,6 @@
 /*
- *  Copyright (C) 2000 Nate Case 
+ *  Copyright (C) 2000 Nate Case
+ *  Copyright (C) 2003 Marco Pesenti Gritti
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -14,14 +15,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "ephy-embed-shell.h"
 #include "ephy-embed-single.h"
+#include "ephy-embed-shell.h"
 #include "mozilla-notifiers.h"
 #include "eel-gconf-extensions.h"
 #include "MozRegisterComponents.h"
@@ -36,6 +39,8 @@
 #include <glib/gi18n.h>
 #include <stdlib.h>
 #include <gdk/gdkx.h>
+#include <gtk/gtksettings.h>
+
 #include <nsCOMPtr.h>
 #include <nsIPrefService.h>
 #include <nsIServiceManager.h>