regenerate PCH headers for the 4 new levels

Plus some build fixes triggered by this.

Change-Id: I59b21def706598ceffd45ae5b1f0262ec9c1ad50
Reviewed-on: https://gerrit.libreoffice.org/71581
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>

4 files changed, 481 insertions, 866 deletions

diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index b2567272dddf..615d30bb7e84 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -13,33 +13,27 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2017-09-20 22:54:43 using:
+ Generated on 2019-04-29 21:16:18 using:
  ./bin/update_pch sw msword --cutoff=4 --exclude:system --include:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
  ./bin/update_pch_bisect ./sw/inc/pch/precompiled_msword.hxx "make sw.build" --find-conflicts
 */
 
+#if PCH_LEVEL >= 1
 #include <algorithm>
 #include <array>
 #include <assert.h>
 #include <cassert>
 #include <climits>
-#include <config_features.h>
-#include <config_global.h>
-#include <config_typesizes.h>
-#include <config_vcl.h>
 #include <cstddef>
-#include <cstdlib>
 #include <cstring>
 #include <deque>
-#include <exception>
 #include <float.h>
 #include <functional>
 #include <initializer_list>
 #include <iomanip>
 #include <iostream>
-#include <iterator>
 #include <limits.h>
 #include <limits>
 #include <list>
@@ -50,14 +44,8 @@
 #include <new>
 #include <ostream>
 #include <set>
-#include <sstream>
-#include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <string.h>
-#include <string>
-#include <swdllapi.h>
-#include <swerror.h>
 #include <type_traits>
 #include <typeinfo>
 #include <unordered_map>
@@ -65,24 +53,20 @@
 #include <utility>
 #include <vector>
 #include <boost/optional.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
 #include <osl/diagnose.h>
 #include <osl/diagnose.hxx>
 #include <osl/doublecheckedlocking.h>
 #include <osl/endian.h>
-#include <osl/file.h>
 #include <osl/file.hxx>
 #include <osl/getglobalmutex.hxx>
 #include <osl/interlck.h>
 #include <osl/mutex.h>
 #include <osl/mutex.hxx>
-#include <osl/pipe.h>
-#include <osl/process.h>
-#include <osl/security.h>
-#include <osl/socket.h>
 #include <osl/thread.h>
 #include <osl/time.h>
 #include <rtl/alloc.h>
-#include <rtl/byteseq.h>
 #include <rtl/character.hxx>
 #include <rtl/cipher.h>
 #include <rtl/digest.h>
@@ -113,15 +97,18 @@
 #include <sal/saldllapi.h>
 #include <sal/types.h>
 #include <sal/typesizes.h>
-#include <vcl/accel.hxx>
+#include <salhelper/simplereferenceobject.hxx>
+#include <vcl/GraphicExternalLink.hxx>
+#include <vcl/GraphicObject.hxx>
+#include <vcl/IDialogRenderable.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/animate/Animation.hxx>
+#include <vcl/animate/AnimationBitmap.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/cairo.hxx>
 #include <vcl/checksum.hxx>
 #include <vcl/combobox.hxx>
-#include <vcl/commandevent.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/devicecoordinate.hxx>
@@ -129,38 +116,25 @@
 #include <vcl/dndhelp.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/errcode.hxx>
-#include <vcl/errinf.hxx>
-#include <vcl/event.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fntstyle.hxx>
 #include <vcl/font.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
-#include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/GraphicObject.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>
-#include <vcl/image.hxx>
-#include <vcl/inputctx.hxx>
-#include <vcl/inputtypes.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/keycodes.hxx>
-#include <vcl/lineinfo.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/metaact.hxx>
 #include <vcl/metaactiontypes.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/outdevmap.hxx>
 #include <vcl/outdevstate.hxx>
-#include <vcl/ptrstyle.hxx>
 #include <vcl/region.hxx>
-#include <vcl/salgtype.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/spinfld.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/task.hxx>
@@ -171,22 +145,12 @@
 #include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
 #include <vcl/vectorgraphicdata.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/window.hxx>
-#include <vcl/wmfexternal.hxx>
-#include <IDocumentDrawModelAccess.hxx>
-#include <IDocumentFieldsAccess.hxx>
-#include <IDocumentLayoutAccess.hxx>
-#include <IDocumentMarkAccess.hxx>
-#include <IDocumentSettingAccess.hxx>
-#include <IDocumentStylePoolAccess.hxx>
-#include <IMark.hxx>
-#include <IShellCursorSupplier.hxx>
-#include <SwGetPoolIdFromName.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
-#include <basegfx/color/bcolormodifier.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/point/b2dpoint.hxx>
@@ -194,8 +158,11 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/range/b2irectangle.hxx>
 #include <basegfx/range/basicrange.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/tuple/b2i64tuple.hxx>
 #include <basegfx/tuple/b2ituple.hxx>
 #include <basegfx/tuple/b3dtuple.hxx>
 #include <basegfx/vector/b2dsize.hxx>
@@ -203,26 +170,12 @@
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/vector/b2ivector.hxx>
 #include <basic/basicdllapi.h>
-#include <basic/codecompletecache.hxx>
 #include <basic/sbdef.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbxcore.hxx>
 #include <basic/sbxdef.hxx>
-#include <basic/sbxform.hxx>
-#include <basic/sbxmeth.hxx>
 #include <basic/sbxobj.hxx>
-#include <basic/sbxprop.hxx>
 #include <basic/sbxvar.hxx>
-#include <bparr.hxx>
-#include <breakit.hxx>
-#include <calbck.hxx>
-#include <charfmt.hxx>
-#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
-#include <com/sun/star/accessibility/TextSegment.hpp>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/awt/GradientStyle.hpp>
 #include <com/sun/star/awt/Key.hpp>
@@ -230,38 +183,33 @@
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/SystemPointer.hpp>
+#include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/StringPair.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/bridge/oleautomation/Decimal.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/datatransfer/DataFlavor.hpp>
-#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#include <com/sun/star/document/CmisVersion.hpp>
 #include <com/sun/star/document/EventObject.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/drawing/DashStyle.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/drawing/Hatch.hpp>
 #include <com/sun/star/drawing/HatchStyle.hpp>
 #include <com/sun/star/drawing/LineCap.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
+#include <com/sun/star/drawing/TextFitToSizeType.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -271,66 +219,38 @@
 #include <com/sun/star/drawing/XShapes2.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/embed/VerbDescriptor.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/geometry/IntegerRectangle2D.hpp>
 #include <com/sun/star/graphic/XPrimitive2D.hpp>
 #include <com/sun/star/i18n/Calendar2.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
-#include <com/sun/star/i18n/DirectionProperty.hpp>
-#include <com/sun/star/i18n/KCharacterType.hpp>
-#include <com/sun/star/i18n/KParseTokens.hpp>
-#include <com/sun/star/i18n/KParseType.hpp>
+#include <com/sun/star/i18n/ForbiddenCharacters.hpp>
+#include <com/sun/star/i18n/LanguageCountryInfo.hpp>
+#include <com/sun/star/i18n/LocaleDataItem2.hpp>
 #include <com/sun/star/i18n/LocaleItem.hpp>
-#include <com/sun/star/i18n/ParseResult.hpp>
+#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
-#include <com/sun/star/i18n/UnicodeScript.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
-#include <com/sun/star/i18n/XCharacterClassification.hpp>
-#include <com/sun/star/i18n/XCollator.hpp>
-#include <com/sun/star/i18n/XExtendedTransliteration.hpp>
-#include <com/sun/star/i18n/XLocaleData4.hpp>
-#include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/reservedWords.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-#include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/script/XInvocation.hpp>
-#include <com/sun/star/script/XLibraryContainer.hpp>
-#include <com/sun/star/script/XStarBasicAccess.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/style/TabAlign.hpp>
 #include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
-#include <com/sun/star/text/TextContentAnchorType.hpp>
-#include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XTextCopy.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
@@ -347,7 +267,6 @@
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/TypeClass.hdl>
 #include <com/sun/star/uno/XAggregation.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/XWeak.hpp>
 #include <com/sun/star/uno/genfunc.h>
@@ -355,51 +274,34 @@
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Time.hpp>
-#include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/util/XAccounting.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
-#include <com/sun/star/xml/Attribute.hpp>
-#include <com/sun/star/xml/FastAttribute.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
-#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <comphelper/comphelperdllapi.h>
-#include <comphelper/fileformat.h>
+#include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/propertysequence.hxx>
+#include <comphelper/propertysetinfo.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/string.hxx>
-#include <comphelper/types.hxx>
 #include <comphelper/weak.hxx>
 #include <cppu/cppudllapi.h>
 #include <cppu/unotype.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <cppuhelper/compbase5.hxx>
 #include <cppuhelper/compbase_ex.hxx>
 #include <cppuhelper/cppuhelperdllapi.h>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/implbase6.hxx>
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/implbase_ex_post.hxx>
 #include <cppuhelper/implbase_ex_pre.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <crstate.hxx>
-#include <cshtyp.hxx>
-#include <dcontact.hxx>
-#include <docary.hxx>
-#include <docsh.hxx>
-#include <docufld.hxx>
-#include <drawdoc.hxx>
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <editeng/adjustitem.hxx>
@@ -428,12 +330,14 @@
 #include <editeng/fontitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/hyphenzoneitem.hxx>
+#include <editeng/keepitem.hxx>
 #include <editeng/kernitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/mutxhelp.hxx>
+#include <editeng/opaqitem.hxx>
+#include <editeng/outlobj.hxx>
 #include <editeng/paperinf.hxx>
-#include <editeng/paragraphdata.hxx>
 #include <editeng/paravertalignitem.hxx>
 #include <editeng/pgrditem.hxx>
 #include <editeng/postitem.hxx>
@@ -448,54 +352,20 @@
 #include <editeng/unoipset.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/widwitem.hxx>
-#include <fchrfmt.hxx>
 #include <filter/msfilter/msfilterdllapi.h>
-#include <fldbas.hxx>
-#include <flyenum.hxx>
-#include <fmtanchr.hxx>
-#include <fmtclbl.hxx>
-#include <fmtclds.hxx>
-#include <fmtcnct.hxx>
-#include <fmtcntnt.hxx>
-#include <fmtcol.hxx>
-#include <fmtflcnt.hxx>
-#include <fmtfld.hxx>
-#include <fmtfsize.hxx>
-#include <fmtftn.hxx>
-#include <fmthdft.hxx>
-#include <fmtinfmt.hxx>
-#include <fmtline.hxx>
-#include <fmtornt.hxx>
-#include <fmtpdsc.hxx>
-#include <fmtrowsplt.hxx>
-#include <fmtsrnd.hxx>
-#include <fmturl.hxx>
-#include <frmatr.hxx>
-#include <frmfmt.hxx>
-#include <ftninfo.hxx>
-#include <grfatr.hxx>
-#include <hintids.hxx>
-#include <hints.hxx>
 #include <i18nlangtag/i18nlangtagdllapi.h>
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nutil/transliteration.hxx>
-#include <index.hxx>
-#include <lineinfo.hxx>
-#include <mdiexp.hxx>
-#include <ndarr.hxx>
-#include <ndgrf.hxx>
-#include <ndole.hxx>
-#include <ndtxt.hxx>
-#include <ndtyp.hxx>
-#include <node.hxx>
-#include <numrule.hxx>
 #include <o3tl/cow_wrapper.hxx>
+#include <o3tl/deleter.hxx>
 #include <o3tl/enumrange.hxx>
+#include <o3tl/safeint.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
+#include <o3tl/underlyingenumvalue.hxx>
 #include <oox/dllapi.h>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/export/utils.hxx>
@@ -504,24 +374,14 @@
 #include <oox/helper/refmap.hxx>
 #include <oox/helper/storagebase.hxx>
 #include <oox/token/tokens.hxx>
-#include <pagedesc.hxx>
-#include <pam.hxx>
-#include <paratr.hxx>
-#include <poolfmt.hxx>
-#include <reffld.hxx>
-#include <sax/fastattribs.hxx>
 #include <sax/fshelper.hxx>
 #include <sax/saxdllapi.h>
 #include <sfx2/dllapi.h>
-#include <sfx2/sfxuno.hxx>
-#include <sfx2/shell.hxx>
-#include <sfx2/signaturestate.hxx>
-#include <shellio.hxx>
-#include <sot/exchange.hxx>
+#include <sfx2/docfile.hxx>
 #include <sot/formats.hxx>
-#include <sot/object.hxx>
 #include <sot/sotdllapi.h>
 #include <svl/SfxBroadcaster.hxx>
+#include <svl/broadcast.hxx>
 #include <svl/cenumitm.hxx>
 #include <svl/cintitem.hxx>
 #include <svl/custritm.hxx>
@@ -530,31 +390,24 @@
 #include <svl/hint.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itemiter.hxx>
-#include <svl/itempool.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/itemset.hxx>
 #include <svl/languageoptions.hxx>
 #include <svl/lstner.hxx>
 #include <svl/macitem.hxx>
-#include <svl/memberid.h>
 #include <svl/metitem.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/style.hxx>
 #include <svl/stylesheetuser.hxx>
 #include <svl/svldllapi.h>
+#include <svl/typedwhich.hxx>
 #include <svl/undo.hxx>
 #include <svl/urihelper.hxx>
 #include <svl/whiter.hxx>
-#include <svtools/accessibleruler.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/ehdl.hxx>
-#include <svtools/embedhlp.hxx>
-#include <svtools/miscopt.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
-#include <svtools/ruler.hxx>
 #include <svtools/svtdllapi.h>
-#include <svtools/svtresid.hxx>
 #include <svx/XPropertyEntry.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/grfcrop.hxx>
@@ -626,9 +479,9 @@
 #include <svx/svdtext.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdtypes.hxx>
+#include <svx/svdundo.hxx>
 #include <svx/svdxcgv.hxx>
 #include <svx/svxdllapi.h>
-#include <svx/swframetypes.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/xcolit.hxx>
@@ -645,15 +498,6 @@
 #include <svx/xpoly.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xtextit0.hxx>
-#include <swatrset.hxx>
-#include <swcrsr.hxx>
-#include <swdbdata.hxx>
-#include <swmodule.hxx>
-#include <swrect.hxx>
-#include <swregion.hxx>
-#include <swtable.hxx>
-#include <swtypes.hxx>
-#include <tblsel.hxx>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
 #include <tools/date.hxx>
@@ -663,7 +507,7 @@
 #include <tools/fontenum.hxx>
 #include <tools/fract.hxx>
 #include <tools/gen.hxx>
-#include <tools/globname.hxx>
+#include <tools/helpers.hxx>
 #include <tools/lineend.hxx>
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
@@ -677,9 +521,6 @@
 #include <tools/weakbase.h>
 #include <tools/weakbase.hxx>
 #include <tools/wintypes.hxx>
-#include <toxe.hxx>
-#include <txatbase.hxx>
-#include <txtftn.hxx>
 #include <typelib/typeclass.h>
 #include <typelib/typedescription.h>
 #include <typelib/uik.h>
@@ -687,10 +528,7 @@
 #include <uno/any2.h>
 #include <uno/data.h>
 #include <uno/sequence2.h>
-#include <unobaseclass.hxx>
 #include <unotools/calendarwrapper.hxx>
-#include <unotools/charclass.hxx>
-#include <unotools/collatorwrapper.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/fltrcfg.hxx>
 #include <unotools/fontdefs.hxx>
@@ -703,8 +541,84 @@
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/unotoolsdllapi.h>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <IDocumentDrawModelAccess.hxx>
+#include <IDocumentFieldsAccess.hxx>
+#include <IDocumentLayoutAccess.hxx>
+#include <IDocumentMarkAccess.hxx>
+#include <IDocumentSettingAccess.hxx>
+#include <IDocumentStylePoolAccess.hxx>
+#include <IMark.hxx>
+#include <IShellCursorSupplier.hxx>
+#include <bparr.hxx>
+#include <breakit.hxx>
+#include <calbck.hxx>
+#include <charfmt.hxx>
+#include <crstate.hxx>
+#include <cshtyp.hxx>
+#include <dcontact.hxx>
+#include <docary.hxx>
+#include <docsh.hxx>
+#include <docufld.hxx>
+#include <drawdoc.hxx>
+#include <fchrfmt.hxx>
+#include <fldbas.hxx>
+#include <flyenum.hxx>
+#include <fmtanchr.hxx>
+#include <fmtclbl.hxx>
+#include <fmtclds.hxx>
+#include <fmtcnct.hxx>
+#include <fmtcntnt.hxx>
+#include <fmtcol.hxx>
+#include <fmtflcnt.hxx>
+#include <fmtfld.hxx>
+#include <fmtfsize.hxx>
+#include <fmtftn.hxx>
+#include <fmthdft.hxx>
+#include <fmtinfmt.hxx>
+#include <fmtline.hxx>
+#include <fmtornt.hxx>
+#include <fmtpdsc.hxx>
+#include <fmtrowsplt.hxx>
+#include <fmtsrnd.hxx>
+#include <fmturl.hxx>
+#include <frmatr.hxx>
+#include <frmfmt.hxx>
+#include <ftninfo.hxx>
+#include <grfatr.hxx>
+#include <hintids.hxx>
+#include <index.hxx>
+#include <lineinfo.hxx>
+#include <mdiexp.hxx>
+#include <ndarr.hxx>
+#include <ndgrf.hxx>
+#include <ndole.hxx>
+#include <ndtxt.hxx>
+#include <ndtyp.hxx>
+#include <node.hxx>
+#include <numrule.hxx>
+#include <pagedesc.hxx>
+#include <pam.hxx>
+#include <paratr.hxx>
+#include <poolfmt.hxx>
+#include <reffld.hxx>
+#include <shellio.hxx>
+#include <swcrsr.hxx>
+#include <swdllapi.h>
+#include <swerror.h>
+#include <swmodule.hxx>
+#include <swrect.hxx>
+#include <swregion.hxx>
+#include <swtable.hxx>
+#include <tblsel.hxx>
+#include <toxe.hxx>
+#include <txatbase.hxx>
+#include <txtftn.hxx>
+#include <unobaseclass.hxx>
 #include <viewopt.hxx>
 #include <viewsh.hxx>
 #include <viscrs.hxx>
+#endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 821f8570c7a0..cc94f50591aa 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -13,43 +13,32 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2017-09-20 22:54:58 using:
+ Generated on 2019-04-29 21:16:05 using:
  ./bin/update_pch sw sw --cutoff=7 --exclude:system --exclude:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
  ./bin/update_pch_bisect ./sw/inc/pch/precompiled_sw.hxx "make sw.build" --find-conflicts
 */
 
+#if PCH_LEVEL >= 1
 #include <algorithm>
 #include <cassert>
-#include <climits>
-#include <cmdid.h>
-#include <config_features.h>
-#include <config_global.h>
 #include <cstddef>
 #include <cstdlib>
+#include <cstring>
 #include <deque>
-#include <exception>
 #include <float.h>
 #include <functional>
-#include <helpids.h>
 #include <limits.h>
-#include <limits>
-#include <list>
 #include <map>
 #include <memory>
 #include <new>
 #include <ostream>
 #include <set>
-#include <stack>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <swdllapi.h>
-#include <swerror.h>
 #include <type_traits>
-#include <typeinfo>
-#include <unomid.h>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
@@ -58,6 +47,8 @@
 #include <boost/optional.hpp>
 #include <boost/optional/optional.hpp>
 #include <boost/property_tree/json_parser.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
 #include <osl/diagnose.h>
 #include <osl/diagnose.hxx>
 #include <osl/doublecheckedlocking.h>
@@ -65,7 +56,6 @@
 #include <osl/file.hxx>
 #include <osl/getglobalmutex.hxx>
 #include <osl/interlck.h>
-#include <osl/module.h>
 #include <osl/module.hxx>
 #include <osl/mutex.hxx>
 #include <osl/thread.hxx>
@@ -94,81 +84,56 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <salhelper/singletonref.hxx>
 #include <vcl/EnumContext.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/builder.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/button.hxx>
 #include <vcl/checksum.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/commandevent.hxx>
 #include <vcl/ctrl.hxx>
+#include <vcl/dialog.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/dockwin.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
-#include <vcl/field.hxx>
+#include <vcl/event.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/fntstyle.hxx>
 #include <vcl/font.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/GraphicObject.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/help.hxx>
 #include <vcl/image.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/imap.hxx>
+#include <vcl/imapobj.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/region.hxx>
-#include <vcl/salnativewidgets.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/spinfld.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
-#include <vcl/task.hxx>
-#include <vcl/timer.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/weld.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
-#include <AnnotationWin.hxx>
-#include <EnhancedPDFExportHelper.hxx>
-#include <IDocumentChartDataProviderAccess.hxx>
-#include <IDocumentContentOperations.hxx>
-#include <IDocumentDeviceAccess.hxx>
-#include <IDocumentDrawModelAccess.hxx>
-#include <IDocumentFieldsAccess.hxx>
-#include <IDocumentLayoutAccess.hxx>
-#include <IDocumentLinksAdministration.hxx>
-#include <IDocumentRedlineAccess.hxx>
-#include <IDocumentSettingAccess.hxx>
-#include <IDocumentState.hxx>
-#include <IDocumentStatistics.hxx>
-#include <IDocumentStylePoolAccess.hxx>
-#include <IDocumentUndoRedo.hxx>
-#include <IMark.hxx>
-#include <PostItMgr.hxx>
-#include <SwNodeNum.hxx>
-#include <SwRewriter.hxx>
-#include <SwSmartTagMgr.hxx>
-#include <SwStyleNameMapper.hxx>
-#include <TextCursorHelper.hxx>
-#include <accmap.hxx>
-#include <authfld.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
-#include <basegfx/color/bcolormodifier.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/range/basicrange.hxx>
@@ -179,43 +144,27 @@
 #include <basic/basicdllapi.h>
 #include <basic/sbxcore.hxx>
 #include <basic/sbxvar.hxx>
-#include <breakit.hxx>
-#include <calbck.hxx>
-#include <calc.hxx>
-#include <cellatr.hxx>
-#include <charatr.hxx>
-#include <charfmt.hxx>
-#include <chpfld.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <com/sun/star/accessibility/TextSegment.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/bridge/oleautomation/Decimal.hpp>
-#include <com/sun/star/datatransfer/DataFlavor.hpp>
-#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/graphic/XPrimitive2D.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -228,6 +177,7 @@
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
+#include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Reference.hxx>
@@ -235,23 +185,20 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Type.h>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/TypeClass.hdl>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/XWeak.hpp>
 #include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/XAccounting.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <comphelper/classids.hxx>
 #include <comphelper/comphelperdllapi.h>
+#include <comphelper/fileformat.h>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
+#include <comphelper/scopeguard.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/storagehelper.hxx>
@@ -263,25 +210,13 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/compbase_ex.hxx>
 #include <cppuhelper/cppuhelperdllapi.h>
+#include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/weak.hxx>
-#include <crsrsh.hxx>
-#include <crstate.hxx>
-#include <dbfld.hxx>
-#include <dbmgr.hxx>
-#include <dcontact.hxx>
-#include <ddefld.hxx>
-#include <docary.hxx>
-#include <docsh.hxx>
-#include <docstat.hxx>
-#include <docstyle.hxx>
-#include <docufld.hxx>
-#include <drawdoc.hxx>
+#include <cppuhelper/typeprovider.hxx>
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
-#include <edimp.hxx>
 #include <editeng/acorrcfg.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/blinkitem.hxx>
@@ -289,13 +224,16 @@
 #include <editeng/brushitem.hxx>
 #include <editeng/charhiddenitem.hxx>
 #include <editeng/charrotateitem.hxx>
+#include <editeng/charscaleitem.hxx>
 #include <editeng/cmapitem.hxx>
 #include <editeng/colritem.hxx>
+#include <editeng/contouritem.hxx>
 #include <editeng/crossedoutitem.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editengdllapi.h>
 #include <editeng/editview.hxx>
 #include <editeng/eeitem.hxx>
+#include <editeng/emphasismarkitem.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/flstitem.hxx>
@@ -312,94 +250,38 @@
 #include <editeng/opaqitem.hxx>
 #include <editeng/orphitem.hxx>
 #include <editeng/outliner.hxx>
+#include <editeng/outlobj.hxx>
 #include <editeng/paperinf.hxx>
 #include <editeng/pbinitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/protitem.hxx>
+#include <editeng/rsiditem.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <editeng/shaditem.hxx>
+#include <editeng/shdditem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <editeng/spltitem.hxx>
 #include <editeng/svxacorr.hxx>
 #include <editeng/tstpitem.hxx>
+#include <editeng/twolinesitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/unolingu.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/widwitem.hxx>
 #include <editeng/xmlcnitm.hxx>
-#include <editsh.hxx>
-#include <expfld.hxx>
-#include <fchrfmt.hxx>
-#include <fesh.hxx>
-#include <fldbas.hxx>
-#include <flddat.hxx>
-#include <fldupde.hxx>
-#include <flypos.hxx>
-#include <fmtanchr.hxx>
-#include <fmtautofmt.hxx>
-#include <fmtclbl.hxx>
-#include <fmtclds.hxx>
-#include <fmtcnct.hxx>
-#include <fmtcntnt.hxx>
-#include <fmtcol.hxx>
-#include <fmteiro.hxx>
-#include <fmtflcnt.hxx>
-#include <fmtfld.hxx>
-#include <fmtfollowtextflow.hxx>
-#include <fmtfsize.hxx>
-#include <fmtftn.hxx>
-#include <fmtftntx.hxx>
-#include <fmthdft.hxx>
-#include <fmtinfmt.hxx>
-#include <fmtline.hxx>
-#include <fmtlsplt.hxx>
-#include <fmtmeta.hxx>
-#include <fmtornt.hxx>
-#include <fmtpdsc.hxx>
-#include <fmtrfmrk.hxx>
-#include <fmtrowsplt.hxx>
-#include <fmtruby.hxx>
-#include <fmtsrnd.hxx>
-#include <fmturl.hxx>
-#include <frmatr.hxx>
-#include <frmfmt.hxx>
-#include <ftnidx.hxx>
-#include <ftninfo.hxx>
-#include <globdoc.hxx>
-#include <grfatr.hxx>
-#include <hintids.hxx>
-#include <hints.hxx>
-#include <htmltbl.hxx>
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
-#include <init.hxx>
-#include <istyleaccess.hxx>
 #include <libxml/xmlwriter.h>
-#include <lineinfo.hxx>
 #include <linguistic/lngprops.hxx>
-#include <mdiexp.hxx>
-#include <modcfg.hxx>
-#include <ndgrf.hxx>
-#include <ndindex.hxx>
-#include <ndnotxt.hxx>
-#include <ndole.hxx>
-#include <ndtxt.hxx>
-#include <node.hxx>
-#include <numrule.hxx>
 #include <o3tl/any.hxx>
 #include <o3tl/cow_wrapper.hxx>
+#include <o3tl/safeint.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <pagedesc.hxx>
-#include <pam.hxx>
-#include <paratr.hxx>
-#include <poolfmt.hxx>
-#include <printdata.hxx>
-#include <prtopt.hxx>
-#include <redline.hxx>
-#include <reffld.hxx>
+#include <o3tl/underlyingenumvalue.hxx>
+#include <officecfg/Office/Common.hxx>
 #include <sax/fastattribs.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
@@ -423,17 +305,12 @@
 #include <sfx2/printer.hxx>
 #include <sfx2/progress.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/shell.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
-#include <shellio.hxx>
-#include <shellres.hxx>
-#include <sortopt.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <sot/sotdllapi.h>
 #include <sot/storage.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/cjkoptions.hxx>
@@ -443,8 +320,10 @@
 #include <svl/intitem.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/itempool.hxx>
+#include <svl/itemprop.hxx>
 #include <svl/itemset.hxx>
 #include <svl/languageoptions.hxx>
+#include <svl/listener.hxx>
 #include <svl/lstner.hxx>
 #include <svl/macitem.hxx>
 #include <svl/metitem.hxx>
@@ -456,20 +335,20 @@
 #include <svl/style.hxx>
 #include <svl/stylesheetuser.hxx>
 #include <svl/svldllapi.h>
+#include <svl/typedwhich.hxx>
 #include <svl/urihelper.hxx>
 #include <svl/whiter.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <svtools/ctrltool.hxx>
+#include <svtools/embedhlp.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmlout.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/langtab.hxx>
 #include <svtools/svtdllapi.h>
-#include <svtools/valueset.hxx>
 #include <svx/dataaccessdescriptor.hxx>
-#include <svx/dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/fmglob.hxx>
@@ -478,6 +357,7 @@
 #include <svx/pageitem.hxx>
 #include <svx/ruler.hxx>
 #include <svx/rulritem.hxx>
+#include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <svx/srchdlg.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svditer.hxx>
@@ -501,6 +381,168 @@
 #include <svx/xit.hxx>
 #include <svx/xoutbmp.hxx>
 #include <svx/xtable.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/color.hxx>
+#include <tools/date.hxx>
+#include <tools/datetime.hxx>
+#include <tools/datetimeutils.hxx>
+#include <tools/diagnose_ex.h>
+#include <tools/fldunit.hxx>
+#include <tools/fontenum.hxx>
+#include <tools/fract.hxx>
+#include <tools/gen.hxx>
+#include <tools/globname.hxx>
+#include <tools/link.hxx>
+#include <tools/mapunit.hxx>
+#include <tools/ref.hxx>
+#include <tools/solar.h>
+#include <tools/stream.hxx>
+#include <tools/time.hxx>
+#include <tools/toolsdllapi.h>
+#include <tools/urlobj.hxx>
+#include <typelib/typedescription.h>
+#include <uno/any2.h>
+#include <uno/sequence2.h>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/charclass.hxx>
+#include <unotools/configmgr.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/localedatawrapper.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/options.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/streamwrap.hxx>
+#include <unotools/syslocale.hxx>
+#include <unotools/tempfile.hxx>
+#include <unotools/transliterationwrapper.hxx>
+#include <unotools/ucbstreamhelper.hxx>
+#include <unotools/unotoolsdllapi.h>
+#include <unotools/useroptions.hxx>
+#include <xmloff/dllapi.h>
+#include <xmloff/nmspmap.hxx>
+#include <xmloff/odffields.hxx>
+#include <xmloff/xmlictxt.hxx>
+#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/xmlstyle.hxx>
+#include <xmloff/xmluconv.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <AnnotationWin.hxx>
+#include <EnhancedPDFExportHelper.hxx>
+#include <IDocumentChartDataProviderAccess.hxx>
+#include <IDocumentContentOperations.hxx>
+#include <IDocumentDeviceAccess.hxx>
+#include <IDocumentDrawModelAccess.hxx>
+#include <IDocumentFieldsAccess.hxx>
+#include <IDocumentLayoutAccess.hxx>
+#include <IDocumentLinksAdministration.hxx>
+#include <IDocumentMarkAccess.hxx>
+#include <IDocumentRedlineAccess.hxx>
+#include <IDocumentSettingAccess.hxx>
+#include <IDocumentState.hxx>
+#include <IDocumentStatistics.hxx>
+#include <IDocumentStylePoolAccess.hxx>
+#include <IDocumentUndoRedo.hxx>
+#include <IMark.hxx>
+#include <PostItMgr.hxx>
+#include <SwNodeNum.hxx>
+#include <SwRewriter.hxx>
+#include <SwSmartTagMgr.hxx>
+#include <SwStyleNameMapper.hxx>
+#include <TextCursorHelper.hxx>
+#include <accmap.hxx>
+#include <authfld.hxx>
+#include <breakit.hxx>
+#include <calbck.hxx>
+#include <calc.hxx>
+#include <cellatr.hxx>
+#include <charatr.hxx>
+#include <charfmt.hxx>
+#include <chpfld.hxx>
+#include <cmdid.h>
+#include <crsrsh.hxx>
+#include <crstate.hxx>
+#include <dbfld.hxx>
+#include <dbmgr.hxx>
+#include <dcontact.hxx>
+#include <ddefld.hxx>
+#include <docary.hxx>
+#include <docsh.hxx>
+#include <docstat.hxx>
+#include <docstyle.hxx>
+#include <docufld.hxx>
+#include <drawdoc.hxx>
+#include <edimp.hxx>
+#include <editsh.hxx>
+#include <expfld.hxx>
+#include <fchrfmt.hxx>
+#include <fesh.hxx>
+#include <fldbas.hxx>
+#include <flddat.hxx>
+#include <fldupde.hxx>
+#include <flypos.hxx>
+#include <fmtanchr.hxx>
+#include <fmtautofmt.hxx>
+#include <fmtclbl.hxx>
+#include <fmtclds.hxx>
+#include <fmtcnct.hxx>
+#include <fmtcntnt.hxx>
+#include <fmtcol.hxx>
+#include <fmteiro.hxx>
+#include <fmtflcnt.hxx>
+#include <fmtfld.hxx>
+#include <fmtfollowtextflow.hxx>
+#include <fmtfsize.hxx>
+#include <fmtftn.hxx>
+#include <fmtftntx.hxx>
+#include <fmthdft.hxx>
+#include <fmtinfmt.hxx>
+#include <fmtline.hxx>
+#include <fmtlsplt.hxx>
+#include <fmtmeta.hxx>
+#include <fmtornt.hxx>
+#include <fmtpdsc.hxx>
+#include <fmtrfmrk.hxx>
+#include <fmtrowsplt.hxx>
+#include <fmtruby.hxx>
+#include <fmtsrnd.hxx>
+#include <fmturl.hxx>
+#include <frmatr.hxx>
+#include <frmfmt.hxx>
+#include <ftnidx.hxx>
+#include <ftninfo.hxx>
+#include <globdoc.hxx>
+#include <grfatr.hxx>
+#include <helpids.h>
+#include <hintids.hxx>
+#include <hints.hxx>
+#include <htmltbl.hxx>
+#include <init.hxx>
+#include <iodetect.hxx>
+#include <istyleaccess.hxx>
+#include <lineinfo.hxx>
+#include <mdiexp.hxx>
+#include <modcfg.hxx>
+#include <modeltoviewhelper.hxx>
+#include <ndgrf.hxx>
+#include <ndindex.hxx>
+#include <ndnotxt.hxx>
+#include <ndole.hxx>
+#include <ndtxt.hxx>
+#include <node.hxx>
+#include <numrule.hxx>
+#include <pagedesc.hxx>
+#include <pam.hxx>
+#include <paratr.hxx>
+#include <poolfmt.hxx>
+#include <printdata.hxx>
+#include <prtopt.hxx>
+#include <redline.hxx>
+#include <reffld.hxx>
+#include <shellio.hxx>
+#include <shellres.hxx>
+#include <sortopt.hxx>
 #include <swabstdlg.hxx>
 #include <swatrset.hxx>
 #include <swbaslnk.hxx>
@@ -508,6 +550,8 @@
 #include <swcrsr.hxx>
 #include <swddetbl.hxx>
 #include <swdll.hxx>
+#include <swdllapi.h>
+#include <swerror.h>
 #include <swevent.hxx>
 #include <swmodule.hxx>
 #include <swrect.hxx>
@@ -524,26 +568,6 @@
 #include <tblsel.hxx>
 #include <textboxhelper.hxx>
 #include <tgrditem.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <tools/color.hxx>
-#include <tools/date.hxx>
-#include <tools/datetime.hxx>
-#include <tools/datetimeutils.hxx>
-#include <tools/debug.hxx>
-#include <tools/fldunit.hxx>
-#include <tools/fontenum.hxx>
-#include <tools/fract.hxx>
-#include <tools/gen.hxx>
-#include <tools/globname.hxx>
-#include <tools/link.hxx>
-#include <tools/mapunit.hxx>
-#include <tools/ref.hxx>
-#include <tools/solar.h>
-#include <tools/stream.hxx>
-#include <tools/time.hxx>
-#include <tools/toolsdllapi.h>
-#include <tools/urlobj.hxx>
-#include <tools/wintypes.hxx>
 #include <txatbase.hxx>
 #include <txtatr.hxx>
 #include <txtflcnt.hxx>
@@ -552,9 +576,7 @@
 #include <txtinet.hxx>
 #include <txtrfmrk.hxx>
 #include <txttxmrk.hxx>
-#include <typelib/typedescription.h>
 #include <undobj.hxx>
-#include <uno/sequence2.h>
 #include <unobaseclass.hxx>
 #include <unochart.hxx>
 #include <unocoll.hxx>
@@ -563,6 +585,7 @@
 #include <unodraw.hxx>
 #include <unoframe.hxx>
 #include <unomap.hxx>
+#include <unomid.h>
 #include <unoparagraph.hxx>
 #include <unoprnms.hxx>
 #include <unosett.hxx>
@@ -570,38 +593,12 @@
 #include <unotbl.hxx>
 #include <unotextcursor.hxx>
 #include <unotextrange.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
-#include <unotools/charclass.hxx>
-#include <unotools/configmgr.hxx>
-#include <unotools/lingucfg.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <unotools/moduleoptions.hxx>
-#include <unotools/options.hxx>
-#include <unotools/pathoptions.hxx>
-#include <unotools/resmgr.hxx>
-#include <unotools/streamwrap.hxx>
-#include <unotools/syslocale.hxx>
-#include <unotools/tempfile.hxx>
-#include <unotools/transliterationwrapper.hxx>
-#include <unotools/ucbstreamhelper.hxx>
-#include <unotools/unotoolsdllapi.h>
-#include <unotools/useroptions.hxx>
 #include <unotxdoc.hxx>
 #include <usrfld.hxx>
-#include <vcl/imap.hxx>
-#include <vcl/imapobj.hxx>
 #include <viewopt.hxx>
 #include <viewsh.hxx>
 #include <viscrs.hxx>
 #include <wdocsh.hxx>
-#include <xmloff/dllapi.h>
-#include <xmloff/nmspmap.hxx>
-#include <xmloff/odffields.hxx>
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlnmspe.hxx>
-#include <xmloff/xmlstyle.hxx>
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/xmltoken.hxx>
-#include <xmloff/xmluconv.hxx>
+#endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index cf3f92c8050b..159d17c5a53b 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -13,79 +13,54 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2017-09-20 22:55:19 using:
+ Generated on 2019-04-29 21:20:55 using:
  ./bin/update_pch sw swui --cutoff=3 --exclude:system --include:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
  ./bin/update_pch_bisect ./sw/inc/pch/precompiled_swui.hxx "make sw.build" --find-conflicts
 */
 
+#if PCH_LEVEL >= 1
 #include <algorithm>
 #include <array>
 #include <assert.h>
 #include <cassert>
-#include <climits>
-#include <cmdid.h>
-#include <config_global.h>
-#include <config_typesizes.h>
-#include <config_vcl.h>
 #include <cstddef>
-#include <cstdlib>
 #include <cstring>
 #include <deque>
-#include <exception>
 #include <float.h>
 #include <functional>
-#include <helpids.h>
 #include <iomanip>
 #include <iostream>
 #include <iterator>
 #include <limits.h>
 #include <limits>
 #include <list>
-#include <locale>
 #include <map>
 #include <math.h>
 #include <memory>
 #include <new>
 #include <ostream>
 #include <set>
-#include <sstream>
 #include <stack>
 #include <stddef.h>
-#include <stdlib.h>
 #include <string.h>
-#include <string>
-#include <swdllapi.h>
+#include <string_view>
 #include <type_traits>
 #include <typeinfo>
-#include <unomid.h>
-#include <unordered_map>
-#include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/operators.hpp>
 #include <boost/optional.hpp>
-#include <osl/conditn.h>
-#include <osl/conditn.hxx>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
 #include <osl/diagnose.h>
 #include <osl/doublecheckedlocking.h>
 #include <osl/endian.h>
-#include <osl/file.h>
 #include <osl/getglobalmutex.hxx>
 #include <osl/interlck.h>
-#include <osl/module.h>
-#include <osl/module.hxx>
 #include <osl/mutex.h>
 #include <osl/mutex.hxx>
-#include <osl/pipe.h>
-#include <osl/process.h>
-#include <osl/security.h>
-#include <osl/socket.h>
-#include <osl/time.h>
 #include <rtl/alloc.h>
-#include <rtl/byteseq.h>
-#include <rtl/character.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/locale.h>
 #include <rtl/math.h>
@@ -96,15 +71,12 @@
 #include <rtl/string.h>
 #include <rtl/string.hxx>
 #include <rtl/stringutils.hxx>
-#include <rtl/tencinfo.h>
 #include <rtl/textcvt.h>
 #include <rtl/textenc.h>
-#include <rtl/unload.h>
 #include <rtl/ustrbuf.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
-#include <rtl/uuid.h>
 #include <sal/config.h>
 #include <sal/detail/log.h>
 #include <sal/log.hxx>
@@ -115,12 +87,20 @@
 #include <sal/typesizes.h>
 #include <salhelper/salhelperdllapi.h>
 #include <salhelper/simplereferenceobject.hxx>
+#include <vcl/AccessibleBrowseBoxObjType.hxx>
 #include <vcl/EnumContext.hxx>
+#include <vcl/GestureEvent.hxx>
+#include <vcl/GraphicExternalLink.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vcl/IContext.hxx>
+#include <vcl/IDialogRenderable.hxx>
 #include <vcl/NotebookbarContextControl.hxx>
+#include <vcl/abstdlg.hxx>
 #include <vcl/accel.hxx>
+#include <vcl/accessibletableprovider.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/animate/Animation.hxx>
+#include <vcl/animate/AnimationBitmap.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/builder.hxx>
@@ -131,81 +111,73 @@
 #include <vcl/combobox.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/ctrl.hxx>
-#include <vcl/cursor.hxx>
+#include <vcl/customweld.hxx>
 #include <vcl/devicecoordinate.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/dndhelp.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/errcode.hxx>
-#include <vcl/errinf.hxx>
 #include <vcl/event.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/fntstyle.hxx>
 #include <vcl/font.hxx>
-#include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
-#include <vcl/gradient.hxx>
+#include <vcl/glyphitem.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/GraphicObject.hxx>
-#include <vcl/hatch.hxx>
+#include <vcl/headbar.hxx>
 #include <vcl/help.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/image.hxx>
-#include <vcl/inputctx.hxx>
-#include <vcl/inputtypes.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/lineinfo.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/metaact.hxx>
 #include <vcl/metaactiontypes.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/mnemonicengine.hxx>
-#include <vcl/notebookbar.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/outdevmap.hxx>
 #include <vcl/outdevstate.hxx>
 #include <vcl/print.hxx>
-#include <vcl/prntypes.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <vcl/quickselectionengine.hxx>
 #include <vcl/region.hxx>
-#include <vcl/salgtype.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
 #include <vcl/scrbar.hxx>
-#include <vcl/seleng.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/spinfld.hxx>
+#include <vcl/status.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/svtabbx.hxx>
 #include <vcl/syswin.hxx>
+#include <vcl/tabpage.hxx>
 #include <vcl/task.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/toolbox.hxx>
+#include <vcl/transfer.hxx>
+#include <vcl/treelist.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentries.hxx>
+#include <vcl/treelistentry.hxx>
 #include <vcl/uitest/factory.hxx>
 #include <vcl/vclenum.hxx>
-#include <vcl/vclevent.hxx>
 #include <vcl/vclmedit.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
-#include <vcl/vclstatuslistener.hxx>
 #include <vcl/vectorgraphicdata.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/wall.hxx>
+#include <vcl/weld.hxx>
 #include <vcl/window.hxx>
-#include <vcl/wmfexternal.hxx>
-#include <IDocumentDeviceAccess.hxx>
-#include <SwNumberTreeTypes.hxx>
-#include <SwStyleNameMapper.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
-#include <basegfx/color/bcolormodifier.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/point/b2ipoint.hxx>
@@ -221,65 +193,31 @@
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/vector/b2ivector.hxx>
 #include <basic/basicdllapi.h>
-#include <basic/codecompletecache.hxx>
 #include <basic/sbdef.hxx>
-#include <basic/sberrors.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbxcore.hxx>
 #include <basic/sbxdef.hxx>
-#include <basic/sbxform.hxx>
-#include <basic/sbxmeth.hxx>
 #include <basic/sbxobj.hxx>
-#include <basic/sbxprop.hxx>
 #include <basic/sbxvar.hxx>
-#include <bparr.hxx>
-#include <calbck.hxx>
-#include <charfmt.hxx>
-#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
 #include <com/sun/star/awt/GradientStyle.hpp>
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/KeyGroup.hpp>
 #include <com/sun/star/awt/SystemPointer.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/beans/Property.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/beans/XFastPropertySet.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/beans/XPropertySetOption.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/bridge/oleautomation/Decimal.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/XTransferable2.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 #include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
 #include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
-#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#include <com/sun/star/document/CmisProperty.hpp>
-#include <com/sun/star/document/CmisVersion.hpp>
 #include <com/sun/star/document/EventObject.hpp>
 #include <com/sun/star/document/XCmisDocument.hpp>
 #include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
@@ -288,96 +226,51 @@
 #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
-#include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/drawing/LineCap.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
-#include <com/sun/star/embed/VerbDescriptor.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/DoubleInitializationException.hpp>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/XController2.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XModel2.hpp>
 #include <com/sun/star/frame/XModule.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XStorable2.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
-#include <com/sun/star/frame/XToolbarController.hpp>
 #include <com/sun/star/frame/XUntitledNumbers.hpp>
 #include <com/sun/star/graphic/XPrimitive2D.hpp>
 #include <com/sun/star/i18n/Calendar2.hpp>
-#include <com/sun/star/i18n/CollatorOptions.hpp>
-#include <com/sun/star/i18n/DirectionProperty.hpp>
 #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
-#include <com/sun/star/i18n/KCharacterType.hpp>
-#include <com/sun/star/i18n/KParseTokens.hpp>
-#include <com/sun/star/i18n/KParseType.hpp>
-#include <com/sun/star/i18n/NumberFormatCode.hpp>
-#include <com/sun/star/i18n/NumberFormatMapper.hpp>
-#include <com/sun/star/i18n/ParseResult.hpp>
+#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
-#include <com/sun/star/i18n/UnicodeScript.hpp>
-#include <com/sun/star/i18n/WordType.hpp>
-#include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <com/sun/star/i18n/XCharacterClassification.hpp>
-#include <com/sun/star/i18n/XCollator.hpp>
-#include <com/sun/star/i18n/XExtendedTransliteration.hpp>
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
-#include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/NotInitializedException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/linguistic2/XSupportedLocales.hpp>
 #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
-#include <com/sun/star/rdf/XMetadatable.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/script/ModuleInfo.hpp>
-#include <com/sun/star/script/XInvocation.hpp>
 #include <com/sun/star/script/XStarBasicAccess.hpp>
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/table/BorderLineStyle.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/PositionLayoutDir.hpp>
+#include <com/sun/star/text/RelOrientation.hpp>
 #include <com/sun/star/text/RubyAdjust.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-#include <com/sun/star/text/XTextField.hpp>
-#include <com/sun/star/ui/XContextChangeEventListener.hpp>
-#include <com/sun/star/ui/XUIConfigurationManager2.hpp>
+#include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
@@ -393,93 +286,51 @@
 #include <com/sun/star/uno/Type.h>
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/TypeClass.hdl>
-#include <com/sun/star/uno/TypeClass.hpp>
 #include <com/sun/star/uno/XAggregation.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/XWeak.hpp>
 #include <com/sun/star/uno/genfunc.h>
 #include <com/sun/star/uno/genfunc.hxx>
-#include <com/sun/star/util/CloseVetoException.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/Time.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XAccounting.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-#include <com/sun/star/util/XCloseBroadcaster.hpp>
-#include <com/sun/star/util/XCloseListener.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/XModifiable2.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/util/XUpdatable.hpp>
-#include <com/sun/star/view/PrintableState.hpp>
 #include <com/sun/star/view/XPrintJobBroadcaster.hpp>
 #include <com/sun/star/view/XPrintable.hpp>
-#include <com/sun/star/view/XRenderable.hpp>
-#include <comphelper/broadcasthelper.hxx>
 #include <comphelper/comphelperdllapi.h>
-#include <comphelper/extract.hxx>
-#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/propagg.hxx>
-#include <comphelper/proparrhlp.hxx>
-#include <comphelper/property.hxx>
-#include <comphelper/propertycontainer.hxx>
-#include <comphelper/propertycontainerhelper.hxx>
-#include <comphelper/propstate.hxx>
-#include <comphelper/sequence.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <comphelper/string.hxx>
-#include <comphelper/types.hxx>
-#include <comphelper/uno3.hxx>
 #include <cppu/cppudllapi.h>
 #include <cppu/unotype.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <cppuhelper/compbase5.hxx>
 #include <cppuhelper/compbase_ex.hxx>
 #include <cppuhelper/cppuhelperdllapi.h>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/implbase_ex_post.hxx>
 #include <cppuhelper/implbase_ex_pre.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/interfacecontainer.hxx>
-#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/proptypehlp.h>
-#include <cppuhelper/proptypehlp.hxx>
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <cshtyp.hxx>
-#include <dbfld.hxx>
-#include <dbmgr.hxx>
-#include <docary.hxx>
-#include <docsh.hxx>
-#include <docstyle.hxx>
-#include <docufld.hxx>
 #include <drawinglayer/attribute/fillgradientattribute.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
 #include <drawinglayer/drawinglayerdllapi.h>
-#include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <editeng/borderline.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/colritem.hxx>
+#include <editeng/contouritem.hxx>
+#include <editeng/crossedoutitem.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/editengdllapi.h>
 #include <editeng/editstat.hxx>
 #include <editeng/eedata.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <editeng/flstitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/frmdiritem.hxx>
@@ -489,56 +340,30 @@
 #include <editeng/numitem.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/paragraphdata.hxx>
+#include <editeng/postitem.hxx>
 #include <editeng/scripttypeitem.hxx>
+#include <editeng/shdditem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <editeng/svxenum.hxx>
 #include <editeng/svxfont.hxx>
+#include <editeng/udlnitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/unolingu.hxx>
-#include <expfld.hxx>
-#include <fchrfmt.hxx>
-#include <fldbas.hxx>
-#include <fmtautofmt.hxx>
-#include <fmtcol.hxx>
-#include <fmtflcnt.hxx>
-#include <fmtfld.hxx>
-#include <fmtfsize.hxx>
-#include <fmtftn.hxx>
-#include <fmtinfmt.hxx>
-#include <fmtmeta.hxx>
-#include <fmtrfmrk.hxx>
-#include <fmtruby.hxx>
-#include <frmatr.hxx>
-#include <frmfmt.hxx>
-#include <hintids.hxx>
-#include <hints.hxx>
+#include <editeng/wghtitem.hxx>
 #include <i18nlangtag/i18nlangtagdllapi.h>
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nutil/i18nutildllapi.h>
-#include <i18nutil/paper.hxx>
 #include <i18nutil/transliteration.hxx>
-#include <index.hxx>
-#include <modcfg.hxx>
-#include <ndarr.hxx>
-#include <ndindex.hxx>
-#include <ndtxt.hxx>
-#include <ndtyp.hxx>
-#include <node.hxx>
-#include <numrule.hxx>
 #include <o3tl/cow_wrapper.hxx>
+#include <o3tl/deleter.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <pagedesc.hxx>
-#include <pam.hxx>
-#include <paratr.hxx>
-#include <poolfmt.hxx>
-#include <sfx2/Metadatable.hxx>
+#include <o3tl/underlyingenumvalue.hxx>
+#include <officecfg/Office/Writer.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/basedlgs.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/ctrlitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/docfile.hxx>
@@ -548,20 +373,16 @@
 #include <sfx2/linksrc.hxx>
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/sfxstatuslistener.hxx>
-#include <sfx2/sfxuno.hxx>
 #include <sfx2/shell.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <sfx2/tbxctrl.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <shellio.hxx>
-#include <shellres.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include <sot/sotdllapi.h>
 #include <svl/SfxBroadcaster.hxx>
+#include <svl/broadcast.hxx>
+#include <svl/cenumitm.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <svl/eitem.hxx>
@@ -571,6 +392,7 @@
 #include <svl/itemset.hxx>
 #include <svl/languageoptions.hxx>
 #include <svl/lstner.hxx>
+#include <svl/macitem.hxx>
 #include <svl/memberid.h>
 #include <svl/nfkeytab.hxx>
 #include <svl/ondemand.hxx>
@@ -579,50 +401,30 @@
 #include <svl/stritem.hxx>
 #include <svl/style.hxx>
 #include <svl/svldllapi.h>
+#include <svl/typedwhich.hxx>
 #include <svl/undo.hxx>
 #include <svl/urihelper.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
-#include <svtools/accessibleruler.hxx>
-#include <svtools/colorcfg.hxx>
-#include <svtools/ctrlbox.hxx>
-#include <svtools/ehdl.hxx>
-#include <svtools/embedhlp.hxx>
-#include <svtools/framestatuslistener.hxx>
+#include <svtools/borderline.hxx>
 #include <svtools/htmlcfg.hxx>
-#include <svtools/miscopt.hxx>
-#include <svtools/ruler.hxx>
 #include <svtools/svtdllapi.h>
-#include <svtools/svtresid.hxx>
-#include <svtools/toolboxcontroller.hxx>
+#include <svtools/toolbarmenu.hxx>
+#include <svtools/unitconv.hxx>
 #include <svtools/valueset.hxx>
 #include <svx/Palette.hxx>
-#include <svx/PaletteManager.hxx>
 #include <svx/SvxColorValueSet.hxx>
+#include <svx/dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/flagsdef.hxx>
-#include <svx/ruler.hxx>
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/svxdllapi.h>
-#include <svx/tbxcolorupdate.hxx>
 #include <svx/unomod.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xenum.hxx>
 #include <svx/xtable.hxx>
-#include <swabstdlg.hxx>
-#include <swatrset.hxx>
-#include <swmodule.hxx>
-#include <swrect.hxx>
-#include <swtable.hxx>
-#include <swtblfmt.hxx>
-#include <swtypes.hxx>
-#include <swundo.hxx>
-#include <swwait.hxx>
-#include <tblafmt.hxx>
-#include <tblenum.hxx>
-#include <tblsel.hxx>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
 #include <tools/date.hxx>
@@ -640,30 +442,23 @@
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
 #include <tools/solar.h>
-#include <tools/stream.hxx>
 #include <tools/time.hxx>
 #include <tools/toolsdllapi.h>
-#include <tools/urlobj.hxx>
 #include <tools/weakbase.h>
 #include <tools/wintypes.hxx>
-#include <txatbase.hxx>
 #include <typelib/typeclass.h>
 #include <typelib/typedescription.h>
 #include <typelib/uik.h>
 #include <uno/any2.h>
 #include <uno/data.h>
 #include <uno/sequence2.h>
-#include <unoprnms.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/calendarwrapper.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/configmgr.hxx>
-#include <unotools/eventcfg.hxx>
 #include <unotools/fontcvt.hxx>
 #include <unotools/fontdefs.hxx>
-#include <unotools/intlwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/nativenumberwrapper.hxx>
 #include <unotools/options.hxx>
@@ -672,17 +467,70 @@
 #include <unotools/syslocale.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/unotoolsdllapi.h>
-#include <vcl/AccessibleBrowseBoxObjType.hxx>
-#include <vcl/accessibletableprovider.hxx>
-#include <vcl/headbar.hxx>
-#include <vcl/svtabbx.hxx>
-#include <vcl/transfer.hxx>
-#include <vcl/treelist.hxx>
-#include <vcl/treelistbox.hxx>
-#include <vcl/treelistentries.hxx>
-#include <vcl/treelistentry.hxx>
-#include <vcl/viewdataentry.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <IDocumentDeviceAccess.hxx>
+#include <IMark.hxx>
+#include <SwNumberTreeTypes.hxx>
+#include <SwStyleNameMapper.hxx>
+#include <bparr.hxx>
+#include <calbck.hxx>
+#include <charfmt.hxx>
+#include <cmdid.h>
+#include <colwd.hxx>
+#include <cshtyp.hxx>
+#include <dbfld.hxx>
+#include <dbmgr.hxx>
+#include <docary.hxx>
+#include <docsh.hxx>
+#include <docstyle.hxx>
+#include <docufld.hxx>
+#include <expfld.hxx>
+#include <fchrfmt.hxx>
+#include <fldbas.hxx>
+#include <fmtautofmt.hxx>
+#include <fmtcol.hxx>
+#include <fmtflcnt.hxx>
+#include <fmtfld.hxx>
+#include <fmtfsize.hxx>
+#include <fmtftn.hxx>
+#include <fmtinfmt.hxx>
+#include <fmtrfmrk.hxx>
+#include <fmtruby.hxx>
+#include <frmatr.hxx>
+#include <frmfmt.hxx>
+#include <hintids.hxx>
+#include <index.hxx>
+#include <modcfg.hxx>
+#include <ndarr.hxx>
+#include <ndindex.hxx>
+#include <ndtxt.hxx>
+#include <ndtyp.hxx>
+#include <node.hxx>
+#include <numrule.hxx>
+#include <pagedesc.hxx>
+#include <pam.hxx>
+#include <paratr.hxx>
+#include <poolfmt.hxx>
+#include <shellio.hxx>
+#include <shellres.hxx>
+#include <swabstdlg.hxx>
+#include <swatrset.hxx>
+#include <swdllapi.h>
+#include <swmodule.hxx>
+#include <swrect.hxx>
+#include <swtable.hxx>
+#include <swtblfmt.hxx>
+#include <swtypes.hxx>
+#include <swundo.hxx>
+#include <swwait.hxx>
+#include <tblenum.hxx>
+#include <tblsel.hxx>
+#include <txatbase.hxx>
+#include <unomid.h>
+#include <unoprnms.hxx>
 #include <viewopt.hxx>
 #include <wdocsh.hxx>
+#endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index c7a23a64cc66..ae983c8ed302 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -13,30 +13,26 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2017-09-20 22:55:33 using:
+ Generated on 2019-04-29 21:16:21 using:
  ./bin/update_pch sw vbaswobj --cutoff=4 --exclude:system --include:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
  ./bin/update_pch_bisect ./sw/inc/pch/precompiled_vbaswobj.hxx "make sw.build" --find-conflicts
 */
 
+#if PCH_LEVEL >= 1
 #include <algorithm>
 #include <array>
 #include <assert.h>
+#include <atomic>
 #include <cassert>
 #include <climits>
-#include <config_features.h>
-#include <config_global.h>
-#include <config_typesizes.h>
-#include <config_vcl.h>
 #include <cstddef>
-#include <cstdlib>
 #include <cstring>
 #include <deque>
 #include <exception>
 #include <float.h>
 #include <functional>
-#include <initializer_list>
 #include <iomanip>
 #include <iostream>
 #include <limits.h>
@@ -48,14 +44,9 @@
 #include <new>
 #include <ostream>
 #include <set>
-#include <sstream>
 #include <stack>
 #include <stddef.h>
-#include <stdexcept>
-#include <stdlib.h>
 #include <string.h>
-#include <string>
-#include <swdllapi.h>
 #include <type_traits>
 #include <typeinfo>
 #include <unordered_map>
@@ -69,26 +60,19 @@
 #include <boost/multi_index_container.hpp>
 #include <boost/operators.hpp>
 #include <boost/optional.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
 #include <osl/diagnose.h>
 #include <osl/doublecheckedlocking.h>
 #include <osl/endian.h>
-#include <osl/file.h>
 #include <osl/file.hxx>
 #include <osl/getglobalmutex.hxx>
 #include <osl/interlck.h>
-#include <osl/module.h>
-#include <osl/module.hxx>
 #include <osl/mutex.h>
 #include <osl/mutex.hxx>
-#include <osl/pipe.h>
-#include <osl/process.h>
-#include <osl/security.h>
-#include <osl/socket.h>
 #include <osl/thread.h>
-#include <osl/thread.hxx>
 #include <osl/time.h>
 #include <rtl/alloc.h>
-#include <rtl/byteseq.h>
 #include <rtl/character.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/locale.h>
@@ -100,7 +84,6 @@
 #include <rtl/string.h>
 #include <rtl/string.hxx>
 #include <rtl/stringutils.hxx>
-#include <rtl/tencinfo.h>
 #include <rtl/textcvt.h>
 #include <rtl/textenc.h>
 #include <rtl/unload.h>
@@ -108,7 +91,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
-#include <rtl/uuid.h>
 #include <sal/config.h>
 #include <sal/detail/log.h>
 #include <sal/log.hxx>
@@ -118,60 +100,35 @@
 #include <sal/types.h>
 #include <sal/typesizes.h>
 #include <vcl/EnumContext.hxx>
-#include <vcl/NotebookbarContextControl.hxx>
-#include <vcl/accel.hxx>
+#include <vcl/IContext.hxx>
+#include <vcl/IDialogRenderable.hxx>
 #include <vcl/alpha.hxx>
-#include <vcl/animate/Animation.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/cairo.hxx>
 #include <vcl/checksum.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/commandevent.hxx>
-#include <vcl/ctrl.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/devicecoordinate.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/dndhelp.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/errcode.hxx>
-#include <vcl/event.hxx>
 #include <vcl/exceptiontypes.hxx>
-#include <vcl/field.hxx>
 #include <vcl/fntstyle.hxx>
 #include <vcl/font.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/gfxlink.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/hatch.hxx>
 #include <vcl/image.hxx>
-#include <vcl/inputctx.hxx>
 #include <vcl/inputtypes.hxx>
-#include <vcl/jobset.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/lazydelete.hxx>
-#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/metaact.hxx>
 #include <vcl/metaactiontypes.hxx>
-#include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/outdevmap.hxx>
 #include <vcl/outdevstate.hxx>
-#include <vcl/print.hxx>
-#include <vcl/prntypes.hxx>
-#include <vcl/ptrstyle.hxx>
 #include <vcl/region.hxx>
-#include <vcl/salgtype.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/spinfld.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/task.hxx>
 #include <vcl/timer.hxx>
@@ -180,19 +137,13 @@
 #include <vcl/vclevent.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
-#include <vcl/vectorgraphicdata.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/wall.hxx>
+#include <vcl/weld.hxx>
 #include <vcl/window.hxx>
-#include <vcl/wmfexternal.hxx>
-#include <IDocumentMarkAccess.hxx>
-#include <IMark.hxx>
-#include <IShellCursorSupplier.hxx>
-#include <SwGetPoolIdFromName.hxx>
-#include <SwNumberTreeTypes.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
-#include <basegfx/color/bcolormodifier.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/point/b2ipoint.hxx>
@@ -203,32 +154,18 @@
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/tuple/b2ituple.hxx>
 #include <basegfx/tuple/b3dtuple.hxx>
-#include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/vector/b2ivector.hxx>
 #include <basic/basicdllapi.h>
 #include <basic/sberrors.hxx>
-#include <basic/sbxcore.hxx>
 #include <basic/sbxdef.hxx>
-#include <bparr.hxx>
-#include <calbck.hxx>
-#include <charfmt.hxx>
-#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/KeyGroup.hpp>
 #include <com/sun/star/awt/SystemPointer.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/StringPair.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/bridge/oleautomation/Decimal.hpp>
-#include <com/sun/star/connection/XConnection.hpp>
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -236,71 +173,33 @@
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
-#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#include <com/sun/star/document/CmisVersion.hpp>
 #include <com/sun/star/document/EventObject.hpp>
 #include <com/sun/star/drawing/LineCap.hpp>
-#include <com/sun/star/embed/VerbDescriptor.hpp>
-#include <com/sun/star/embed/XClassifiedObject.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/graphic/XPrimitive2D.hpp>
-#include <com/sun/star/i18n/DirectionProperty.hpp>
-#include <com/sun/star/i18n/ForbiddenCharacters.hpp>
-#include <com/sun/star/i18n/KCharacterType.hpp>
-#include <com/sun/star/i18n/KParseTokens.hpp>
-#include <com/sun/star/i18n/KParseType.hpp>
-#include <com/sun/star/i18n/LocaleItem.hpp>
-#include <com/sun/star/i18n/ParseResult.hpp>
-#include <com/sun/star/i18n/UnicodeScript.hpp>
+#include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
-#include <com/sun/star/i18n/XCharacterClassification.hpp>
-#include <com/sun/star/i18n/XLocaleData4.hpp>
-#include <com/sun/star/i18n/reservedWords.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/WrappedTargetException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/table/BorderLine2.hpp>
-#include <com/sun/star/table/BorderLineStyle.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/PositionLayoutDir.hpp>
-#include <com/sun/star/text/TextContentAnchorType.hpp>
-#include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextRangeCompare.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XTextViewCursor.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-#include <com/sun/star/ui/XContextChangeEventListener.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -311,170 +210,127 @@
 #include <com/sun/star/uno/TypeClass.hdl>
 #include <com/sun/star/uno/TypeClass.hpp>
 #include <com/sun/star/uno/XAggregation.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/XWeak.hpp>
 #include <com/sun/star/uno/genfunc.h>
 #include <com/sun/star/uno/genfunc.hxx>
 #include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Time.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/view/PrintableState.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <comphelper/comphelperdllapi.h>
-#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <comphelper/solarmutex.hxx>
 #include <comphelper/weak.hxx>
 #include <cppu/cppudllapi.h>
 #include <cppu/unotype.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase5.hxx>
-#include <cppuhelper/compbase_ex.hxx>
 #include <cppuhelper/cppuhelperdllapi.h>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/implbase_ex_post.hxx>
 #include <cppuhelper/implbase_ex_pre.hxx>
-#include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <crstate.hxx>
-#include <cshtyp.hxx>
-#include <docary.hxx>
-#include <docsh.hxx>
-#include <editeng/borderline.hxx>
-#include <editeng/boxitem.hxx>
-#include <editeng/brushitem.hxx>
 #include <editeng/editengdllapi.h>
-#include <editeng/formatbreakitem.hxx>
-#include <editeng/frmdir.hxx>
-#include <editeng/frmdiritem.hxx>
-#include <editeng/keepitem.hxx>
-#include <editeng/lrspitem.hxx>
 #include <editeng/numdef.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/opaqitem.hxx>
-#include <editeng/pbinitem.hxx>
-#include <editeng/prntitem.hxx>
-#include <editeng/protitem.hxx>
-#include <editeng/shaditem.hxx>
 #include <editeng/svxenum.hxx>
-#include <editeng/ulspitem.hxx>
-#include <fldbas.hxx>
-#include <fmtcol.hxx>
-#include <frmatr.hxx>
-#include <frmfmt.hxx>
-#include <hintids.hxx>
-#include <hints.hxx>
-#include <i18nlangtag/i18nlangtagdllapi.h>
 #include <i18nlangtag/lang.h>
-#include <i18nlangtag/languagetag.hxx>
-#include <i18nutil/i18nutildllapi.h>
-#include <i18nutil/paper.hxx>
-#include <index.hxx>
-#include <ndarr.hxx>
-#include <ndindex.hxx>
-#include <ndtyp.hxx>
-#include <node.hxx>
-#include <numrule.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
+#include <o3tl/underlyingenumvalue.hxx>
 #include <ooo/vba/XCollection.hpp>
 #include <ooo/vba/XHelperInterface.hpp>
-#include <pam.hxx>
 #include <sfx2/dllapi.h>
-#include <sfx2/sfxuno.hxx>
 #include <sfx2/shell.hxx>
 #include <sot/formats.hxx>
 #include <sot/sotdllapi.h>
 #include <svl/SfxBroadcaster.hxx>
-#include <svl/cenumitm.hxx>
+#include <svl/broadcast.hxx>
 #include <svl/cintitem.hxx>
-#include <svl/eitem.hxx>
 #include <svl/hint.hxx>
 #include <svl/intitem.hxx>
-#include <svl/itempool.hxx>
-#include <svl/itemset.hxx>
 #include <svl/lstner.hxx>
-#include <svl/macitem.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/style.hxx>
 #include <svl/stylesheetuser.hxx>
 #include <svl/svldllapi.h>
-#include <svtools/accessibleruler.hxx>
-#include <svtools/ctrlbox.hxx>
-#include <svtools/embedhlp.hxx>
-#include <svtools/ruler.hxx>
-#include <svtools/svtdllapi.h>
-#include <svx/sdtaitm.hxx>
-#include <svx/svddef.hxx>
+#include <svl/typedwhich.hxx>
 #include <svx/svxdllapi.h>
-#include <svx/swframetypes.hxx>
 #include <svx/xdef.hxx>
-#include <swatrset.hxx>
-#include <swcrsr.hxx>
-#include <swrect.hxx>
-#include <swregion.hxx>
-#include <swtable.hxx>
-#include <swtblfmt.hxx>
-#include <swtypes.hxx>
-#include <tblenum.hxx>
-#include <tblsel.hxx>
 #include <tools/color.hxx>
 #include <tools/date.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
-#include <tools/fract.hxx>
 #include <tools/gen.hxx>
-#include <tools/lineend.hxx>
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
-#include <tools/multisel.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
 #include <tools/solar.h>
-#include <tools/stream.hxx>
 #include <tools/time.hxx>
 #include <tools/toolsdllapi.h>
 #include <tools/urlobj.hxx>
 #include <tools/weakbase.h>
 #include <tools/wintypes.hxx>
-#include <toxe.hxx>
 #include <typelib/typeclass.h>
 #include <typelib/typedescription.h>
 #include <typelib/uik.h>
 #include <uno/any2.h>
 #include <uno/data.h>
 #include <uno/sequence2.h>
-#include <unobaseclass.hxx>
-#include <unotools/charclass.hxx>
 #include <unotools/fontcvt.hxx>
 #include <unotools/fontdefs.hxx>
-#include <unotools/localedatawrapper.hxx>
 #include <unotools/options.hxx>
-#include <unotools/readwritemutexguard.hxx>
 #include <unotools/resmgr.hxx>
-#include <unotools/securityoptions.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/unotoolsdllapi.h>
 #include <vbahelper/helperdecl.hxx>
 #include <vbahelper/vbadllapi.h>
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <IDocumentMarkAccess.hxx>
+#include <IMark.hxx>
+#include <IShellCursorSupplier.hxx>
+#include <SwNumberTreeTypes.hxx>
+#include <bparr.hxx>
+#include <calbck.hxx>
+#include <charfmt.hxx>
+#include <crstate.hxx>
+#include <cshtyp.hxx>
+#include <docary.hxx>
+#include <docsh.hxx>
+#include <fldbas.hxx>
+#include <fldupde.hxx>
+#include <fmtcol.hxx>
+#include <frmfmt.hxx>
+#include <hintids.hxx>
+#include <index.hxx>
+#include <ndarr.hxx>
+#include <ndindex.hxx>
+#include <ndtyp.hxx>
+#include <node.hxx>
+#include <numrule.hxx>
+#include <pam.hxx>
+#include <swcrsr.hxx>
+#include <swdllapi.h>
+#include <swrect.hxx>
+#include <swregion.hxx>
+#include <swtable.hxx>
+#include <swtblfmt.hxx>
+#include <swtypes.hxx>
+#include <tblenum.hxx>
+#include <tblsel.hxx>
+#include <toxe.hxx>
+#include <unobaseclass.hxx>
 #include <viewsh.hxx>
 #include <viscrs.hxx>
+#endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */