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, 315 insertions, 413 deletions

diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 383739b80643..3801ff99c443 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -13,24 +13,19 @@
  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:53:27 using:
+ Generated on 2019-04-29 21:16:52 using:
  ./bin/update_pch sc sc --cutoff=12 --exclude:system --include:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
  ./bin/update_pch_bisect ./sc/inc/pch/precompiled_sc.hxx "make sc.build" --find-conflicts
 */
 
+#if PCH_LEVEL >= 1
 #include <algorithm>
 #include <cassert>
-#include <climits>
-#include <config_features.h>
-#include <config_global.h>
-#include <config_typesizes.h>
 #include <cstddef>
-#include <cstdlib>
 #include <cstring>
 #include <deque>
-#include <exception>
 #include <float.h>
 #include <functional>
 #include <iomanip>
@@ -38,54 +33,44 @@
 #include <limits.h>
 #include <limits>
 #include <list>
-#include <locale>
 #include <map>
 #include <math.h>
 #include <memory>
 #include <new>
 #include <ostream>
-#include <scdllapi.h>
 #include <set>
-#include <sstream>
-#include <stack>
 #include <stddef.h>
-#include <stdlib.h>
 #include <string.h>
-#include <string>
 #include <type_traits>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
 #include <vector>
+#include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/optional.hpp>
 #include <boost/optional/optional.hpp>
 #include <boost/property_tree/json_parser.hpp>
-#include <osl/conditn.h>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
 #include <osl/conditn.hxx>
 #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/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/security.hxx>
-#include <osl/socket.h>
 #include <osl/thread.h>
 #include <osl/time.h>
 #include <rtl/alloc.h>
 #include <rtl/bootstrap.hxx>
-#include <rtl/byteseq.h>
+#include <rtl/character.hxx>
 #include <rtl/crc.h>
 #include <rtl/digest.h>
 #include <rtl/instance.hxx>
@@ -112,82 +97,66 @@
 #include <sal/typesizes.h>
 #include <salhelper/salhelperdllapi.h>
 #include <salhelper/simplereferenceobject.hxx>
-#include <salhelper/singletonref.hxx>
 #include <salhelper/thread.hxx>
 #include <vcl/EnumContext.hxx>
+#include <vcl/GraphicExternalLink.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vcl/IContext.hxx>
-#include <vcl/NotebookbarContextControl.hxx>
+#include <vcl/IDialogRenderable.hxx>
+#include <vcl/abstdlg.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>
 #include <vcl/button.hxx>
 #include <vcl/checksum.hxx>
 #include <vcl/combobox.hxx>
-#include <vcl/commandevent.hxx>
 #include <vcl/ctrl.hxx>
-#include <vcl/cursor.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/dndhelp.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/errcode.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/graph.hxx>
-#include <vcl/GraphicObject.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/lstbox.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/metric.hxx>
-#include <vcl/notebookbar.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/ptrstyle.hxx>
 #include <vcl/region.hxx>
-#include <vcl/salnativewidgets.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/spinfld.hxx>
-#include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
+#include <vcl/tabpage.hxx>
 #include <vcl/task.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/toolbox.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/waitobj.hxx>
+#include <vcl/weld.hxx>
 #include <vcl/window.hxx>
-#include <vcl/wmfexternal.hxx>
-#include <appoptio.hxx>
-#include <attrib.hxx>
-#include <autoform.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>
@@ -204,45 +173,33 @@
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/vector/b2ivector.hxx>
 #include <basic/basicdllapi.h>
-#include <basic/sbxcore.hxx>
 #include <basic/sbxdef.hxx>
-#include <basic/sbxvar.hxx>
-#include <brdcst.hxx>
-#include <calcmacros.hxx>
-#include <cellform.hxx>
-#include <cellsuno.hxx>
-#include <cellvalue.hxx>
-#include <chartarr.hxx>
-#include <chartlis.hxx>
-#include <chgtrack.hxx>
-#include <chgviset.hxx>
-#include <clipparam.hxx>
-#include <colorscale.hxx>
-#include <column.hxx>
-#include <columnspanset.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.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/awt/XControlContainer.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
+#include <com/sun/star/beans/XPropertiesChangeListener.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/beans/XVetoableChangeListener.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
+#include <com/sun/star/datatransfer/XTransferable2.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/XDragSourceListener.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
@@ -250,44 +207,26 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/HatchStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/embed/VerbDescriptor.hpp>
+#include <com/sun/star/drawing/TextFitToSizeType.hpp>
+#include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/FeatureStateEvent.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/XModel.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/frame/XToolbarController.hpp>
 #include <com/sun/star/graphic/XPrimitive2D.hpp>
 #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
-#include <com/sun/star/i18n/LocaleItem.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/XComponent.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/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/style/NumberingType.hpp>
 #include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/table/BorderLineStyle.hpp>
-#include <com/sun/star/table/CellAddress.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>
@@ -299,9 +238,7 @@
 #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>
@@ -309,42 +246,31 @@
 #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/URLTransformer.hpp>
 #include <com/sun/star/util/XAccounting.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/comphelperdllapi.h>
-#include <comphelper/extract.hxx>
-#include <comphelper/fileformat.h>
 #include <comphelper/lok.hxx>
 #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/propertysequence.hxx>
+#include <comphelper/propertysetinfo.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 <comphelper/weak.hxx>
-#include <compiler.hxx>
-#include <conditio.hxx>
-#include <convuno.hxx>
 #include <cppu/cppudllapi.h>
 #include <cppu/unotype.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/compbase_ex.hxx>
 #include <cppuhelper/cppuhelperdllapi.h>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/implbase_ex_post.hxx>
@@ -352,101 +278,51 @@
 #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 <detfunc.hxx>
-#include <dociter.hxx>
-#include <docoptio.hxx>
-#include <docpool.hxx>
-#include <document.hxx>
-#include <documentlinkmgr.hxx>
-#include <docuno.hxx>
-#include <dpobject.hxx>
-#include <dpshttab.hxx>
-#include <dputil.hxx>
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drwlayer.hxx>
 #include <editeng/adjustitem.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/colritem.hxx>
+#include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editengdllapi.h>
 #include <editeng/editobj.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/editview.hxx>
+#include <editeng/eedata.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/frmdiritem.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 #include <editeng/justifyitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/outliner.hxx>
-#include <editeng/outlobj.hxx>
-#include <editeng/scripttypeitem.hxx>
+#include <editeng/paragraphdata.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/sizeitem.hxx>
 #include <editeng/svxenum.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/unolingu.hxx>
+#include <editeng/svxfont.hxx>
 #include <editeng/wghtitem.hxx>
-#include <editsrc.hxx>
-#include <editutil.hxx>
-#include <externalrefmgr.hxx>
-#include <fillinfo.hxx>
-#include <formula/IFunctionDescription.hxx>
-#include <formula/compiler.hxx>
-#include <formula/errorcodes.hxx>
-#include <formula/formuladllapi.h>
-#include <formula/opcode.hxx>
-#include <formula/vectortoken.hxx>
-#include <formulacell.hxx>
-#include <formulagroup.hxx>
-#include <global.hxx>
-#include <globalnames.hxx>
-#include <hints.hxx>
-#include <i18nlangtag/i18nlangtagdllapi.h>
 #include <i18nlangtag/lang.h>
-#include <i18nlangtag/languagetag.hxx>
-#include <inputopt.hxx>
-#include <listenercontext.hxx>
-#include <markdata.hxx>
-#include <miscuno.hxx>
 #include <o3tl/cow_wrapper.hxx>
+#include <o3tl/deleter.hxx>
 #include <o3tl/enumarray.hxx>
+#include <o3tl/safeint.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <olinetab.hxx>
-#include <patattr.hxx>
-#include <postit.hxx>
-#include <queryentry.hxx>
-#include <queryparam.hxx>
-#include <rangelst.hxx>
-#include <rangenam.hxx>
-#include <rangeutl.hxx>
-#include <rechead.hxx>
-#include <refupdatecontext.hxx>
-#include <rowheightcontext.hxx>
+#include <o3tl/underlyingenumvalue.hxx>
 #include <sax/tools/converter.hxx>
-#include <scabstdlg.hxx>
-#include <scerrors.hxx>
-#include <scitems.hxx>
-#include <scmatrix.hxx>
-#include <scmod.hxx>
-#include <scresid.hxx>
-#include <segmenttree.hxx>
 #include <sfx2/app.hxx>
+#include <sfx2/basedlgs.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/chalign.hxx>
-#include <sfx2/childwin.hxx>
-#include <sfx2/ctrlitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/docfile.hxx>
@@ -456,49 +332,42 @@
 #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/tbxctrl.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sheetdata.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include <sot/sotdllapi.h>
-#include <stlpool.hxx>
-#include <stlsheet.hxx>
-#include <stringutil.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/cenumitm.hxx>
 #include <svl/eitem.hxx>
 #include <svl/hint.hxx>
 #include <svl/intitem.hxx>
-#include <svl/itempool.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/itemset.hxx>
+#include <svl/languageoptions.hxx>
 #include <svl/lstner.hxx>
 #include <svl/poolitem.hxx>
-#include <svl/sharedstring.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <svl/srchitem.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/whiter.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/framestatuslistener.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
 #include <svtools/svtdllapi.h>
 #include <svtools/toolboxcontroller.hxx>
-#include <svtools/valueset.hxx>
 #include <svx/XPropertyEntry.hxx>
 #include <svx/algitem.hxx>
 #include <svx/grfcrop.hxx>
+#include <svx/ipolypolygoneditorcontroller.hxx>
 #include <svx/itextprovider.hxx>
+#include <svx/pageitem.hxx>
 #include <svx/sdangitm.hxx>
 #include <svx/sdasitm.hxx>
 #include <svx/sderitm.hxx>
@@ -515,6 +384,7 @@
 #include <svx/sdr/animation/scheduler.hxx>
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <svx/sdr/overlay/overlayobjectlist.hxx>
+#include <svx/sdrobjectuser.hxx>
 #include <svx/sdshcitm.hxx>
 #include <svx/sdshitm.hxx>
 #include <svx/sdshtitm.hxx>
@@ -535,9 +405,15 @@
 #include <svx/svdattr.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svddrag.hxx>
+#include <svx/svdedtv.hxx>
 #include <svx/svdglue.hxx>
+#include <svx/svdhdl.hxx>
+#include <svx/svdhlpln.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdlayer.hxx>
+#include <svx/svdmark.hxx>
+#include <svx/svdmodel.hxx>
+#include <svx/svdmrkv.hxx>
 #include <svx/svdoattr.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdocapt.hxx>
@@ -548,12 +424,13 @@
 #include <svx/svdouno.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
+#include <svx/svdpntv.hxx>
+#include <svx/svdsnpv.hxx>
 #include <svx/svdsob.hxx>
 #include <svx/svdtext.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdtypes.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/svdview.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/xcolit.hxx>
@@ -570,12 +447,6 @@
 #include <svx/xpoly.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xtextit0.hxx>
-#include <tablink.hxx>
-#include <tabprotection.hxx>
-#include <textuno.hxx>
-#include <tokenarray.hxx>
-#include <tokenstringcontext.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
 #include <tools/date.hxx>
@@ -586,6 +457,7 @@
 #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>
@@ -605,25 +477,97 @@
 #include <uno/any2.h>
 #include <uno/data.h>
 #include <uno/sequence2.h>
-#include <unonames.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/configitem.hxx>
+#include <unotools/configmgr.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/options.hxx>
-#include <unotools/readwritemutexguard.hxx>
 #include <unotools/resmgr.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/unotoolsdllapi.h>
-#include <userdat.hxx>
-#include <userlist.hxx>
-#include <validat.hxx>
 #include <xmloff/dllapi.h>
 #include <xmloff/nmspmap.hxx>
+#include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmltoken.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <appoptio.hxx>
+#include <attrib.hxx>
+#include <brdcst.hxx>
+#include <calcmacros.hxx>
+#include <cellform.hxx>
+#include <cellsuno.hxx>
+#include <cellvalue.hxx>
+#include <chartlis.hxx>
+#include <chgtrack.hxx>
+#include <clipparam.hxx>
+#include <column.hxx>
+#include <columnspanset.hxx>
+#include <compiler.hxx>
+#include <conditio.hxx>
+#include <convuno.hxx>
+#include <datamapper.hxx>
+#include <dociter.hxx>
+#include <docoptio.hxx>
+#include <docpool.hxx>
+#include <document.hxx>
+#include <documentlinkmgr.hxx>
+#include <docuno.hxx>
+#include <dpobject.hxx>
+#include <dpsave.hxx>
+#include <dpshttab.hxx>
+#include <dputil.hxx>
+#include <drwlayer.hxx>
+#include <editsrc.hxx>
+#include <editutil.hxx>
+#include <externalrefmgr.hxx>
+#include <fillinfo.hxx>
+#include <formula/errorcodes.hxx>
+#include <formula/formuladllapi.h>
+#include <formula/token.hxx>
+#include <formula/vectortoken.hxx>
+#include <formulacell.hxx>
+#include <funcdesc.hxx>
+#include <global.hxx>
+#include <globalnames.hxx>
+#include <hints.hxx>
+#include <inputopt.hxx>
+#include <listenercontext.hxx>
+#include <markdata.hxx>
+#include <miscuno.hxx>
+#include <olinetab.hxx>
+#include <patattr.hxx>
+#include <postit.hxx>
+#include <queryentry.hxx>
+#include <queryparam.hxx>
+#include <rangelst.hxx>
+#include <rangenam.hxx>
+#include <rangeutl.hxx>
+#include <rechead.hxx>
+#include <refupdatecontext.hxx>
+#include <rowheightcontext.hxx>
+#include <scabstdlg.hxx>
+#include <scdllapi.h>
+#include <scitems.hxx>
+#include <scmatrix.hxx>
+#include <scmod.hxx>
+#include <scopetools.hxx>
+#include <scresid.hxx>
+#include <sheetdata.hxx>
+#include <sheetevents.hxx>
+#include <stlpool.hxx>
+#include <stlsheet.hxx>
+#include <stringutil.hxx>
+#include <tablink.hxx>
+#include <tabprotection.hxx>
+#include <tokenarray.hxx>
+#include <tokenstringcontext.hxx>
+#include <unonames.hxx>
+#include <userdat.hxx>
+#include <validat.hxx>
+#endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index 7bdab2f9da53..fadd02654a56 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -13,19 +13,17 @@
  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:53:35 using:
+ Generated on 2019-04-29 21:16:42 using:
  ./bin/update_pch sc scfilt --cutoff=4 --exclude:system --exclude:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
  ./bin/update_pch_bisect ./sc/inc/pch/precompiled_scfilt.hxx "make sc.build" --find-conflicts
 */
 
+#if PCH_LEVEL >= 1
 #include <algorithm>
 #include <cassert>
-#include <climits>
-#include <config_global.h>
 #include <cstddef>
-#include <cstdlib>
 #include <cstring>
 #include <deque>
 #include <exception>
@@ -33,40 +31,32 @@
 #include <iomanip>
 #include <limits.h>
 #include <limits>
-#include <list>
 #include <map>
 #include <math.h>
 #include <memory>
 #include <new>
 #include <ostream>
-#include <scdllapi.h>
 #include <set>
-#include <sstream>
-#include <stdarg.h>
+#include <stdexcept>
 #include <stdio.h>
 #include <string.h>
-#include <string>
 #include <type_traits>
-#include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/optional/optional.hpp>
-#include <osl/conditn.hxx>
+#include <boost/optional.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
 #include <osl/diagnose.h>
 #include <osl/endian.h>
 #include <osl/interlck.h>
-#include <osl/mutex.h>
 #include <osl/mutex.hxx>
-#include <osl/process.h>
 #include <osl/thread.h>
 #include <rtl/alloc.h>
-#include <rtl/bootstrap.hxx>
 #include <rtl/character.hxx>
-#include <rtl/cipher.h>
-#include <rtl/digest.h>
 #include <rtl/instance.hxx>
+#include <rtl/math.h>
 #include <rtl/math.hxx>
 #include <rtl/random.h>
 #include <rtl/ref.hxx>
@@ -76,151 +66,106 @@
 #include <rtl/stringutils.hxx>
 #include <rtl/tencinfo.h>
 #include <rtl/textenc.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>
 #include <sal/macros.h>
 #include <sal/mathconf.h>
-#include <sal/saldllapi.h>
 #include <sal/types.h>
-#include <salhelper/singletonref.hxx>
-#include <salhelper/thread.hxx>
+#include <vcl/GraphicExternalLink.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vcl/animate/Animation.hxx>
-#include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/checksum.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/errcode.hxx>
 #include <vcl/field.hxx>
 #include <vcl/font.hxx>
-#include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/GraphicObject.hxx>
-#include <vcl/image.hxx>
+#include <vcl/idle.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/task.hxx>
-#include <vcl/timer.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/vectorgraphicdata.hxx>
-#include <attrib.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
+#include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/vector/b2dsize.hxx>
-#include <cellvalue.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.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/XPropertySet.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/datatransfer/XTransferable2.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/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/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <com/sun/star/embed/Aspects.hpp>
-#include <com/sun/star/frame/XTerminateListener.hpp>
+#include <com/sun/star/drawing/Hatch.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
+#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
+#include <com/sun/star/sheet/DataPilotFieldReferenceItemType.hpp>
 #include <com/sun/star/sheet/FormulaLanguage.hpp>
-#include <com/sun/star/sheet/GeneralFunction.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
-#include <com/sun/star/style/XStyle.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>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/uno/Type.h>
+#include <com/sun/star/uno/genfunc.hxx>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
+#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <comphelper/comphelperdllapi.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
-#include <comphelper/weak.hxx>
-#include <compiler.hxx>
-#include <conditio.hxx>
-#include <convuno.hxx>
+#include <cppu/unotype.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakref.hxx>
-#include <docoptio.hxx>
-#include <docpool.hxx>
-#include <document.hxx>
-#include <documentimport.hxx>
-#include <docuno.hxx>
-#include <dpobject.hxx>
-#include <dpsave.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drwlayer.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/crossedoutitem.hxx>
-#include <editeng/editdata.hxx>
-#include <editeng/editeng.hxx>
 #include <editeng/editengdllapi.h>
 #include <editeng/editobj.hxx>
-#include <editeng/editstat.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/frmdiritem.hxx>
 #include <editeng/justifyitem.hxx>
 #include <editeng/lineitem.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/outlobj.hxx>
 #include <editeng/postitem.hxx>
-#include <editeng/sizeitem.hxx>
 #include <editeng/svxenum.hxx>
 #include <editeng/udlnitem.hxx>
-#include <editeng/ulspitem.hxx>
 #include <editeng/wghtitem.hxx>
-#include <editutil.hxx>
-#include <externalrefmgr.hxx>
 #include <filter/msfilter/msfilterdllapi.h>
-#include <formula/errorcodes.hxx>
-#include <formula/formuladllapi.h>
-#include <formulacell.hxx>
-#include <global.hxx>
-#include <globalnames.hxx>
 #include <i18nlangtag/lang.h>
-#include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
+#include <o3tl/underlyingenumvalue.hxx>
 #include <oox/core/contexthandler.hxx>
 #include <oox/core/filterbase.hxx>
-#include <oox/core/xmlfilterbase.hxx>
+#include <oox/core/relations.hxx>
 #include <oox/dllapi.h>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/export/utils.hxx>
@@ -228,59 +173,38 @@
 #include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/containerhelper.hxx>
 #include <oox/helper/helper.hxx>
-#include <oox/helper/propertymap.hxx>
 #include <oox/helper/propertyset.hxx>
+#include <oox/helper/storagebase.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/relationship.hxx>
 #include <oox/token/tokens.hxx>
-#include <patattr.hxx>
-#include <postit.hxx>
-#include <rangelst.hxx>
-#include <rangenam.hxx>
-#include <sax/fastattribs.hxx>
 #include <sax/fshelper.hxx>
-#include <scerrors.hxx>
-#include <scextopt.hxx>
-#include <scitems.hxx>
-#include <scmatrix.hxx>
-#include <sfx2/app.hxx>
+#include <sax/saxdllapi.h>
+#include <sax/tools/converter.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/docfile.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/printer.hxx>
-#include <sfx2/request.hxx>
-#include <sot/exchange.hxx>
-#include <sot/formats.hxx>
 #include <sot/storage.hxx>
-#include <stlpool.hxx>
-#include <stlsheet.hxx>
-#include <stringutil.hxx>
-#include <svl/SfxBroadcaster.hxx>
+#include <svl/cenumitm.hxx>
 #include <svl/eitem.hxx>
 #include <svl/hint.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itemset.hxx>
-#include <svl/languageoptions.hxx>
+#include <svl/listener.hxx>
 #include <svl/lstner.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <svl/stritem.hxx>
 #include <svl/style.hxx>
-#include <svl/stylesheetuser.hxx>
 #include <svl/svldllapi.h>
+#include <svl/typedwhich.hxx>
 #include <svl/zforlist.hxx>
-#include <svl/zformat.hxx>
 #include <svtools/svtdllapi.h>
-#include <svx/algitem.hxx>
 #include <svx/itextprovider.hxx>
 #include <svx/msdffdef.hxx>
-#include <svx/pageitem.hxx>
-#include <svx/shapeproperty.hxx>
-#include <svx/svddef.hxx>
 #include <svx/svdoattr.hxx>
-#include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdotext.hxx>
@@ -292,37 +216,70 @@
 #include <svx/svxdllapi.h>
 #include <svx/unoapi.hxx>
 #include <svx/xenum.hxx>
-#include <svx/xflclit.hxx>
 #include <svx/xit.hxx>
 #include <svx/xtextit0.hxx>
-#include <tabprotection.hxx>
-#include <token.hxx>
-#include <tokenarray.hxx>
-#include <tokenuno.hxx>
 #include <tools/color.hxx>
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
-#include <tools/debug.hxx>
 #include <tools/gen.hxx>
-#include <tools/globname.hxx>
-#include <tools/lineend.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/weakbase.hxx>
-#include <unonames.hxx>
+#include <typelib/typedescription.h>
+#include <uno/data.h>
+#include <unotools/charclass.hxx>
 #include <unotools/configitem.hxx>
+#include <unotools/configmgr.hxx>
 #include <unotools/fltrcfg.hxx>
 #include <unotools/options.hxx>
 #include <unotools/textsearch.hxx>
 #include <unotools/unotoolsdllapi.h>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <attrib.hxx>
+#include <calcmacros.hxx>
+#include <cellvalue.hxx>
+#include <compiler.hxx>
+#include <convuno.hxx>
+#include <docoptio.hxx>
+#include <docpool.hxx>
+#include <document.hxx>
+#include <documentimport.hxx>
+#include <docuno.hxx>
+#include <dpdimsave.hxx>
+#include <dpglobal.hxx>
+#include <dpobject.hxx>
+#include <dpsave.hxx>
+#include <drwlayer.hxx>
+#include <editutil.hxx>
+#include <externalrefmgr.hxx>
+#include <formula/errorcodes.hxx>
+#include <formula/formuladllapi.h>
+#include <formula/grammar.hxx>
+#include <formulacell.hxx>
+#include <global.hxx>
+#include <patattr.hxx>
+#include <postit.hxx>
+#include <rangelst.hxx>
+#include <rangenam.hxx>
+#include <scdllapi.h>
+#include <scerrors.hxx>
+#include <scextopt.hxx>
+#include <scitems.hxx>
+#include <scmatrix.hxx>
+#include <scresid.hxx>
+#include <stlpool.hxx>
+#include <stlsheet.hxx>
+#include <stringutil.hxx>
+#include <tabprotection.hxx>
+#include <tokenarray.hxx>
+#include <tokenuno.hxx>
+#include <unonames.hxx>
 #include <userdat.hxx>
-#include <vcl/transfer.hxx>
-#include <viewopti.hxx>
+#endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx
index 51b4fefecbcb..d86729e00edb 100644
--- a/sc/inc/pch/precompiled_scui.hxx
+++ b/sc/inc/pch/precompiled_scui.hxx
@@ -13,46 +13,42 @@
  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:53:36 using:
+ Generated on 2019-04-29 21:16:41 using:
  ./bin/update_pch sc scui --cutoff=1 --exclude:system --exclude:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
  ./bin/update_pch_bisect ./sc/inc/pch/precompiled_scui.hxx "make sc.build" --find-conflicts
 */
 
-#include <algorithm>
-#include <cmath>
-#include <helpids.h>
-#include <limits.h>
-#include <math.h>
+#if PCH_LEVEL >= 1
 #include <memory>
 #include <vector>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
+#include <osl/diagnose.h>
 #include <osl/thread.h>
+#include <osl/time.h>
 #include <rtl/math.hxx>
 #include <rtl/tencinfo.h>
 #include <rtl/ustrbuf.hxx>
 #include <sal/config.h>
 #include <sal/types.h>
-#include <vcl/builderfactory.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/button.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/edit.hxx>
+#include <vcl/event.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/waitobj.hxx>
-#include <vcl/window.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/GraphicNativeTransform.hxx>
-#include <vcl/GraphicNativeMetadata.hxx>
-#include <appoptio.hxx>
-#include <attrib.hxx>
-#include <autoform.hxx>
-#include <calcconfig.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
 #include <com/sun/star/sdb/DatabaseContext.hpp>
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
@@ -68,54 +64,14 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/random.hxx>
 #include <comphelper/string.hxx>
-#include <defaultsoptions.hxx>
-#include <docoptio.hxx>
-#include <document.hxx>
-#include <dpobject.hxx>
-#include <dpsave.hxx>
-#include <dpsdbtab.hxx>
-#include <dputil.hxx>
-#include <editeng/boxitem.hxx>
-#include <editeng/brushitem.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/contouritem.hxx>
-#include <editeng/crossedoutitem.hxx>
 #include <editeng/editobj.hxx>
-#include <editeng/editstat.hxx>
-#include <editeng/editview.hxx>
 #include <editeng/eeitem.hxx>
-#include <editeng/eerdll.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/flstitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/postitem.hxx>
-#include <editeng/shdditem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editutil.hxx>
-#include <filterentries.hxx>
-#include <formula/compiler.hxx>
-#include <formula/grammar.hxx>
-#include <formulaopt.hxx>
-#include <global.hxx>
-#include <globalnames.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <miscuno.hxx>
 #include <officecfg/Office/Calc.hxx>
-#include <optutil.hxx>
-#include <patattr.hxx>
-#include <printopt.hxx>
-#include <queryentry.hxx>
-#include <rangenam.hxx>
-#include <rangeutl.hxx>
-#include <scabstdlg.hxx>
-#include <scitems.hxx>
-#include <scmod.hxx>
-#include <scopetools.hxx>
-#include <scresid.hxx>
-#include <sfx2/app.hxx>
+#include <officecfg/Office/Common.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
@@ -123,44 +79,73 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/objsh.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <strings.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/memberid.h>
 #include <svl/sharedstringpool.hxx>
-#include <svl/stritem.hxx>
 #include <svl/style.hxx>
+#include <svl/typedwhich.hxx>
 #include <svl/zforlist.hxx>
 #include <svtools/collatorres.hxx>
+#include <svtools/ctrlbox.hxx>
 #include <svtools/ehdl.hxx>
+#include <svtools/inettbc.hxx>
+#include <svtools/restartdialog.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svx/algitem.hxx>
+#include <svtools/unitconv.hxx>
 #include <svx/colorbox.hxx>
-#include <svx/dlgutil.hxx>
-#include <svx/drawitem.hxx>
 #include <svx/flagsdef.hxx>
+#include <svx/langbox.hxx>
 #include <svx/numinf.hxx>
-#include <svx/svxcommands.h>
-#include <svx/svxdlg.hxx>
+#include <svx/pageitem.hxx>
 #include <svx/txencbox.hxx>
 #include <svx/unomid.hxx>
-#include <svx/xtable.hxx>
-#include <tablink.hxx>
 #include <tools/color.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <unotools/pathoptions.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/useroptions.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <appoptio.hxx>
+#include <attrib.hxx>
+#include <autoform.hxx>
+#include <calcconfig.hxx>
+#include <conditio.hxx>
+#include <defaultsoptions.hxx>
+#include <docoptio.hxx>
+#include <document.hxx>
+#include <dpobject.hxx>
+#include <dpsave.hxx>
+#include <dpsdbtab.hxx>
+#include <dputil.hxx>
+#include <editutil.hxx>
+#include <filterentries.hxx>
+#include <formula/grammar.hxx>
+#include <formulaopt.hxx>
+#include <global.hxx>
+#include <globalnames.hxx>
+#include <helpids.h>
+#include <miscuno.hxx>
+#include <optutil.hxx>
+#include <patattr.hxx>
+#include <printopt.hxx>
+#include <queryentry.hxx>
+#include <rangenam.hxx>
+#include <rangeutl.hxx>
+#include <scabstdlg.hxx>
+#include <scitems.hxx>
+#include <scmod.hxx>
+#include <scresid.hxx>
+#include <strings.hxx>
+#include <tablink.hxx>
 #include <userlist.hxx>
-#include <vcl/svlbitm.hxx>
-#include <vcl/treelistentry.hxx>
 #include <viewopti.hxx>
-#include <zforauto.hxx>
+#endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx
index 006e1effbded..51177730850b 100644
--- a/sc/inc/pch/precompiled_vbaobj.hxx
+++ b/sc/inc/pch/precompiled_vbaobj.hxx
@@ -13,30 +13,36 @@
  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:53:38 using:
+ Generated on 2019-04-29 21:16:41 using:
  ./bin/update_pch sc vbaobj --cutoff=1 --exclude:system --exclude:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
  ./bin/update_pch_bisect ./sc/inc/pch/precompiled_vbaobj.hxx "make sc.build" --find-conflicts
 */
 
+#if PCH_LEVEL >= 1
 #include <algorithm>
-#include <helpids.h>
 #include <map>
 #include <memory>
 #include <unordered_map>
 #include <vector>
 #include <boost/optional.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
 #include <osl/file.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/math.hxx>
+#include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/config.h>
+#include <sal/log.hxx>
 #include <sal/macros.h>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
-#include <attrib.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
 #include <basic/basmgr.hxx>
 #include <basic/sberrors.hxx>
 #include <basic/sbmeth.hxx>
@@ -45,8 +51,6 @@
 #include <basic/sbuno.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbxobj.hxx>
-#include <cellsuno.hxx>
-#include <columnspanset.hxx>
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
@@ -62,6 +66,7 @@
 #include <com/sun/star/awt/XWindowListener.hpp>
 #include <com/sun/star/beans/MethodConcept.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyVetoException.hpp>
 #include <com/sun/star/beans/XIntrospection.hpp>
 #include <com/sun/star/beans/XIntrospectionAccess.hpp>
@@ -103,6 +108,7 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -223,43 +229,33 @@
 #include <com/sun/star/view/XControlAccess.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/xml/AttributeData.hpp>
-#include <comphelper/anytostring.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <comphelper/unwrapargs.hxx>
-#include <compiler.hxx>
-#include <convuno.hxx>
+#include <comphelper/types.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <defaultsoptions.hxx>
-#include <docoptio.hxx>
-#include <document.hxx>
-#include <docuno.hxx>
-#include <drwlayer.hxx>
+#include <editeng/eeitem.hxx>
 #include <filter/msfilter/msvbahelper.hxx>
 #include <filter/msfilter/util.hxx>
-#include <global.hxx>
 #include <i18nutil/paper.hxx>
-#include <macromgr.hxx>
-#include <markdata.hxx>
-#include <miscuno.hxx>
-#include <nameuno.hxx>
 #include <o3tl/any.hxx>
-#include <olinetab.hxx>
 #include <ooo/vba/XCommandBarControls.hpp>
+#include <ooo/vba/XCommandBars.hpp>
 #include <ooo/vba/XControlProvider.hpp>
 #include <ooo/vba/XExecutableDialog.hpp>
 #include <ooo/vba/excel/Constants.hpp>
 #include <ooo/vba/excel/Range.hpp>
 #include <ooo/vba/excel/XApplication.hpp>
+#include <ooo/vba/excel/XApplicationOutgoing.hpp>
 #include <ooo/vba/excel/XAxis.hpp>
 #include <ooo/vba/excel/XDialog.hpp>
+#include <ooo/vba/excel/XFont.hpp>
 #include <ooo/vba/excel/XFormatCondition.hpp>
 #include <ooo/vba/excel/XOLEObject.hpp>
 #include <ooo/vba/excel/XPivotTable.hpp>
@@ -328,14 +324,6 @@
 #include <ooo/vba/office/MsoFileDialogType.hpp>
 #include <ooo/vba/office/MsoHyperlinkType.hpp>
 #include <ooo/vba/office/MsoShapeType.hpp>
-#include <patattr.hxx>
-#include <queryentry.hxx>
-#include <rangelst.hxx>
-#include <rangenam.hxx>
-#include <scabstdlg.hxx>
-#include <scextopt.hxx>
-#include <scitems.hxx>
-#include <scmod.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
@@ -351,17 +339,12 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/svxcommands.h>
 #include <svx/unoshape.hxx>
 #include <svx/xtable.hxx>
-#include <tabprotection.hxx>
-#include <tokenarray.hxx>
-#include <tokenuno.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
-#include <unonames.hxx>
 #include <unotools/eventcfg.hxx>
 #include <vbahelper/helperdecl.hxx>
 #include <vbahelper/vbaaccesshelper.hxx>
@@ -369,5 +352,38 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbashape.hxx>
 #include <vbahelper/vbashapes.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <attrib.hxx>
+#include <cellsuno.hxx>
+#include <columnspanset.hxx>
+#include <compiler.hxx>
+#include <convuno.hxx>
+#include <defaultsoptions.hxx>
+#include <docoptio.hxx>
+#include <document.hxx>
+#include <docuno.hxx>
+#include <drwlayer.hxx>
+#include <global.hxx>
+#include <macromgr.hxx>
+#include <markdata.hxx>
+#include <miscuno.hxx>
+#include <nameuno.hxx>
+#include <olinetab.hxx>
+#include <patattr.hxx>
+#include <queryentry.hxx>
+#include <rangelst.hxx>
+#include <rangenam.hxx>
+#include <scabstdlg.hxx>
+#include <scdll.hxx>
+#include <scextopt.hxx>
+#include <scitems.hxx>
+#include <scmod.hxx>
+#include <sortparam.hxx>
+#include <tabprotection.hxx>
+#include <tokenarray.hxx>
+#include <tokenuno.hxx>
+#include <unonames.hxx>
+#endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */