[Libreoffice] [PATCH 1/3] Removed unnecessary tools/link.hxx includes.

Hello lo-devs,

this patch series removes another batch of unused tools module
includes. The patches without suffix should be applied to the core
repository, the .binfilter.patch suffix should be applied to the
binfilter repository. I've tested the build with the configuration
--enable-binfilter --enable-dbgutil --enable-debug.

regards

Marcel Metz

---
 basic/inc/basic/sbstar.hxx                         |    1 +
 dbaccess/source/ui/inc/linkeddocuments.hxx         |    1 -
 editeng/inc/editeng/unoedsrc.hxx                   |    1 -
 embeddedobj/source/msole/graphconvert.cxx          |    1 -
 embeddedobj/test/mtexecutor/bitmapcreator.hxx      |    2 --
 forms/source/component/Edit.hxx                    |    1 +
 forms/source/component/EditBase.hxx                |    1 -
 forms/source/component/FormattedField.hxx          |    1 +
 forms/source/component/Grid.hxx                    |    1 -
 framework/source/services/autorecovery.cxx         |    1 -
 sc/inc/cellsuno.hxx                                |    1 +
 sc/inc/chgtrack.hxx                                |    1 -
 sc/source/core/inc/poolhelp.hxx                    |    1 -
 sc/source/ui/unoobj/scdetect.hxx                   |    1 -
 sd/source/filter/html/htmlattr.cxx                 |    1 -
 .../ui/framework/factories/ChildWindowPane.hxx     |    1 -
 .../ui/framework/module/ReadOnlyModeObserver.hxx   |    1 -
 sd/source/ui/inc/MasterPageObserver.hxx            |    1 -
 sd/source/ui/inc/ViewShellManager.hxx              |    1 -
 .../ui/inc/framework/ConfigurationController.hxx   |    1 -
 sd/source/ui/inc/framework/Pane.hxx                |    1 -
 .../controller/SlideSorterController.cxx           |    1 -
 .../ui/slidesorter/inc/model/SlsPageDescriptor.hxx |    1 -
 sd/source/ui/toolpanel/TaskPaneShellManager.hxx    |    1 +
 .../toolpanel/controls/AllMasterPagesSelector.cxx  |    1 -
 sd/source/ui/tools/PreviewRenderer.cxx             |    1 -
 sd/source/ui/unoidl/sddetect.hxx                   |    1 -
 sfx2/inc/frmload.hxx                               |    1 -
 sfx2/inc/sfx2/bindings.hxx                         |    1 +
 sfx2/inc/sfx2/docfile.hxx                          |    1 +
 sfx2/inc/sfx2/frame.hxx                            |    1 -
 sfx2/inc/sfx2/linksrc.hxx                          |    1 +
 sfx2/inc/sfx2/sfxbasemodel.hxx                     |    2 --
 sfx2/source/appl/shutdownicon.cxx                  |    1 -
 sfx2/source/inc/appdata.hxx                        |    1 -
 sfx2/source/inc/sfxtypes.hxx                       |    1 -
 sot/source/sdstor/stgio.hxx                        |    1 +
 starmath/source/smdetect.hxx                       |    1 -
 svtools/inc/svtools/svparser.hxx                   |    1 +
 svx/inc/svx/fmsearch.hxx                           |    1 -
 svx/source/inc/AccessibleFrameSelector.hxx         |    1 +
 sw/inc/numrule.hxx                                 |    1 -
 sw/inc/swmodule.hxx                                |    1 -
 sw/source/core/access/accdoc.cxx                   |    1 -
 sw/source/core/graphic/ndgrf.cxx                   |    1 -
 sw/source/core/unocore/unochart.cxx                |    2 --
 sw/source/ui/uno/swdetect.hxx                      |    2 +-
 tools/inc/tools/cachestr.hxx                       |    1 -
 tools/inc/tools/ref.hxx                            |    1 -
 vcl/inc/unx/i18n_status.hxx                        |    1 -
 vcl/inc/vcl/accel.hxx                              |    1 +
 vcl/inc/vcl/sound.hxx                              |    1 -
 52 files changed, 13 insertions(+), 43 deletions(-)


diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 6a27ebe..f71bf51 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -33,6 +33,7 @@
 #include <basic/sbxobj.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
+#include <tools/link.hxx>
 
 #include <basic/sbdef.hxx>
 #include <basic/sberrors.hxx>
diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx
index 84609bb..e9949d1 100644
--- a/dbaccess/source/ui/inc/linkeddocuments.hxx
+++ b/dbaccess/source/ui/inc/linkeddocuments.hxx
@@ -40,7 +40,6 @@
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
-#include <tools/link.hxx>
 #include <tools/string.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 
diff --git a/editeng/inc/editeng/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx
index 7f31d37..bd699e1 100644
--- a/editeng/inc/editeng/unoedsrc.hxx
+++ b/editeng/inc/editeng/unoedsrc.hxx
@@ -33,7 +33,6 @@
 
 #include <tools/solar.h>
 #include <i18npool/lang.h>
-#include <tools/link.hxx>
 #include <tools/gen.hxx>
 #include <vcl/mapmod.hxx>
 #include <tools/string.hxx>
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index b39c888..ca83da8 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <tools/link.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.hxx 
b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
index 207bc09..c79b9cc 100644
--- a/embeddedobj/test/mtexecutor/bitmapcreator.hxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
@@ -36,8 +36,6 @@
 
 #include <cppuhelper/implbase2.hxx>
 
-#include <tools/link.hxx>
-
 class VCLBitmapCreator : public ::cppu::WeakImplHelper2<
                                                 ::com::sun::star::lang::XSingleServiceFactory,
                                                 ::com::sun::star::lang::XServiceInfo >
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index bbe7063..7f14540 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -31,6 +31,7 @@
 
 #include "EditBase.hxx"
 
+#include <tools/link.hxx>
 #include <cppuhelper/implbase3.hxx>
 
 namespace dbtools { class FormattedColumnValue; }
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index e15e3a6..447f06f 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -30,7 +30,6 @@
 #define _FORMS_EDITBASE_HXX_
 
 #include "FormComponent.hxx"
-#include <tools/link.hxx>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/awt/XKeyListener.hpp>
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 9891a71..ad19b6b 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -30,6 +30,7 @@
 #define _FORMS_FORMATTEDFIELD_HXX_
 
 #include "EditBase.hxx"
+#include <tools/link.hxx>
 #include <comphelper/propmultiplex.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include "errorbroadcaster.hxx"
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index 5b4b645..a75f997 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -41,7 +41,6 @@
 
 #include <comphelper/proparrhlp.hxx>
 #include <cppuhelper/implbase7.hxx>
-#include <tools/link.hxx>
 
 //.........................................................................
 namespace frm
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index f3fc4de1..689cae9 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -83,7 +83,6 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/pathoptions.hxx>
-#include <tools/link.hxx>
 #include <tools/string.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/tempfile.hxx>
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 24dcb85..b2e6097b 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -33,6 +33,7 @@
 #include "rangelst.hxx"         // ScRangeList
 
 #include "formula/grammar.hxx"
+#include <tools/link.hxx>
 #include <svl/lstner.hxx>
 #include <svl/listener.hxx>
 #include <svl/itemprop.hxx>
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 9dd27ca..e33ed50 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -36,7 +36,6 @@
 #include <tools/string.hxx>
 #include <tools/datetime.hxx>
 #include <tools/mempool.hxx>
-#include <tools/link.hxx>
 #include <unotools/options.hxx>
 #include "global.hxx"
 #include "bigrange.hxx"
diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx
index 2b3946f..5ddc179 100644
--- a/sc/source/core/inc/poolhelp.hxx
+++ b/sc/source/core/inc/poolhelp.hxx
@@ -31,7 +31,6 @@
 
 #include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
-#include <tools/link.hxx>
 #include "docoptio.hxx"
 
 class ScDocument;
diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx
index 85f214c..0ad2d2c 100644
--- a/sc/source/ui/unoobj/scdetect.hxx
+++ b/sc/source/ui/unoobj/scdetect.hxx
@@ -38,7 +38,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <cppuhelper/factory.hxx>
-#include <tools/link.hxx>
 
 class SfxObjectFactory;
 class SfxFilterMatcher;
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index f363e93..ee3f436 100644
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -33,7 +33,6 @@
 
 #include "htmlattr.hxx"
 #include "htmlex.hxx"
-#include <tools/link.hxx>
 #include <vcl/decoview.hxx>
 
 
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx 
b/sd/source/ui/framework/factories/ChildWindowPane.hxx
index 714d84a..208c532 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.hxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/uno3.hxx>
-#include <tools/link.hxx>
 #include <memory>
 
 namespace {
diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx 
b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx
index e1172b2..e0878e7 100644
--- a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx
+++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx
@@ -41,7 +41,6 @@
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
 #include <osl/mutex.hxx>
 #include <cppuhelper/compbase2.hxx>
-#include <tools/link.hxx>
 #include <boost/function.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index 4526a1c..f0cf7eb 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -31,7 +31,6 @@
 
 #include "tools/SdGlobalResourceContainer.hxx"
 #include <osl/mutex.hxx>
-#include <tools/link.hxx>
 #include <memory>
 #include <set>
 
diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx
index b7561ea..03bc3ff 100644
--- a/sd/source/ui/inc/ViewShellManager.hxx
+++ b/sd/source/ui/inc/ViewShellManager.hxx
@@ -30,7 +30,6 @@
 #define SD_VIEW_SHELL_MANAGER_HXX
 
 #include "ShellFactory.hxx"
-#include <tools/link.hxx>
 #include <memory>
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx 
b/sd/source/ui/inc/framework/ConfigurationController.hxx
index b4b41d0..ce671cf 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -42,7 +42,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/compbase2.hxx>
-#include <tools/link.hxx>
 #include <rtl/ref.hxx>
 
 #include <boost/scoped_ptr.hpp>
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index 89de980..f981ecd 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/drawing/framework/TabBarButton.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/compbase3.hxx>
-#include <tools/link.hxx>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx 
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index d86ce83..a68f782 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -86,7 +86,6 @@
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
-#include <tools/link.hxx>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx 
b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index 7f3bd43..934b6f1 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -32,7 +32,6 @@
 #include "model/SlsVisualState.hxx"
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <tools/gen.hxx>
-#include <tools/link.hxx>
 #include <vcl/bitmap.hxx>
 #include <sfx2/viewfrm.hxx>
 
diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx 
b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx
index f07ff15..ea7f793 100644
--- a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx
+++ b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx
@@ -31,6 +31,7 @@
 
 #include "ShellFactory.hxx"
 #include "ViewShellManager.hxx"
+#include <tools/link.hxx>
 #include <map>
 
 class FrameView;
diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx 
b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx
index 31b2892..1401bb9 100644
--- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx
@@ -32,7 +32,6 @@
 #include "app.hrc"
 #include "MasterPageContainer.hxx"
 #include "MasterPageDescriptor.hxx"
-#include <tools/link.hxx>
 #include <set>
 
 namespace {
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index 6481d85..fb81193 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -39,7 +39,6 @@
 #include <svx/svdoutl.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
-#include <tools/link.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/diagnose_ex.h>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx
index 1236436..7114739 100644
--- a/sd/source/ui/unoidl/sddetect.hxx
+++ b/sd/source/ui/unoidl/sddetect.hxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <cppuhelper/factory.hxx>
-#include <tools/link.hxx>
 
 class SfxObjectFactory;
 class SfxFilterMatcher;
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index 3a7df31..bee8d33 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -52,7 +52,6 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/factory.hxx>
-#include <tools/link.hxx>
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index 96b8e6b..3c47eb2 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -32,6 +32,7 @@
 #include "sfx2/dllapi.h"
 #include "sal/types.h"
 #include "rtl/strbuf.hxx"
+#include <tools/link.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/uno/Reference.h>
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index b2c9995..62f93ee 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <tools/link.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <svl/lstner.hxx>
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index a76e6fa..793c528 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -63,7 +63,6 @@ namespace com
         }
     }
 }
-#include <tools/link.hxx>
 #include <tools/ref.hxx>
 #include <tools/string.hxx>
 #include <svl/brdcst.hxx>
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index 7b6f1fb..a60ebda 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.hxx
@@ -31,6 +31,7 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 
+#include <tools/link.hxx>
 #include <tools/ref.hxx>
 #include <tools/rtti.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 0a15156..a0cf504 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -91,8 +91,6 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
-#include <tools/link.hxx>
-
 #include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index f3293ec..fd1bddd 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -59,7 +59,6 @@
 #include <osl/security.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
-#include <tools/link.hxx>
 #ifdef UNX // need symlink
 #include <unistd.h>
 #include <errno.h>
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 99baa53..3259066 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -28,7 +28,6 @@
 #ifndef _SFX_APPDATA_HXX
 #define _SFX_APPDATA_HXX
 
-#include <tools/link.hxx>
 #include <svl/lstner.hxx>
 #include <vcl/timer.hxx>
 #include <tools/string.hxx>
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 5b5c6b5..c075f2a 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -32,7 +32,6 @@
 #include <tools/rc.hxx>
 #include <tools/rcid.h>
 #include <tools/resid.hxx>
-#include <tools/link.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 
diff --git a/sot/source/sdstor/stgio.hxx b/sot/source/sdstor/stgio.hxx
index 91c32c7..d3d57b3 100644
--- a/sot/source/sdstor/stgio.hxx
+++ b/sot/source/sdstor/stgio.hxx
@@ -31,6 +31,7 @@
 
 #include <stgcache.hxx>
 #include <stgelem.hxx>
+#include <tools/link.hxx>
 #include <tools/string.hxx>
 
 class StgFATStrm;
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index 3513bb6..609694e 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <cppuhelper/factory.hxx>
-#include <tools/link.hxx>
 
 class SfxObjectFactory;
 class SfxFilterMatcher;
diff --git a/svtools/inc/svtools/svparser.hxx b/svtools/inc/svtools/svparser.hxx
index eac4a92..340236d 100644
--- a/svtools/inc/svtools/svparser.hxx
+++ b/svtools/inc/svtools/svparser.hxx
@@ -30,6 +30,7 @@
 #define _SVPARSER_HXX
 
 #include "svtools/svtdllapi.h"
+#include <tools/link.hxx>
 #include <tools/string.hxx>
 #include <tools/ref.hxx>
 #include <rtl/textenc.h>
diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index 1f6c7ed..0e23fb0 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
@@ -43,7 +43,6 @@
 #include <vcl/edit.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/lstbox.hxx>
-#include <tools/link.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/stl_types.hxx>
 #include <tools/string.hxx>
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 052dbef..3204b62 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <tools/link.hxx>
 #include <tools/resary.hxx>
 #include <tools/rc.hxx>
 #include <cppuhelper/implbase5.hxx>
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index eb7d83a..f4c35ea 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -28,7 +28,6 @@
 #ifndef _NUMRULE_HXX
 #define _NUMRULE_HXX
 
-#include <tools/link.hxx>
 #include <tools/gen.hxx>
 #include <tools/string.hxx>
 #include <editeng/svxenum.hxx>
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index aca0d48..df7f34b 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 #ifndef _SWMODULE_HXX
 #define _SWMODULE_HXX
-#include <tools/link.hxx>
 #include <tools/string.hxx>
 #include <tools/fldunit.hxx>
 #include <svl/lstner.hxx>
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 9f3632c..89c3c25 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
-#include <tools/link.hxx>
 #include <sfx2/viewsh.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 52ffd07..151d795 100755
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -56,7 +56,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
-#include <tools/link.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/io/XSeekable.hpp>
 // #i73788#
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 0960456..048faf8 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -38,8 +38,6 @@
 #include <svl/zforlist.hxx>     // SvNumberFormatter
 #include <svtools/chartprettypainter.hxx>
 
-#include <tools/link.hxx>
-
 #include <XMLRangeHelper.hxx>
 #include <unochart.hxx>
 #include <swtable.hxx>
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index 1c72939..0ece0dc 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -28,6 +28,7 @@
 #ifndef _SW_TYPEDETECT_HXX
 #define _SW_TYPEDETECT_HXX
 
+#include <tools/solar.h>
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
@@ -38,7 +39,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <cppuhelper/factory.hxx>
-#include <tools/link.hxx>
 
 class SfxMedium;
 
diff --git a/tools/inc/tools/cachestr.hxx b/tools/inc/tools/cachestr.hxx
index 0d88bca..010333a 100644
--- a/tools/inc/tools/cachestr.hxx
+++ b/tools/inc/tools/cachestr.hxx
@@ -31,7 +31,6 @@
 
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
-#include <tools/link.hxx>
 #include "tools/toolsdllapi.h"
 
 // -----------------
diff --git a/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx
index c3e2d19..d5ecfe4 100644
--- a/tools/inc/tools/ref.hxx
+++ b/tools/inc/tools/ref.hxx
@@ -30,7 +30,6 @@
 
 #include "tools/toolsdllapi.h"
 #include <tools/list.hxx>
-#include <tools/link.hxx>
 
 //=========================================================================
 
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index a35e1d6..b869e88 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -30,7 +30,6 @@
 #define _SAL_I18N_STATUS_HXX
 
 #include <tools/string.hxx>
-#include <tools/link.hxx>
 #include <tools/gen.hxx>
 
 #include <rtl/ustring.hxx>
diff --git a/vcl/inc/vcl/accel.hxx b/vcl/inc/vcl/accel.hxx
index 79109e0..cef418c 100644
--- a/vcl/inc/vcl/accel.hxx
+++ b/vcl/inc/vcl/accel.hxx
@@ -31,6 +31,7 @@
 
 #include <vcl/sv.h>
 #include <vcl/dllapi.h>
+#include <tools/link.hxx>
 #include <tools/resid.hxx>
 #include <tools/rc.hxx>
 #include <vcl/keycod.hxx>
diff --git a/vcl/inc/vcl/sound.hxx b/vcl/inc/vcl/sound.hxx
index 344d1a7..92e4c0a 100644
--- a/vcl/inc/vcl/sound.hxx
+++ b/vcl/inc/vcl/sound.hxx
@@ -31,7 +31,6 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/sndstyle.hxx>
-#include <tools/link.hxx>
 
 class Window;
 class Timer;