include PCH headers for headers changes

Change-Id: Id94a4322428e27010757ef36b166f8b01697778f

oox/inc/pch/precompiled_oox.hxx

@@ -342,7 +342,6 @@
 #include <string.h>
 #include <svl/languageoptions.hxx>
 #include <svtools/grfmgr.hxx>
-#include <svtools/wmf.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdotext.hxx>
@@ -360,6 +359,7 @@
 #include <vcl/cvtgrf.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/wmf.hxx>
 #include <vector>
 #include <xmlscript/xmldlg_imexp.hxx>
 

sc/inc/pch/precompiled_sc.hxx

@@ -648,7 +648,6 @@
 #include <svtools/ehdl.hxx>
 #include <svtools/embedhlp.hxx>
 #include <svtools/embedtransfer.hxx>
-#include <svtools/filter.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/insdlg.hxx>
 #include <svtools/langtab.hxx>
@@ -872,6 +871,7 @@
 #include <vcl/field.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/help.hxx>
 #include <vcl/image.hxx>

sd/inc/pch/precompiled_sd.hxx

@@ -539,14 +539,12 @@
 #include <svl/visitem.hxx>
 #include <svl/whiter.hxx>
 #include <svl/zforlist.hxx>
-#include <svtools/FilterConfigItem.hxx>
 #include <svtools/cliplistener.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svtools/ctrlbox.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/embedtransfer.hxx>
-#include <svtools/filter.hxx>
 #include <svtools/htmlout.hxx>
 #include <svtools/imapcirc.hxx>
 #include <svtools/imapobj.hxx>
@@ -567,7 +565,6 @@
 #include <svtools/unoevent.hxx>
 #include <svtools/unoimap.hxx>
 #include <svtools/valueset.hxx>
-#include <svtools/wmf.hxx>
 #include <svx/AccessibleShape.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
 #include <svx/DescriptionGenerator.hxx>
@@ -774,6 +771,7 @@
 #include <tools/diagnose_ex.h>
 #include <tools/errinf.hxx>
 #include <tools/fsys.hxx>
+#include <tools/gen.hxx>
 #include <tools/globname.hxx>
 #include <tools/helpers.hxx>
 #include <tools/link.hxx>
@@ -809,6 +807,7 @@
 #include <unotools/useroptions.hxx>
 #include <unotools/viewoptions.hxx>
 #include <utility>
+#include <vcl/FilterConfigItem.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/bmpacc.hxx>
@@ -828,6 +827,7 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <vcl/group.hxx>
 #include <vcl/help.hxx>
 #include <vcl/image.hxx>
@@ -861,6 +861,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/window.hxx>
+#include <vcl/wmf.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vector>
 #include <xmloff/settingsstore.hxx>

svtools/inc/pch/precompiled_svt.hxx

@@ -22,11 +22,9 @@
 #include "comphelper/string.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "osl/diagnose.h"
-#include "osl/module.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/config.h"
 #include "sal/types.h"
-#include "stdio.h"
 #include "svl/filenotation.hxx"
 #include "svl/inettype.hxx"
 #include "svl/urihelper.hxx"
@@ -52,14 +50,10 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <boost/bind.hpp>
 #include <boost/optional.hpp>
 #include <boost/ptr_container/ptr_set.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/scoped_array.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/static_assert.hpp>
@@ -101,7 +95,6 @@
 #include <com/sun/star/chart2/XDefaultSizeTransmitter.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -182,7 +175,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.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/XTypeConverter.hpp>
@@ -199,7 +191,6 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
 #include <com/sun/star/sheet/XCellRangeReferrer.hpp>
-#include <com/sun/star/svg/XSVGWriter.hpp>
 #include <com/sun/star/system/SystemShellExecute.hpp>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
@@ -235,15 +226,10 @@
 #include <com/sun/star/ui/dialogs/XWizardController.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/Sequence.h>
 #include <com/sun/star/uno/Sequence.hxx>
-#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/util/Color.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
@@ -257,7 +243,6 @@
 #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/XChangesBatch.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
@@ -266,8 +251,6 @@
 #include <com/sun/star/view/SelectionType.hpp>
 #include <com/sun/star/view/XPrintable.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/xml/sax/Writer.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <comphelper/accimplaccess.hxx>
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/configurationhelper.hxx>
@@ -279,7 +262,6 @@
 #include <comphelper/property.hxx>
 #include <comphelper/propertysethelper.hxx>
 #include <comphelper/propertysetinfo.hxx>
-#include <comphelper/scopeguard.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicedecl.hxx>
@@ -317,7 +299,6 @@
 #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
 #include <osl/conditn.hxx>
 #include <osl/diagnose.h>
-#include <osl/endian.h>
 #include <osl/file.h>
 #include <osl/file.hxx>
 #include <osl/module.h>
@@ -328,7 +309,6 @@
 #include <rtl/crc.h>
 #include <rtl/instance.hxx>
 #include <rtl/logfile.hxx>
-#include <rtl/math.h>
 #include <rtl/math.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/strbuf.hxx>
@@ -376,7 +356,6 @@
 #include <toolkit/helper/property.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/unohlp.hxx>
-#include <tools/bigint.hxx>
 #include <tools/color.hxx>
 #include <tools/config.hxx>
 #include <tools/date.hxx>
@@ -415,7 +394,6 @@
 #include <unotools/configpaths.hxx>
 #include <unotools/dynamicmenuoptions.hxx>
 #include <unotools/extendedsecurityoptions.hxx>
-#include <unotools/fontcvt.hxx>
 #include <unotools/historyoptions.hxx>
 #include <unotools/intlwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -428,6 +406,7 @@
 #include <unotools/ucbhelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/viewoptions.hxx>
+#include <vcl/FilterConfigItem.hxx>
 #include <vcl/accel.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/animate.hxx>
@@ -436,7 +415,6 @@
 #include <vcl/bmpacc.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/button.hxx>
-#include <vcl/canvastools.hxx>
 #include <vcl/controllayout.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/cvtgrf.hxx>
@@ -453,7 +431,7 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/graphictools.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <vcl/help.hxx>
 #include <vcl/helper.hxx>
 #include <vcl/i18nhelp.hxx>
@@ -470,12 +448,9 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
-#include <vcl/pngread.hxx>
-#include <vcl/pngwrite.hxx>
 #include <vcl/prgsbar.hxx>
 #include <vcl/print.hxx>
 #include <vcl/salbtype.hxx>
-#include <vcl/salctype.hxx>
 #include <vcl/salgtype.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/scrbar.hxx>
@@ -486,7 +461,6 @@
 #include <vcl/status.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/svgdata.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/textview.hxx>
@@ -498,6 +472,7 @@
 #include <vcl/waitobj.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/window.hxx>
+#include <vcl/wmf.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vector>

svx/inc/pch/precompiled_svx.hxx

@@ -277,6 +277,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/macros.h>
+#include <sal/types.h>
 #include <set>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
@@ -330,7 +331,6 @@
 #include <svtools/ctrlbox.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/ehdl.hxx>
-#include <svtools/filter.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/imapcirc.hxx>
 #include <svtools/imappoly.hxx>
@@ -388,10 +388,12 @@
 #include <vcl/fixed.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <vcl/group.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/help.hxx>
 #include <vcl/image.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/metaact.hxx>

svx/inc/pch/precompiled_svxcore.hxx

@@ -31,7 +31,6 @@
 #include "osl/diagnose.h"
 #include "sal/config.h"
 #include "sal/types.h"
-#include "svtools/filter.hxx"
 #include "svtools/treelistentry.hxx"
 #include "toolkit/unohlp.hxx"
 #include "uno/lbnames.h"
@@ -500,7 +499,6 @@
 #include <svl/urlbmk.hxx>
 #include <svl/whiter.hxx>
 #include <svl/zforlist.hxx>
-#include <svtools/FilterConfigItem.hxx>
 #include <svtools/accessibilityoptions.hxx>
 #include <svtools/borderhelper.hxx>
 #include <svtools/colorcfg.hxx>
@@ -508,7 +506,6 @@
 #include <svtools/ctrltool.hxx>
 #include <svtools/embedhlp.hxx>
 #include <svtools/filechangedchecker.hxx>
-#include <svtools/filter.hxx>
 #include <svtools/fltcall.hxx>
 #include <svtools/grfmgr.hxx>
 #include <svtools/langtab.hxx>
@@ -521,7 +518,6 @@
 #include <svtools/unoevent.hxx>
 #include <svtools/unoimap.hxx>
 #include <svtools/valueset.hxx>
-#include <svtools/wmf.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -559,6 +555,7 @@
 #include <unotools/syslocale.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
+#include <vcl/FilterConfigItem.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/bmpacc.hxx>
@@ -572,6 +569,7 @@
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <vcl/graphictools.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/jobset.hxx>
@@ -592,6 +590,7 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
+#include <vcl/wmf.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vector>
 #include <xmloff/xmlictxt.hxx>

sw/inc/pch/precompiled_msword.hxx

@@ -26,6 +26,7 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
+#include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/drawing/XConnectableShape.hpp>
 #include <com/sun/star/drawing/XConnectorShape.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
@@ -193,7 +194,6 @@
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <svtools/embedhlp.hxx>
-#include <svtools/filter.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/miscopt.hxx>
@@ -244,12 +244,14 @@
 #include <vcl/cvtgrf.hxx>
 #include <vcl/font.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/salbtype.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/temporaryfonts.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/wmf.hxx>
 #include <vector>
 #include <writerfilter/doctok/sprmids.hxx>
 #include <xmloff/odffields.hxx>

sw/inc/pch/precompiled_sw.hxx

@@ -730,7 +730,6 @@
 #include <svtools/ehdl.hxx>
 #include <svtools/embedhlp.hxx>
 #include <svtools/embedtransfer.hxx>
-#include <svtools/filter.hxx>
 #include <svtools/grfmgr.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <svtools/htmlkywd.hxx>
@@ -1008,6 +1007,7 @@
 #include <vcl/font.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <vcl/help.hxx>
 #include <vcl/image.hxx>
 #include <vcl/inputctx.hxx>
@@ -1039,6 +1039,7 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
+#include <vcl/wmf.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vector>
 #include <xmloff/DocumentSettingsContext.hxx>

vcl/inc/pch/precompiled_vcl.hxx

@@ -84,6 +84,7 @@
 #include "osl/file.h"
 #include "osl/file.hxx"
 #include "osl/module.h"
+#include "osl/module.hxx"
 #include "osl/mutex.hxx"
 #include "osl/process.h"
 #include "osl/thread.h"
@@ -104,6 +105,7 @@
 #include "sal/alloca.h"
 #include "sal/config.h"
 #include "sal/types.h"
+#include "stdio.h"
 #include "string.h"
 #include "tools/debug.hxx"
 #include "tools/diagnose_ex.h"
@@ -144,6 +146,7 @@
 #include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/vector/b2isize.hxx>
+#include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
@@ -167,6 +170,7 @@
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/awt/MouseButton.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
+#include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/XExtendedToolkit.hpp>
 #include <com/sun/star/awt/XGraphics.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -174,6 +178,9 @@
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/beans/XMaterialHolder.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
@@ -209,6 +216,8 @@
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <com/sun/star/i18n/XCollator.hpp>
 #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
+#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/java/XJavaThreadRegister_11.hpp>
 #include <com/sun/star/java/XJavaVM.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -232,20 +241,30 @@
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
+#include <com/sun/star/svg/XSVGWriter.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.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/Sequence.hxx>
+#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/util/Endianness.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
+#include <com/sun/star/util/XChangesBatch.hpp>
+#include <com/sun/star/xml/sax/Writer.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/scopeguard.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/string.hxx>
 #include <config_graphite.h>
@@ -262,7 +281,10 @@
 #include <i18npool/lang.h>
 #include <i18npool/languagetag.hxx>
 #include <i18npool/mslangid.hxx>
+#include <i18nutil/unicode.hxx>
 #include <iostream>
+#include <jerror.h>
+#include <jpeglib.h>
 #include <jvmaccess/virtualmachine.hxx>
 #include <lcms2.h>
 #include <limits.h>
@@ -272,6 +294,7 @@
 #include <math.h>
 #include <memory>
 #include <numeric>
+#include <officecfg/Office/Common.hxx>
 #include <osl/diagnose.h>
 #include <osl/diagnose.hxx>
 #include <osl/endian.h>
@@ -288,9 +311,12 @@
 #include <rtl/digest.h>
 #include <rtl/instance.hxx>
 #include <rtl/logfile.hxx>
+#include <rtl/math.h>
+#include <rtl/math.hxx>
 #include <rtl/process.h>
 #include <rtl/ref.hxx>
 #include <rtl/strbuf.hxx>
+#include <rtl/tencinfo.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/uuid.h>
@@ -314,8 +340,10 @@
 #include <svl/urlbmk.hxx>
 #include <tools/bigint.hxx>
 #include <tools/color.hxx>
+#include <tools/config.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/gen.hxx>
 #include <tools/helpers.hxx>
 #include <tools/line.hxx>
 #include <tools/poly.hxx>
@@ -326,8 +354,10 @@
 #include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/rtti.hxx>
+#include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
+#include <tools/tenccvt.hxx>
 #include <tools/time.hxx>
 #include <tools/tools.h>
 #include <tools/urlobj.hxx>
@@ -345,7 +375,9 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/fontcfg.hxx>
+#include <unotools/fontcvt.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <unotools/localfilehelper.hxx>
 #include <unotools/misccfg.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/textsearch.hxx>

writerfilter/inc/pch/precompiled_writerfilter.hxx

@@ -197,17 +197,19 @@
 #include <string>
 #include <svl/lngmisc.hxx>
 #include <svtools/grfmgr.hxx>
-#include <svtools/wmf.hxx>
 #include <tools/color.hxx>
 #include <tools/globname.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
+#include <unotools/localfilehelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/temporaryfonts.hxx>
+#include <vcl/wmf.hxx>
 #include <vector>
 #include <xmloff/odffields.hxx>