20 files changed, 41 insertions, 53 deletions

diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index e39cd240d186..526cd26b2051 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -198,6 +198,7 @@
 #include <rtl/instance.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
 #include <rtl/uuid.h>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
@@ -299,7 +300,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx
index 18a34ed3bcf9..30deeb9d30e2 100644
--- a/chart2/inc/pch/precompiled_chartcore.hxx
+++ b/chart2/inc/pch/precompiled_chartcore.hxx
@@ -284,7 +284,6 @@
 #include <tools/debug.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/configitem.hxx>
diff --git a/connectivity/inc/pch/precompiled_file.hxx b/connectivity/inc/pch/precompiled_file.hxx
index 6132c9d626ef..09c80b7a7768 100644
--- a/connectivity/inc/pch/precompiled_file.hxx
+++ b/connectivity/inc/pch/precompiled_file.hxx
@@ -50,6 +50,7 @@
 #include <comphelper/types.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/propshlp.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <iterator>
@@ -62,6 +63,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
+#include <tools/string.hxx>
 #include <tools/time.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/connectivity/inc/pch/precompiled_flat.hxx b/connectivity/inc/pch/precompiled_flat.hxx
index b860a6be469e..d2ff66915547 100644
--- a/connectivity/inc/pch/precompiled_flat.hxx
+++ b/connectivity/inc/pch/precompiled_flat.hxx
@@ -41,6 +41,7 @@
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
 #include <cppuhelper/factory.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <ctype.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <osl/thread.h>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index a1bc8d615cdd..59c0dde4d6d7 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -559,6 +559,7 @@
 #include <tools/resary.hxx>
 #include <tools/shl.hxx>
 #include <tools/stream.hxx>
+#include <tools/string.hxx>
 #include <tools/time.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
index 9dfb3b872ff1..e316a1af5ed6 100644
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
@@ -81,6 +81,7 @@
 #include <comphelper/string.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <cstdio>
 #include <i18nlangtag/languagetag.hxx>
 #include <iostream>
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index ecd512b81ca9..3e0a3b07d4e0 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -260,6 +260,7 @@
 #include <comphelper/uno3.hxx>
 #include <config_features.h>
 #include <config_folders.h>
+#include <config_orcus.h>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 096398028cf7..5ee4dd5fc741 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -338,7 +338,9 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cstdio>
+#include <editeng/escapementitem.hxx>
 #include <editeng/svxenum.hxx>
+#include <editeng/unoprnms.hxx>
 #include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/msdffimp.hxx>
 #include <filter/msfilter/msvbahelper.hxx>
@@ -379,6 +381,7 @@
 #include <svx/svdotext.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/unoapi.hxx>
+#include <svx/unopage.hxx>
 #include <time.h>
 #include <tools/globname.hxx>
 #include <tools/multisel.hxx>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index a41da848f252..4ab57094246a 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -62,6 +62,7 @@
 #include "i18nlangtag/lang.h"
 #include "i18nlangtag/mslangid.hxx"
 #include "libxml/xpath.h"
+#include "rtl/bootstrap.hxx"
 #include "rtl/math.hxx"
 #include "rtl/strbuf.hxx"
 #include "rtl/ustrbuf.hxx"
@@ -77,6 +78,8 @@
 #include "svl/broadcast.hxx"
 #include "svl/intitem.hxx"
 #include "svl/itemset.hxx"
+#include "svl/sharedstring.hxx"
+#include "svl/sharedstringpool.hxx"
 #include "svl/smplhint.hxx"
 #include "svl/stritem.hxx"
 #include "svl/urihelper.hxx"
@@ -509,6 +512,7 @@
 #include <comphelper/uno3.hxx>
 #include <config_features.h>
 #include <config_mpl.h>
+#include <config_orcus.h>
 #include <config_telepathy.h>
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/component_context.hxx>
@@ -738,11 +742,13 @@
 #include <svtools/miscopt.hxx>
 #include <svtools/parhtml.hxx>
 #include <svtools/sfxecode.hxx>
+#include <svtools/simptabl.hxx>
 #include <svtools/soerr.hxx>
 #include <svtools/stdctrl.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svtools/transfer.hxx>
 #include <svtools/treelistbox.hxx>
+#include <svtools/treelistentry.hxx>
 #include <svtools/unoevent.hxx>
 #include <svtools/unoimap.hxx>
 #include <svtools/xwindowitem.hxx>
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index 5af82d2e2c2d..b63c1c323431 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -18,7 +18,6 @@
 #include "cppuhelper/implementationentry.hxx"
 #include "editeng/editstat.hxx"
 #include "formula/errorcodes.hxx"
-#include "formula/token.hxx"
 #include "oox/core/filterbase.hxx"
 #include "oox/core/relations.hxx"
 #include "oox/core/xmlfilterbase.hxx"
@@ -45,15 +44,13 @@
 #include "oox/token/tokens.hxx"
 #include "oox/vml/vmlshape.hxx"
 #include "oox/vml/vmlshapecontainer.hxx"
+#include "rtl/ref.hxx"
 #include "rtl/strbuf.hxx"
 #include "sal/config.h"
 #include "sal/types.h"
-#include "sfx2/docfile.hxx"
-#include "sfx2/frame.hxx"
-#include "svl/itemset.hxx"
 #include "svl/poolcach.hxx"
-#include "svtools/treelistbox.hxx"
-#include "svtools/treelistentry.hxx"
+#include "svl/sharedstring.hxx"
+#include "svl/sharedstringpool.hxx"
 #include "svx/algitem.hxx"
 #include "svx/sdr/properties/properties.hxx"
 #include "svx/sdtaitm.hxx"
@@ -62,15 +59,14 @@
 #include "svx/xflclit.hxx"
 #include "svx/xlnstit.hxx"
 #include "svx/xlnstwit.hxx"
-#include "tools/datetime.hxx"
 #include "tools/urlobj.hxx"
-#include "ucbhelper/content.hxx"
 #include "vcl/mapmod.hxx"
 #include "vcl/msgbox.hxx"
 #include <algorithm>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <boost/bind.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/scoped_ptr.hpp>
@@ -314,14 +310,12 @@
 #include <com/sun/star/table/XCell2.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/table/XColumnRowRange.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/text/FilenameDisplayFormat.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
@@ -342,6 +336,7 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
+#include <config_orcus.h>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cstring>
@@ -450,12 +445,10 @@
 #include <sfx2/sfxhtml.hxx>
 #include <sot/exchange.hxx>
 #include <sot/storage.hxx>
-#include <sstream>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string>
 #include <svl/PasswordHelper.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
@@ -524,7 +517,6 @@
 #include <tools/globname.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index c6fdf55b3f7b..aaa92cf75906 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -23,7 +23,6 @@
 #include "comphelper/scopeguard.hxx"
 #include "cppuhelper/exc_hlp.hxx"
 #include "cppuhelper/implbase1.hxx"
-#include "officecfg/Office/Common.hxx"
 #include "osl/diagnose.h"
 #include "osl/time.h"
 #include "rtl/ref.hxx"
@@ -169,7 +168,6 @@
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-#include <com/sun/star/drawing/XDrawSubController.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <com/sun/star/drawing/XLayer.hpp>
 #include <com/sun/star/drawing/XLayerManager.hpp>
@@ -179,7 +177,6 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapeDescriptor.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/drawing/framework/AnchorBindingMode.hpp>
 #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
 #include <com/sun/star/drawing/framework/ConfigurationController.hpp>
 #include <com/sun/star/drawing/framework/ModuleController.hpp>
@@ -191,7 +188,6 @@
 #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/drawing/framework/XPane.hpp>
-#include <com/sun/star/drawing/framework/XResourceId.hpp>
 #include <com/sun/star/drawing/framework/XTabBar.hpp>
 #include <com/sun/star/drawing/framework/XView.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
@@ -303,7 +299,6 @@
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
 #include <com/sun/star/ui/UIElementType.hpp>
-#include <com/sun/star/ui/XUIElementFactory.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
@@ -353,8 +348,8 @@
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <comphelper/anytostring.hxx>
 #include <comphelper/classids.hxx>
-#include <comphelper/configuration.hxx>
 #include <comphelper/documentconstants.hxx>
+#include <comphelper/expandmacro.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/mediadescriptor.hxx>
@@ -476,7 +471,6 @@
 #include <osl/diagnose.h>
 #include <osl/diagnose.hxx>
 #include <osl/doublecheckedlocking.h>
-#include <osl/file.h>
 #include <osl/file.hxx>
 #include <osl/getglobalmutex.hxx>
 #include <osl/module.hxx>
@@ -530,10 +524,10 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/shell.hxx>
 #include <sfx2/sidebar/EnumContext.hxx>
+#include <sfx2/sidebar/Sidebar.hxx>
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
 #include <sfx2/sidebar/Theme.hxx>
-#include <sfx2/taskpane.hxx>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/thumbnailview.hxx>
 #include <sfx2/tplpitem.hxx>
@@ -599,8 +593,6 @@
 #include <svtools/svtresid.hxx>
 #include <svtools/tabbar.hxx>
 #include <svtools/toolbarmenu.hxx>
-#include <svtools/toolpanel/toolpanel.hxx>
-#include <svtools/toolpanel/toolpaneldeck.hxx>
 #include <svtools/transfer.hxx>
 #include <svtools/unoevent.hxx>
 #include <svtools/unoimap.hxx>
@@ -626,7 +618,6 @@
 #include <svx/cube3d.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dlgctrl.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/e3dundo.hxx>
@@ -767,7 +758,6 @@
 #include <svx/view3d.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/xcolit.hxx>
-#include <svx/xdash.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xenum.hxx>
 #include <svx/xexch.hxx>
@@ -871,9 +861,7 @@
 #include <vcl/decoview.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/dibtools.hxx>
-#include <vcl/dockwin.hxx>
 #include <vcl/edit.hxx>
-#include <vcl/event.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/floatwin.hxx>
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 7d293f12c26b..ddf98fec1214 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -73,12 +73,8 @@
 #include "comphelper/storagehelper.hxx"
 #include "cppuhelper/basemutex.hxx"
 #include "cppuhelper/compbase6.hxx"
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/interfacecontainer.hxx"
-#include <sfx2/dinfedt.hxx>
 #include "i18nlangtag/languagetag.hxx"
-#include <sfx2/imagemgr.hxx>
 #include "officecfg/Office/Common.hxx"
 #include "osl/diagnose.h"
 #include "osl/mutex.hxx"
@@ -88,15 +84,10 @@
 #include "sal/config.h"
 #include "sal/types.h"
 #include "sax/tools/converter.hxx"
-#include <sfx2/sfxresid.hxx>
-#include <sfx2/sidebar/ControlFactory.hxx>
-#include <sfx2/sidebar/ControllerItem.hxx>
-#include <sfx2/sidebar/EnumContext.hxx>
 #include "sot/storage.hxx"
 #include "svl/urihelper.hxx"
 #include "svtools/htmlkywd.hxx"
 #include "svtools/treelistentry.hxx"
-#include <sfx2/thumbnailview.hxx>
 #include "toolkit/awt/vclxdevice.hxx"
 #include "tools/datetime.hxx"
 #include "tools/debug.hxx"
@@ -185,7 +176,6 @@
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 #include <com/sun/star/document/ChangedByOthersRequest.hpp>
 #include <com/sun/star/document/CmisProperty.hpp>
 #include <com/sun/star/document/DocumentProperties.hpp>
@@ -536,7 +526,6 @@
 #include <comphelper/anytostring.hxx>
 #include <comphelper/attributelist.hxx>
 #include <comphelper/classids.hxx>
-#include <comphelper/configuration.hxx>
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/docpasswordhelper.hxx>
 #include <comphelper/docpasswordrequest.hxx>
@@ -613,7 +602,6 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <sfx2/objsh.hxx>
 #include <officecfg/Inet.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Office/ProtocolHandler.hxx>
@@ -666,6 +654,7 @@
 #include <svl/documentlockfile.hxx>
 #include <svl/eitem.hxx>
 #include <svl/flagitem.hxx>
+#include <svl/grabbagitem.hxx>
 #include <svl/imageitm.hxx>
 #include <svl/inethist.hxx>
 #include <svl/inettype.hxx>
@@ -759,6 +748,7 @@
 #include <tools/rtti.hxx>
 #include <tools/shl.hxx>
 #include <tools/stream.hxx>
+#include <tools/string.hxx>
 #include <tools/svborder.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/time.hxx>
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx
index 6d8b4a9c3fb5..2a4ec7b0aac3 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -128,7 +128,6 @@
 #include <com/sun/star/frame/Frame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
-#include <com/sun/star/geometry/IntegerSize2D.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/graphic/XGraphicRenderer.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index 9b55944eaf8a..269a0c71ce2c 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -14,11 +14,6 @@
  also fixes all possible problems, so it's usually better to use it).
 */
 
-#include <svtools/DocumentToGraphicRenderer.hxx>
-#include <svtools/GraphicExportOptionsDialog.hxx>
-#include <svtools/PlaceEditDialog.hxx>
-#include <svtools/ServerDetailsControls.hxx>
-#include <svtools/bindablecontrolhelper.hxx>
 #include "com/sun/star/beans/XPropertySet.hpp"
 #include "com/sun/star/document/XDocumentProperties.hpp"
 #include "com/sun/star/script/Converter.hpp"
@@ -33,7 +28,6 @@
 #include "comphelper/servicedecl.hxx"
 #include "comphelper/string.hxx"
 #include "cppuhelper/implementationentry.hxx"
-#include <svtools/inetimg.hxx>
 #include "osl/diagnose.h"
 #include "rtl/ustring.hxx"
 #include "sal/config.h"
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 026db6e068da..fcb75191ca05 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -438,6 +438,7 @@
 #include <map>
 #include <math.h>
 #include <memory>
+#include <officecfg/Office/Common.hxx>
 #include <osl/diagnose.h>
 #include <osl/endian.h>
 #include <osl/file.hxx>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 08f942ff02d5..c734fae48cc4 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -25,6 +25,7 @@
 #include <basic/basmgr.hxx>
 #include <boost/scoped_array.hpp>
 #include <boost/scoped_ptr.hpp>
+#include <boost/unordered_set.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertyContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -82,6 +83,12 @@
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
+#include <com/sun/star/xml/dom/XAttr.hpp>
+#include <com/sun/star/xml/dom/XDocument.hpp>
+#include <com/sun/star/xml/dom/XNamedNodeMap.hpp>
+#include <com/sun/star/xml/dom/XNode.hpp>
+#include <com/sun/star/xml/sax/Writer.hpp>
+#include <com/sun/star/xml/sax/XSAXSerializable.hpp>
 #include <comphelper/docpasswordrequest.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/mediadescriptor.hxx>
@@ -145,6 +152,7 @@
 #include <editeng/udlnitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/unolingu.hxx>
+#include <editeng/unoprnms.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/widwitem.hxx>
 #include <editeng/wrlmitem.hxx>
@@ -243,7 +251,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 7722819c1eaa..053b441ada8a 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -57,6 +57,7 @@
 #include <basic/sbxvar.hxx>
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
+#include <boost/optional.hpp>
 #include <boost/ptr_container/ptr_set.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/scoped_ptr.hpp>
@@ -624,6 +625,7 @@
 #include <osl/thread.hxx>
 #include <rsc/rscsfx.hxx>
 #include <rtl/bootstrap.hxx>
+#include <rtl/character.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/math.hxx>
 #include <rtl/random.h>
@@ -985,7 +987,6 @@
 #include <tools/gen.hxx>
 #include <tools/globname.hxx>
 #include <tools/helpers.hxx>
-#include <tools/inetmime.hxx>
 #include <tools/line.hxx>
 #include <tools/link.hxx>
 #include <tools/multisel.hxx>
@@ -1000,6 +1001,7 @@
 #include <tools/string.hxx>
 #include <tools/time.hxx>
 #include <tools/urlobj.hxx>
+#include <touch/touch.h>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentidentifier.hxx>
 #include <unicode/ubidi.h>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 660ba22edd1f..5212ce9ebae8 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -376,6 +376,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/zcodec.hxx>
+#include <touch/touch.h>
 #include <typeinfo>
 #include <ucbhelper/content.hxx>
 #include <unicode/ubidi.h>
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index 204bb12e5759..4fb1b322eadc 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -80,12 +80,10 @@
 #include <com/sun/star/io/UnexpectedEOFException.hpp>
 #include <com/sun/star/io/WrongFormatException.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/style/BreakType.hpp>
@@ -144,13 +142,13 @@
 #include <com/sun/star/text/XTextFrame.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/view/XFormLayerAccess.hpp>
+#include <com/sun/star/xml/dom/DocumentBuilder.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <com/sun/star/xml/sax/XParser.hpp>
diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx
index 158f10767357..4aa1d5a5e4a4 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -18,6 +18,7 @@
 #include "com/sun/star/beans/XPropertySetInfo.hpp"
 #include "com/sun/star/text/XLineNumberingProperties.hpp"
 #include "comphelper/processfactory.hxx"
+#include "cppuhelper/exc_hlp.hxx"
 #include "sal/config.h"
 #include "svl/urihelper.hxx"
 #include "tools/debug.hxx"
@@ -499,6 +500,7 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <functional>
 #include <i18nlangtag/languagetag.hxx>