12 files changed, 13 insertions, 14 deletions
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 238381692b3a..87e1791ba72e 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn  connectivity    :    l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL
+cn  connectivity    :    shell  l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL
 cn  connectivity                                    usr1    -   all cn_mkout NULL
 cn  connectivity\inc                                nmake   -   all cn_inc NULL
 cn  connectivity\com\sun\star\sdbcx\comp\hsqldb     nmake   -   all cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index e9bb9fdc4d70..6d7ca92fbdd6 100644
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -77,9 +77,7 @@ SHL1STDLIBS=\
     $(CPPUHELPERLIB)			\
     $(VOSLIB)					\
     $(SVLLIB)					\
-    $(VCLLIB)					\
     $(TOOLSLIB)					\
-    $(SVTOOLLIB)				\
     $(UNOTOOLSLIB)				\
     $(UCBHELPERLIB)				\
     $(SALLIB)					\
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index 1df3315f559d..356d43822be4 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -39,7 +39,7 @@
 #include "KCatalog.hxx"
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 
 using namespace connectivity::kab;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 3e7c69166b1b..2736cb5c6fbc 100644
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
@@ -33,7 +33,7 @@
 #include "KDEInit.h"
 #include <osl/diagnose.h>
 #include <osl/process.h>
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index c210b52ec4bc..127c70cb4207 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -34,7 +34,7 @@
 #include "KDatabaseMetaData.hxx"
 #include "kfields.hxx"
 #include "KDEInit.h"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 #include "FDatabaseMetaDataResultSet.hxx"
 #include "OTypeInfo.hxx"
 #include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index 72b1e618be28..51321b106042 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -33,7 +33,7 @@
 
 #include "KStatement.hxx"
 #include "KResultSetMetaData.hxx"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index bb219fcf443b..0621eef7fb8b 100644
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
@@ -34,7 +34,7 @@
 #ifndef _COMPHELPER_TYPES_H_
 #include <comphelper/types.hxx>
 #endif
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 #include <connectivity/dbexception.hxx>
 
 namespace connectivity
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index d6f8622398b4..e73660ad7858 100644
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
@@ -31,7 +31,7 @@
 #ifndef _CONNECTIVITY_KAB_FIELDS_HXX_
 #define _CONNECTIVITY_KAB_FIELDS_HXX_
 
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 #include <connectivity/dbexception.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx
index 41a280050c06..dd93066074bf 100644
--- a/connectivity/source/drivers/kab/korder.hxx
+++ b/connectivity/source/drivers/kab/korder.hxx
@@ -32,7 +32,7 @@
 #define _CONNECTIVITY_KAB_ORDER_HXX_
 
 #include "rtl/ustring.hxx"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 
 #include <vector>
 
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 0887433692b9..9c3c85008569 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -455,7 +455,7 @@ LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceM
 
     m_pMiscOptions = new SvtMiscOptions();
 
-    m_pMiscOptions->AddListener( LINK( this, LayoutManager, OptionsChanged ) );
+    m_pMiscOptions->AddListenerLink( LINK( this, LayoutManager, OptionsChanged ) );
     Application::AddEventListener( LINK( this, LayoutManager, SettingsChanged ) );
     m_eSymbolsSize = m_pMiscOptions->GetSymbolsSize();
     m_eSymbolsStyle = m_pMiscOptions->GetCurrentSymbolsStyle();
@@ -469,7 +469,7 @@ LayoutManager::~LayoutManager()
     Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
     if ( m_pMiscOptions )
     {
-        m_pMiscOptions->RemoveListener( LINK( this, LayoutManager, OptionsChanged ) );
+        m_pMiscOptions->RemoveListenerLink( LINK( this, LayoutManager, OptionsChanged ) );
         delete m_pMiscOptions;
         m_pMiscOptions = 0;
     }
@@ -7127,7 +7127,7 @@ throw( RuntimeException )
         Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
         if ( m_pMiscOptions )
         {
-            m_pMiscOptions->RemoveListener( LINK( this, LayoutManager, OptionsChanged ) );
+            m_pMiscOptions->RemoveListenerLink( LINK( this, LayoutManager, OptionsChanged ) );
             delete m_pMiscOptions;
             m_pMiscOptions = 0;
         }
diff --git a/shell/prj/d.lst b/shell/prj/d.lst
index 98d4a6215faf..82cac298367e 100644..100755
--- a/shell/prj/d.lst
+++ b/shell/prj/d.lst
@@ -18,3 +18,4 @@
 ..\%__SRC%\misc\*.xml %_DEST%\xml%_EXT%\*.xml
 
 ..\%__SRC%\misc\*-ucd.txt  %_DEST%\bin%_EXT%\*-ucd.txt
+..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h
diff --git a/shell/source/backends/kdebe/kdeinetlayer.hxx b/shell/source/backends/kdebe/kdeinetlayer.hxx
index 7e8053a67b7b..1a7427b1cb2c 100644..100755
--- a/shell/source/backends/kdebe/kdeinetlayer.hxx
+++ b/shell/source/backends/kdebe/kdeinetlayer.hxx
@@ -10,7 +10,7 @@
 #endif
 #include <com/sun/star/util/XTimeStamped.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include <vcl/kde_headers.h>
+#include <kde_headers.h>
 
 namespace css = com::sun::star ;
 namespace uno = css::uno ;