Revert "vcl: move filter headers to vcl/inc/filter"

Discussed on IRC - overwhelming consensus is to keep the headers
where they were before. The main reason to keep them in the same
directory is to keep headers as local as possible to the source
files, unless something else needs to access it.

The only thing that uses the headers is vc/workben/fftester.cxx

I will work out how to get Doxygen to pick up these headers another way.

This reverts commit 5d7772fc0464c867c5ad2f1e10ccabd7331f7efa.

Change-Id: I45ee970722e27748ab8af8909ac49579dc47ef56
Reviewed-on: https://gerrit.libreoffice.org/21250
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>

50 files changed, 64 insertions, 67 deletions

diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index bcab60c7ce08..ca579e22fe1f 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "filter/FilterConfigCache.hxx"
+#include "FilterConfigCache.hxx"
 
 #include <vcl/graphicfilter.hxx>
 #include <com/sun/star/uno/Any.h>
diff --git a/vcl/inc/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index 8c52991e4636..8c52991e4636 100644
--- a/vcl/inc/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx b/vcl/source/filter/GraphicNativeMetadata.cxx
index 43359ab100fc..532e2d4284ab 100644
--- a/vcl/source/filter/GraphicNativeMetadata.cxx
+++ b/vcl/source/filter/GraphicNativeMetadata.cxx
@@ -21,7 +21,7 @@
 
 #include <vcl/gfxlink.hxx>
 
-#include "filter/Exif.hxx"
+#include "jpeg/Exif.hxx"
 #include <memory>
 
 GraphicNativeMetadata::GraphicNativeMetadata() :
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx
index b0dd5b1cdb02..11a17a5f091f 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -24,8 +24,8 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include "filter/Exif.hxx"
-#include "filter/JpegTransform.hxx"
+#include "jpeg/Exif.hxx"
+#include "jpeg/JpegTransform.hxx"
 
 GraphicNativeTransform::GraphicNativeTransform(Graphic& rGraphic) :
     mrGraphic(rGraphic)
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index f62bbacc5e59..7b3d34c554a5 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -40,11 +40,12 @@
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/wmf.hxx>
 #include <vcl/settings.hxx>
-#include <unotools/ucbstreamhelper.hxx>
-#include <rtl/bootstrap.hxx>
-#include <rtl/instance.hxx>
-#include <vcl/metaact.hxx>
-
+#include "igif/gifread.hxx"
+#include "jpeg/jpeg.hxx"
+#include "ixbm/xbmread.hxx"
+#include "ixpm/xpmread.hxx"
+#include "sgffilt.hxx"
+#include "osl/module.hxx"
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
@@ -58,19 +59,15 @@
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
-
+#include <unotools/ucbstreamhelper.hxx>
+#include <rtl/bootstrap.hxx>
+#include <rtl/instance.hxx>
+#include <vcl/metaact.hxx>
 #include <vector>
 #include <memory>
 
-#include "filter/gifread.hxx"
-#include "filter/jpeg.hxx"
-#include "filter/xbmread.hxx"
-#include "filter/xpmread.hxx"
-#include "filter/sgffilt.hxx"
-#include "osl/module.hxx"
-
-#include "filter/FilterConfigCache.hxx"
-#include "filter/graphicfilter_internal.hxx"
+#include "FilterConfigCache.hxx"
+#include "graphicfilter_internal.hxx"
 
 #define PMGCHUNG_msOG       0x6d734f47      // Microsoft Office Animated GIF
 
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index 05c78a55c902..822452bd450e 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -23,7 +23,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include "filter/graphicfilter_internal.hxx"
+#include "graphicfilter_internal.hxx"
 
 #define DATA_SIZE           640
 
diff --git a/vcl/inc/filter/graphicfilter_internal.hxx b/vcl/source/filter/graphicfilter_internal.hxx
index 8f3931ec2994..8f3931ec2994 100644
--- a/vcl/inc/filter/graphicfilter_internal.hxx
+++ b/vcl/source/filter/graphicfilter_internal.hxx
diff --git a/vcl/source/filter/igif/decode.cxx b/vcl/source/filter/igif/decode.cxx
index 42a3aeb9c8a6..b0454d2cb270 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "filter/decode.hxx"
+#include "decode.hxx"
 
 struct GIFLZWTableEntry
 {
diff --git a/vcl/inc/filter/decode.hxx b/vcl/source/filter/igif/decode.hxx
index 93840f1ade1b..93840f1ade1b 100644
--- a/vcl/inc/filter/decode.hxx
+++ b/vcl/source/filter/igif/decode.hxx
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 26fd5fcc304b..cb0e0ee79201 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -19,8 +19,8 @@
 
 #define _GIFPRIVATE
 
-#include "filter/decode.hxx"
-#include "filter/gifread.hxx"
+#include "decode.hxx"
+#include "gifread.hxx"
 #include <memory>
 
 #define NO_PENDING( rStm ) ( ( rStm ).GetError() != ERRCODE_IO_PENDING )
diff --git a/vcl/inc/filter/gifread.hxx b/vcl/source/filter/igif/gifread.hxx
index b6489a0c9360..b6489a0c9360 100644
--- a/vcl/inc/filter/gifread.hxx
+++ b/vcl/source/filter/igif/gifread.hxx
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index d6539a18543c..b12aea3b973c 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -20,7 +20,7 @@
 #define _XBMPRIVATE
 #include <ctype.h>
 #include <comphelper/string.hxx>
-#include "filter/xbmread.hxx"
+#include "xbmread.hxx"
 
 XBMReader::XBMReader( SvStream& rStm ) :
             rIStm           ( rStm ),
diff --git a/vcl/inc/filter/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx
index 3794a374ca4b..3794a374ca4b 100644
--- a/vcl/inc/filter/xbmread.hxx
+++ b/vcl/source/filter/ixbm/xbmread.hxx
diff --git a/vcl/inc/filter/rgbtable.hxx b/vcl/source/filter/ixpm/rgbtable.hxx
index 7dcc340938d8..7dcc340938d8 100644
--- a/vcl/inc/filter/rgbtable.hxx
+++ b/vcl/source/filter/ixpm/rgbtable.hxx
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index b7fec06e6b52..cfc7956f33cd 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -19,9 +19,9 @@
 
 #include <vcl/bmpacc.hxx>
 #include <vcl/graph.hxx>
-#include "filter/rgbtable.hxx"
+#include "rgbtable.hxx"
 #define _XPMPRIVATE
-#include "filter/xpmread.hxx"
+#include "xpmread.hxx"
 #include <cstring>
 
 XPMReader::XPMReader(SvStream& rStm)
diff --git a/vcl/inc/filter/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx
index 141f4b2b23f2..141f4b2b23f2 100644
--- a/vcl/inc/filter/xpmread.hxx
+++ b/vcl/source/filter/ixpm/xpmread.hxx
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 7694fb2457c7..b1a4034532ea 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "filter/Exif.hxx"
+#include "Exif.hxx"
 #include <memory>
 
 Exif::Exif() :
diff --git a/vcl/inc/filter/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
index 2f440f6573c7..2f440f6573c7 100644
--- a/vcl/inc/filter/Exif.hxx
+++ b/vcl/source/filter/jpeg/Exif.hxx
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index c8479cfb64e2..5f42009d6ca9 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -19,11 +19,11 @@
 
 #include <sal/config.h>
 
-#include "filter/jpeg.h"
+#include "jpeg.h"
 #include <jpeglib.h>
 #include <jerror.h>
 
-#include "filter/JpegReader.hxx"
+#include "JpegReader.hxx"
 #include <vcl/bmpacc.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/vcl/inc/filter/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx
index c45b697fb617..c45b697fb617 100644
--- a/vcl/inc/filter/JpegReader.hxx
+++ b/vcl/source/filter/jpeg/JpegReader.hxx
diff --git a/vcl/source/filter/jpeg/JpegTransform.cxx b/vcl/source/filter/jpeg/JpegTransform.cxx
index 496b8cc7d5e9..a71b816f3f50 100644
--- a/vcl/source/filter/jpeg/JpegTransform.cxx
+++ b/vcl/source/filter/jpeg/JpegTransform.cxx
@@ -19,8 +19,9 @@
 
 #include <sal/config.h>
 
-#include "filter/jpeg.h"
-#include "filter/JpegTransform.hxx"
+#include "jpeg.h"
+
+#include "JpegTransform.hxx"
 
 JpegTransform::JpegTransform(SvStream& rInputStream, SvStream& rOutputStream) :
     maRotate       ( 0 ),
diff --git a/vcl/inc/filter/JpegTransform.hxx b/vcl/source/filter/jpeg/JpegTransform.hxx
index 0711f2337673..0711f2337673 100644
--- a/vcl/inc/filter/JpegTransform.hxx
+++ b/vcl/source/filter/jpeg/JpegTransform.hxx
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 648299a2eaad..cb1a67f90712 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -19,11 +19,11 @@
 
 #include <sal/config.h>
 
-#include "filter/jpeg.h"
+#include "jpeg.h"
 #include <jpeglib.h>
 #include <jerror.h>
 
-#include "filter/JpegWriter.hxx"
+#include "JpegWriter.hxx"
 #include <vcl/bmpacc.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/vcl/inc/filter/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx
index 77822d667835..77822d667835 100644
--- a/vcl/inc/filter/JpegWriter.hxx
+++ b/vcl/source/filter/jpeg/JpegWriter.hxx
diff --git a/vcl/inc/filter/jinclude.h b/vcl/source/filter/jpeg/jinclude.h
index 4536a09c7acc..4536a09c7acc 100644
--- a/vcl/inc/filter/jinclude.h
+++ b/vcl/source/filter/jpeg/jinclude.h
diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx
index f1e57734403f..b2e46720790d 100644
--- a/vcl/source/filter/jpeg/jpeg.cxx
+++ b/vcl/source/filter/jpeg/jpeg.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "filter/JpegReader.hxx"
-#include "filter/JpegWriter.hxx"
-#include "filter/jpeg.hxx"
+#include "JpegReader.hxx"
+#include "JpegWriter.hxx"
+#include "jpeg.hxx"
 
 #include <vcl/bmpacc.hxx>
 #include <vcl/FilterConfigItem.hxx>
diff --git a/vcl/inc/filter/jpeg.h b/vcl/source/filter/jpeg/jpeg.h
index 1f8c21f62aac..1f8c21f62aac 100644
--- a/vcl/inc/filter/jpeg.h
+++ b/vcl/source/filter/jpeg/jpeg.h
diff --git a/vcl/inc/filter/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx
index 701a8eaa53dc..701a8eaa53dc 100644
--- a/vcl/inc/filter/jpeg.hxx
+++ b/vcl/source/filter/jpeg/jpeg.hxx
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index f184441fb62e..d42ae785b623 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -29,12 +29,12 @@
 #include <osl/diagnose.h>
 
 extern "C" {
-#include "filter/transupp.h"
+#include "transupp.h"
 }
 
-#include "filter/jpeg.h"
-#include "filter/JpegReader.hxx"
-#include "filter/JpegWriter.hxx"
+#include "jpeg.h"
+#include <JpegReader.hxx>
+#include <JpegWriter.hxx>
 #include <memory>
 
 #ifdef _MSC_VER
diff --git a/vcl/inc/filter/jpegcomp.h b/vcl/source/filter/jpeg/jpegcomp.h
index ed9eeab8a1bb..ed9eeab8a1bb 100644
--- a/vcl/inc/filter/jpegcomp.h
+++ b/vcl/source/filter/jpeg/jpegcomp.h
diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
index 4530be0b0ce8..323aa3018bec 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -16,11 +16,11 @@
 
 #include <sal/config.h>
 
-#include "filter/jinclude.h"
+#include "jinclude.h"
 #include "jerror.h"
 #include "jpeglib.h"
-#include "filter/transupp.h"       /* My own external interface */
-#include "filter/jpegcomp.h"
+#include "transupp.h"       /* My own external interface */
+#include "jpegcomp.h"
 #include <ctype.h>      /* to declare isdigit() */
 
 /* Definition of jdiv_round_up is copied here from jutils.c in jpeg-8c.tar.gz,
diff --git a/vcl/inc/filter/transupp.h b/vcl/source/filter/jpeg/transupp.h
index fe1b04ac5035..fe1b04ac5035 100644
--- a/vcl/inc/filter/transupp.h
+++ b/vcl/source/filter/jpeg/transupp.h
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index f02f249437f3..c449afcc9eed 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -24,8 +24,8 @@
 #include <vcl/gdimtf.hxx>
 #include <tools/color.hxx>
 #include <vcl/virdev.hxx>
-#include "filter/sgffilt.hxx"
-#include "filter/sgfbram.hxx"
+#include "sgffilt.hxx"
+#include "sgfbram.hxx"
 #include <memory>
 
 SgfHeader::SgfHeader()
diff --git a/vcl/inc/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx
index 9e0eeedcd7c3..9e0eeedcd7c3 100644
--- a/vcl/inc/filter/sgfbram.hxx
+++ b/vcl/source/filter/sgfbram.hxx
diff --git a/vcl/inc/filter/sgffilt.hxx b/vcl/source/filter/sgffilt.hxx
index 9256c61770fc..9256c61770fc 100644
--- a/vcl/inc/filter/sgffilt.hxx
+++ b/vcl/source/filter/sgffilt.hxx
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 9b96af91ef1d..18e2d2ce16bc 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -23,10 +23,10 @@
 #include <tools/poly.hxx>
 #include <tools/fract.hxx>
 #include <vcl/graphicfilter.hxx>
-#include "filter/sgffilt.hxx"
-#include "filter/sgfbram.hxx"
-#include "filter/sgvmain.hxx"
-#include "filter/sgvspln.hxx"
+#include "sgffilt.hxx"
+#include "sgfbram.hxx"
+#include "sgvmain.hxx"
+#include "sgvspln.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #if defined OSL_BIGENDIAN
diff --git a/vcl/inc/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index 9ff404016a5e..9ff404016a5e 100644
--- a/vcl/inc/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx
index 6a55591f64a0..762e310eb55e 100644
--- a/vcl/source/filter/sgvspln.cxx
+++ b/vcl/source/filter/sgvspln.cxx
@@ -20,7 +20,7 @@
 #include <tools/poly.hxx>
 #include <memory>
 
-#include "filter/sgvspln.hxx"
+#include <sgvspln.hxx>
 #include <cmath>
 
 #if defined(ANDROID)
diff --git a/vcl/inc/filter/sgvspln.hxx b/vcl/source/filter/sgvspln.hxx
index 906dbe2c6f47..906dbe2c6f47 100644
--- a/vcl/inc/filter/sgvspln.hxx
+++ b/vcl/source/filter/sgvspln.hxx
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 43594624366c..976683b5dd42 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -25,9 +25,9 @@
 #include <tools/config.hxx>
 #include <tools/fract.hxx>
 #include <vcl/graphicfilter.hxx>
-#include "filter/sgffilt.hxx"
-#include "filter/sgfbram.hxx"
-#include "filter/sgvmain.hxx"
+#include "sgffilt.hxx"
+#include "sgfbram.hxx"
+#include "sgvmain.hxx"
 #include <memory>
 #include <cstdlib>
 
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 93872578e5f1..15375dd10394 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -21,7 +21,7 @@
 
 #include <algorithm>
 
-#include "filter/emfwr.hxx"
+#include "emfwr.hxx"
 #include <rtl/strbuf.hxx>
 #include <tools/helpers.hxx>
 #include <tools/fract.hxx>
diff --git a/vcl/inc/filter/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx
index a7aa6fb3aab5..a7aa6fb3aab5 100644
--- a/vcl/inc/filter/emfwr.hxx
+++ b/vcl/source/filter/wmf/emfwr.hxx
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index f10edd2eec82..989e0aa9efeb 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "filter/winmtf.hxx"
+#include "winmtf.hxx"
 #include <osl/endian.h>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vcl/dibtools.hxx>
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index baa810d31426..c19642ad9fb5 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "filter/winmtf.hxx"
+#include "winmtf.hxx"
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <vcl/metaact.hxx>
diff --git a/vcl/inc/filter/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index dc8074fb6e91..dc8074fb6e91 100644
--- a/vcl/inc/filter/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 25328b1e7234..a142f765020a 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "filter/winmtf.hxx"
+#include "winmtf.hxx"
 
 #include <memory>
 #include <boost/optional.hpp>
diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx
index e09e1c0a483f..1b3972110792 100644
--- a/vcl/source/filter/wmf/wmf.cxx
+++ b/vcl/source/filter/wmf/wmf.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "filter/winmtf.hxx"
-#include "filter/emfwr.hxx"
-#include "filter/wmfwr.hxx"
+#include "winmtf.hxx"
+#include "emfwr.hxx"
+#include "wmfwr.hxx"
 #include <vcl/wmf.hxx>
 #include <vcl/gdimetafiletools.hxx>
 #include <comphelper/scopeguard.hxx>
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 9a58880e2752..73f0489da7e5 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -21,10 +21,9 @@
 
 #include <algorithm>
 
-#include "filter/wmfwr.hxx"
-#include "filter/emfwr.hxx"
-
+#include "wmfwr.hxx"
 #include <unotools/fontcvt.hxx>
+#include "emfwr.hxx"
 #include <rtl/crc.h>
 #include <rtl/strbuf.hxx>
 #include <rtl/tencinfo.h>
diff --git a/vcl/inc/filter/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index 32cf5cf6d1ae..32cf5cf6d1ae 100644
--- a/vcl/inc/filter/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 0e213046d94d..c57407d661fd 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -52,10 +52,10 @@
 #include <osl/file.hxx>
 #include <signal.h>
 
-#include "filter/gifread.hxx"
-#include "filter/xbmread.hxx"
-#include "filter/xpmread.hxx"
-#include "filter/jpeg.hxx"
+#include <../source/filter/igif/gifread.hxx>
+#include <../source/filter/ixbm/xbmread.hxx>
+#include <../source/filter/ixpm/xpmread.hxx>
+#include <../source/filter/jpeg/jpeg.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;