Removed unnecessary tools includes.

52 files changed, 12 insertions, 46 deletions

diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx
index 8e3bc3140f1a..20d41b39d9a0 100644
--- a/cui/source/factory/cuiresmgr.cxx
+++ b/cui/source/factory/cuiresmgr.cxx
@@ -29,7 +29,6 @@
 // include ---------------------------------------------------------------
 
 #include <dialmgr.hxx>
-#include <tools/rc.hxx>
 #include <svl/solar.hrc>
 #include <vcl/svapp.hxx>
 
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index dc7c368203c1..55b2b727fbe5 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -29,7 +29,6 @@
 #include "align.hxx" //add for SvxAlignmentTabPage
 #include "dlgfact.hxx"
 
-#include <tools/rc.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 4e09e0e2e422..e7e5227aeefb 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -30,7 +30,6 @@
 
 // include ---------------------------------------------------------------
 
-#include <tools/resary.hxx>
 #include <vcl/button.hxx>
 #include <vcl/accel.hxx>
 #include <svtools/svmedit.hxx>
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 83badfbd55ac..4f004e1e70bf 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -34,7 +34,6 @@
 #include "View.hxx"
 
 #include <tools/debug.hxx>
-#include <tools/wldcrd.hxx>
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index f5f51690178c..89fa3d4bd6d3 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -30,7 +30,6 @@
 #define _DBAUI_CHARSETS_HXX_
 
 #include <tools/string.hxx>
-#include <tools/rc.hxx>
 #include <connectivity/dbcharset.hxx>
 #include <svx/txenctab.hxx>
 
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index e3b5489203b0..85ac3a5a613d 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
 /** === end UNO includes === **/
 
+#include <tools/string.hxx>
 #include <boost/shared_ptr.hpp>
 
 //........................................................................
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 4815558c8808..f91eb1fb7bad 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -41,7 +41,6 @@
 #include <osl/security.hxx>
 #include <rtl/ref.hxx>
 
-#include <tools/resmgr.hxx>
 #include <unotools/bootstrap.hxx>
 #include <svl/languageoptions.hxx>
 #include <unotools/syslocaleoptions.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 604a6963018a..314660a3dff8 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -35,7 +35,6 @@
 #include "rtl/ustring.hxx"
 #include "tools/gen.hxx"
 #include "tools/resid.hxx"
-#include "tools/resmgr.hxx"
 #include "tools/solar.h"
 #include "tools/string.hxx"
 #include "vcl/dialog.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 0445ed701ba2..a5d9ab3d9d24 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -96,7 +96,6 @@
 #include "tools/gen.hxx"
 #include "tools/link.hxx"
 #include "tools/resid.hxx"
-#include "tools/resmgr.hxx"
 #include "tools/solar.h"
 #include "tools/string.hxx"
 #include "unotools/configmgr.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 35dc8f3f5ba1..76c250ee9a51 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -34,7 +34,6 @@
 #include "osl/conditn.hxx"
 #include "cppuhelper/exc_hlp.hxx"
 #include "tools/resid.hxx"
-#include "tools/resmgr.hxx"
 #include "tools/solar.h"
 #include "tools/string.hxx"
 #include "vcl/dialog.hxx"
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index d7c16bb69b52..d39aa2481493 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -29,7 +29,6 @@
 #if ! defined INCLUDED_DP_RESOURCE_H
 #define INCLUDED_DP_RESOURCE_H
 
-#include "tools/resmgr.hxx"
 #include "tools/string.hxx"
 #include "tools/resid.hxx"
 #include "com/sun/star/lang/Locale.hpp"
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index 04609e7603be..4999e7870d4c 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -31,6 +31,7 @@
 #include "dp_resource.h"
 #include "osl/module.hxx"
 #include "osl/mutex.hxx"
+#include <tools/resmgr.hxx>
 #include "rtl/ustring.h"
 #include "cppuhelper/implbase1.hxx"
 #include "unotools/configmgr.hxx"
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index dbcc9581c98d..416dadedb501 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -41,6 +41,7 @@
 #include <tools/link.hxx>
 #include <rsc/rscsfx.hxx>
 #include "editeng/editengdllapi.h"
+#include <com/sun/star/lang/Locale.hpp>
 
 #include <svtools/grfmgr.hxx>
 
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index 67d65cc5a715..5b078448efc6 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -29,6 +29,7 @@
 #include "richtextunowrapper.hxx"
 
 /** === begin UNO includes === **/
+#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 /** === end UNO includes === **/
 #include <editeng/unofored.hxx>
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 2d80b30e6055..02408a972d3f 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -46,7 +46,6 @@
 
 #include "resourceprovider.hxx"
 
-#include <tools/rc.hxx>
 #include <osl/file.hxx>
 #include "CFStringUtilities.hxx"
 #include "NSString_OOoAdditions.hxx"
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 838f9e32f0b4..0ee6bc61f0ee 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -49,8 +49,6 @@
 
 #include "resourceprovider.hxx"
 
-#include <tools/rc.hxx>
-
 #include <osl/file.hxx>
 #include "CFStringUtilities.hxx"
 #include "NSString_OOoAdditions.hxx"
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 046a4a4a0e0d..5e02c2d2c62e 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -32,7 +32,6 @@
 #include "iodlgimp.hxx"
 #include "svtools/headbar.hxx"
 #include <tools/debug.hxx>
-#include <tools/wldcrd.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index df6f90c4059f..969d68ff26a5 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -55,7 +55,6 @@
 #include <vcl/syswin.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
-#include <tools/resmgr.hxx>
 #include <tools/rcid.h>
 #include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 19d62d25ec91..619bfdb40739 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -62,7 +62,6 @@
 #include <vcl/keycod.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
-#include <tools/resmgr.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <svl/solar.hrc>
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index a0fef93d3863..67dc2de860bd 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -36,7 +36,6 @@
 #include <svl/zforlist.hxx>
 #include <sal/macros.h>
 #include <tools/rcid.h>
-#include <tools/rc.hxx>
 #include <tools/solar.h>
 #include <unotools/charclass.hxx>
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 5cae0f3ceefc..71335990176f 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -32,7 +32,6 @@
 #endif
 
 #include <sfx2/objsh.hxx>
-#include <tools/rc.hxx>
 #include "sddlgfact.hxx"
 #include "strings.hrc"
 #include "BreakDlg.hxx"
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 47b12fa0f8ce..ca9060a89573 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -53,7 +53,6 @@
 
 #include <unotools/configmgr.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/wldcrd.hxx>
 #include <unotools/saveopt.hxx>
 #include <svtools/helpopt.hxx>
 #include <unotools/undoopt.hxx>
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 8af046cbb4b2..15fb2359895b 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <tools/config.hxx>
-#include <svl/inetstrm.hxx>
 #include <svl/stritem.hxx>
 
 #include <osl/mutex.hxx>
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 8f48fd389367..48dbcdf7e379 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -37,7 +37,6 @@
 #include <svtools/svtools.hrc>
 #include <unotools/saveopt.hxx>
 #include <unotools/localisationoptions.hxx>
-#include <tools/resary.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 7680ff2a0aae..b9ae282e3b20 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -42,7 +42,6 @@
 #include <svl/itempool.hxx>
 #include <svl/rectitem.hxx>
 #include <tools/debug.hxx>
-#include <tools/wldcrd.hxx>
 
 #include <tools/urlobj.hxx>
 #include <tools/config.hxx>
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 575ea4bc2720..b839bd89bb9b 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -30,7 +30,6 @@
 #include <boost/scoped_ptr.hpp>
 
 #include <vcl/msgbox.hxx>
-#include <tools/resary.hxx>
 #include <svl/lstner.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index faaca46166ba..863017cf7243 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -41,7 +41,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/string.hxx>
-#include <tools/wldcrd.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <list>
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index d990d258763f..a62d1fe69034 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -32,7 +32,6 @@
 #include <osl/mutex.hxx>
 #include <osl/thread.hxx>
 
-#include <tools/resary.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <unotools/localedatawrapper.hxx>
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index d6662045124c..47105d766e68 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -41,7 +41,6 @@
 #include <com/sun/star/frame/XTitle.hpp>
 #include <osl/mutex.hxx>
 
-#include <tools/resary.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index c1d418beb453..a2f26ffdf2ea 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/link.hxx>
-#include <tools/wldcrd.hxx>
 
 #include <rtl/logfile.hxx>
 #include <rtl/instance.hxx>
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index c8e42bae4fc3..4cb8f9cc06ac 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -38,6 +38,7 @@
 #include <ucbhelper/content.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/datetime.hxx>
+#include <tools/string.hxx>
 #include <vcl/image.hxx>
 
 class IUrlFilter;
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 347fdd1f32f6..351236ed0fe4 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -35,7 +35,6 @@
 #include <svtools/sores.hxx>
 #include <svtools/svtdata.hxx>
 
-#include <tools/rc.hxx>
 #include <unotools/configmgr.hxx>
 #include <sot/clsids.hxx>
 #include <sot/stg.hxx>
diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index 8b3f13605924..9bc47530d1cd 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -33,7 +33,6 @@
 #include <vcl/metaact.hxx>
 #include <tools/rcid.h>
 #include <tools/resid.hxx>
-#include <tools/resmgr.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <svl/solar.hrc>
 #include <vcl/salbtype.hxx>
diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx
index eb4bffa639e6..fb6014dda174 100644
--- a/svx/source/dialog/dialmgr.cxx
+++ b/svx/source/dialog/dialmgr.cxx
@@ -34,7 +34,6 @@
 // include ---------------------------------------------------------------
 
 #include <svx/dialmgr.hxx>
-#include <tools/rc.hxx>
 #include <svl/solar.hrc>
 #include <vcl/svapp.hxx>
 
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index c185be6ec6f2..1610bb1c815f 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -53,7 +53,6 @@
 #include <comphelper/processfactory.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <vcl/svapp.hxx>
-#include <tools/resmgr.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star::io;
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 09aeeff7eddd..052dbefd4094 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <tools/resary.hxx>
+#include <tools/rc.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 35ea265e13d1..24b140d558e8 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -38,7 +38,6 @@
 #include <svtools/svtabbx.hxx>
 
 #include <vcl/lstbox.hxx>
-#include <tools/resary.hxx>
 #include "swdllapi.h"
 #include "cmdid.h"
 
diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx
index de02fa8b06fc..1f2130589dfe 100644
--- a/sw/source/ui/inc/swrenamexnameddlg.hxx
+++ b/sw/source/ui/inc/swrenamexnameddlg.hxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <tools/resary.hxx>
 #include <swunodef.hxx>
 
 class SwRenameXNamedDlg : public ModalDialog
diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx
index b665a068828e..96e11da4e828 100644
--- a/sw/source/ui/inc/swuiccoll.hxx
+++ b/sw/source/ui/inc/swuiccoll.hxx
@@ -28,6 +28,7 @@
 #ifndef _SWUI_CCOLL_HXX
 #define _SWUI_CCOLL_HXX
 
+#include <tools/resary.hxx>
 #include "ccoll.hxx"
 
 class SwWrtShell;
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index 727cdae58657..7a4557b35a30 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -43,7 +43,6 @@
 #include "tox.hxx"
 #include <toxmgr.hxx>
 #include <svx/checklbx.hxx>
-#include <tools/resary.hxx>
 #include <svtools/svtreebx.hxx>
 #include <vcl/menubtn.hxx>
 #include <svx/langbox.hxx>
diff --git a/tools/inc/tools/resary.hxx b/tools/inc/tools/resary.hxx
index 6f3af5869580..429c05d933c5 100644
--- a/tools/inc/tools/resary.hxx
+++ b/tools/inc/tools/resary.hxx
@@ -28,9 +28,10 @@
 #ifndef _TOOLS_RESARY_HXX
 #define _TOOLS_RESARY_HXX
 
+#include <vector>
 #include "tools/toolsdllapi.h"
+#include <tools/string.hxx>
 #include <tools/resid.hxx>
-#include <tools/rc.hxx>
 
 // ---------------------
 // - ImplResStringItem -
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index cc6d77bd672b..932973cb82e5 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -40,7 +40,6 @@
 #include "wntmsc.hxx"
 #include <tools/errinf.hxx>
 #include <tools/debug.hxx>
-#include <tools/wldcrd.hxx>
 #include <tools/fsys.hxx>
 #include <vector>
 
diff --git a/tools/source/rc/resary.cxx b/tools/source/rc/resary.cxx
index c4f11662897b..7b831c663baa 100644
--- a/tools/source/rc/resary.cxx
+++ b/tools/source/rc/resary.cxx
@@ -28,6 +28,7 @@
 
 
 #define _TOOLS_RESARY_CXX
+#include <tools/resmgr.hxx>
 #include <tools/resary.hxx>
 #include <tools/rcid.h>
 
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index c7b1a8213877..eb8c60068604 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -32,7 +32,6 @@
 #include <unotools/configitem.hxx>
 #include <unotools/configmgr.hxx>
 #include <tools/debug.hxx>
-#include <tools/resmgr.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index 3d51cda26286..1608cdc02c44 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -32,7 +32,6 @@
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <tools/wldcrd.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <unotools/pathoptions.hxx>
diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx
index 4ed140889ad4..d49726b90998 100644
--- a/unotools/source/config/inetoptions.cxx
+++ b/unotools/source/config/inetoptions.cxx
@@ -28,7 +28,6 @@
 
 #include <unotools/inetoptions.hxx>
 #include "rtl/instance.hxx"
-#include <tools/wldcrd.hxx>
 
 #include <algorithm>
 #include <map>
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 463d90315045..74f19ddaeef3 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -30,7 +30,6 @@
 #include <unotools/configitem.hxx>
 #include <unotools/configmgr.hxx>
 #include <tools/debug.hxx>
-#include <tools/resmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 0061d63db68f..d85f7ae38934 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#include "tools/rc.hxx"
-
 #include "rtl/ustrbuf.hxx"
 
 #include "vcl/button.hxx"
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index dfe5e4d7fe14..17041d809e74 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -29,10 +29,10 @@
 #ifndef _SV_BITMAP_HXX
 #define _SV_BITMAP_HXX
 
+#include <tools/link.hxx>
 #include <vcl/sv.h>
 #include <vcl/dllapi.h>
 #include <vcl/mapmod.hxx>
-#include <tools/rc.hxx>
 #include <vcl/region.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
 
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index 816518ba4f5d..b14ebd57ee03 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -41,6 +41,7 @@
 
 #include "com/sun/star/io/XOutputStream.hpp"
 #include "com/sun/star/beans/XMaterialHolder.hpp"
+#include "com/sun/star/lang/Locale.hpp"
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/vcl/ios/source/app/salsys.cxx b/vcl/ios/source/app/salsys.cxx
index 9d300fd60804..fbc7bb4fe743 100644
--- a/vcl/ios/source/app/salsys.cxx
+++ b/vcl/ios/source/app/salsys.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#include "tools/rc.hxx"
-
 #include "rtl/ustrbuf.hxx"
 
 #include "vcl/button.hxx"
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index bcd330fae3f4..153828758928 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -32,7 +32,6 @@
 #include "tools/debug.hxx"
 
 #include "tools/rc.h"
-#include "tools/resary.hxx"
 
 #include "vcl/field.hxx"
 #include "vcl/event.hxx"