4 files changed, 16 insertions, 17 deletions
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index a717e12582b8..0ddc79224fc8 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -19,12 +19,10 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basic/basmgr.hxx>
 #include <boost/noncopyable.hpp>
-#include <boost/optional.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/static_assert.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertyContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
@@ -37,6 +35,8 @@
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
+#include <com/sun/star/drawing/LineStyle.hpp>
+#include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/drawing/ShadingPattern.hpp>
 #include <com/sun/star/drawing/XConnectableShape.hpp>
 #include <com/sun/star/drawing/XConnectorShape.hpp>
@@ -81,7 +81,6 @@
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
@@ -89,13 +88,15 @@
 #include <comphelper/docpasswordrequest.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <comphelper/extract.hxx>
+#include <comphelper/flagguard.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/random.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/sequenceasvector.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/string.hxx>
 #include <config_features.h>
-#include <config_version.h>
 #include <cppuhelper/implementationentry.hxx>
 #include <cstdio>
 #include <cstring>
@@ -139,7 +140,6 @@
 #include <editeng/pbinitem.hxx>
 #include <editeng/pgrditem.hxx>
 #include <editeng/postitem.hxx>
-#include <editeng/protitem.hxx>
 #include <editeng/scriptspaceitem.hxx>
 #include <editeng/shaditem.hxx>
 #include <editeng/shdditem.hxx>
@@ -187,7 +187,6 @@
 #include <osl/time.h>
 #include <rtl/math.hxx>
 #include <rtl/random.h>
-#include <rtl/strbuf.hxx>
 #include <rtl/tencinfo.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
@@ -263,7 +262,6 @@
 #include <ucbhelper/content.hxx>
 #include <unicode/ubidi.h>
 #include <unordered_set>
-#include <unotools/configmgr.hxx>
 #include <unotools/docinfohelper.hxx>
 #include <unotools/fltrcfg.hxx>
 #include <unotools/fontcfg.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 9ac41daa9315..fadb0801ab42 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -27,7 +27,6 @@
 #include <basegfx/color/bcolortools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -441,6 +440,8 @@
 #include <com/sun/star/xforms/XFormsSupplier.hpp>
 #include <com/sun/star/xforms/XFormsUIHelper1.hpp>
 #include <com/sun/star/xforms/XModel2.hpp>
+#include <com/sun/star/xml/sax/FastParser.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
@@ -488,6 +489,7 @@
 #include <cppuhelper/weakref.hxx>
 #include <cstdarg>
 #include <cstdlib>
+#include <ctime>
 #include <ctype.h>
 #include <deque>
 #include <drawinglayer/attribute/fillgradientattribute.hxx>
@@ -613,7 +615,6 @@
 #include <i18nutil/unicode.hxx>
 #include <iostream>
 #include <iterator>
-#include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 #include <limits.h>
 #include <limits>
@@ -624,6 +625,8 @@
 #include <math.h>
 #include <memory>
 #include <numeric>
+#include <o3tl/numeric.hxx>
+#include <o3tl/ptr_container.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Office/Writer.hxx>
@@ -711,12 +714,14 @@
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <sfx2/sidebar/EnumContext.hxx>
+#include <sfx2/sidebar/Sidebar.hxx>
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
 #include <sfx2/styfitem.hxx>
 #include <sfx2/styledlg.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/taskpane.hxx>
+#include <sfx2/templatedlg.hxx>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -812,6 +817,7 @@
 #include <svx/AccessibleShape.hxx>
 #include <svx/AccessibleTextHelper.hxx>
 #include <svx/AffineMatrixItem.hxx>
+#include <svx/ParaLineSpacingPopup.hxx>
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SmartTagCtl.hxx>
 #include <svx/SmartTagItem.hxx>
@@ -957,7 +963,6 @@
 #include <svx/unomid.hxx>
 #include <svx/unomod.hxx>
 #include <svx/unomodel.hxx>
-#include <svx/unopage.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/verttexttbxctrl.hxx>
@@ -1009,7 +1014,6 @@
 #include <svx/xtextit0.hxx>
 #include <svx/zoomsliderctrl.hxx>
 #include <svx/zoomslideritem.hxx>
-#include <time.h>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -1033,8 +1037,6 @@
 #include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/rtti.hxx>
-#include <tools/shl.hxx>
-#include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/time.hxx>
 #include <tools/urlobj.hxx>
@@ -1129,7 +1131,6 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
-#include <vcl/wmf.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vector>
 #include <xmloff/DocumentSettingsContext.hxx>
@@ -1165,6 +1166,8 @@
 #include <xmloff/xmlmetae.hxx>
 #include <xmloff/xmlmetai.hxx>
 #include <xmloff/xmlnmspe.hxx>
+#include <xmloff/xmlnume.hxx>
+#include <xmloff/xmlnumi.hxx>
 #include <xmloff/xmlprhdl.hxx>
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmlscripti.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index a2dd8574dba3..e03b3e9accd5 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -213,7 +213,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/poly.hxx>
 #include <tools/resmgr.hxx>
-#include <tools/shl.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index e3bce36df0a0..4021e27302df 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -52,10 +52,8 @@
 #include <com/sun/star/lang/Locale.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/lang/XUnoTunnel.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/vba/VBAEventId.hpp>
 #include <com/sun/star/style/BreakType.hpp>
@@ -172,6 +170,7 @@
 #include <ooo/vba/word/XBookmark.hpp>
 #include <ooo/vba/word/XBorder.hpp>
 #include <ooo/vba/word/XDialog.hpp>
+#include <osl/diagnose.h>
 #include <osl/file.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/macros.h>