fdo#63926 - remove extra include paths in svtools/ and sfx2/

- removed some paths from include
- more of this kind will follow

Change-Id: Ia5c410a5b9a7a0dfa5610dd50d82c8b23fcf43b2
Reviewed-on: https://gerrit.libreoffice.org/5288
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

40 files changed, 63 insertions, 63 deletions

diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index 0dcb13a6bcea..120975ade5a6 100644
--- a/svtools/source/control/filectrl2.cxx
+++ b/svtools/source/control/filectrl2.cxx
@@ -19,7 +19,7 @@
 
 
 // this file contains code from filectrl.cxx which needs to be compiled with enabled exception hanling
-#include <svtools/filectrl.hxx>
+#include <filectrl.hxx>
 #include <com/sun/star/ui/dialogs/FilePicker.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index 914f25dbbc5e..ab9fba967b85 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/fileurlbox.hxx>
+#include <fileurlbox.hxx>
 #include <osl/file.h>
 #include "svl/filenotation.hxx"
 
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index bc6bd449ae1e..6bf9af7144ef 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -25,7 +25,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/zformat.hxx>
-#include <svtools/fmtfield.hxx>
+#include <fmtfield.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/util/SearchOptions.hpp>
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 0cf073032f56..b4b158ea5f34 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/headbar.hxx>
+#include <headbar.hxx>
 #include <tools/debug.hxx>
 
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index a67c3842b547..4c6abc8bac59 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/hyperlabel.hxx>
+#include <hyperlabel.hxx>
 #include <vcl/bitmap.hxx>
 #include <tools/color.hxx>
 
diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index c80507f015a7..b8b25c8e6abd 100644
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
-#include <svtools/indexentryres.hxx>
+#include <svtresid.hxx>
+#include <svtools.hrc>
+#include <indexentryres.hxx>
 
 // -------------------------------------------------------------------------
 //
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 5ff01ab294d7..be664ee7aec8 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #endif
 
-#include <svtools/inettbc.hxx>
+#include <inettbc.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/beans/Property.hpp>
@@ -57,7 +57,7 @@
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbhelper.hxx>
 #include "iodlg.hrc"
-#include <svtools/asynclink.hxx>
+#include <asynclink.hxx>
 #include <svl/urlfilter.hxx>
 
 #include <vector>
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index a07a1eacd5e6..c9b030b7dc8b 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/roadmap.hxx>
+#include <roadmap.hxx>
 
 #ifndef _STRING_HXX
 #define _STRING_HXX
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index e25452a19132..0b3e26a84d48 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -23,7 +23,7 @@
 #include <tools/poly.hxx>
 #include <vcl/i18nhelp.hxx>
 
-#include <svtools/ruler.hxx>
+#include <ruler.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 46f40fc1a1b9..3d250d21b2a7 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/scriptedtext.hxx>
+#include <scriptedtext.hxx>
 #include <vector>
 #include <rtl/ustring.hxx>
 #include <vcl/outdev.hxx>
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index 5535e4c0df1a..72b37137a0c7 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/scrwin.hxx>
+#include <scrwin.hxx>
 
 //===================================================================
 
diff --git a/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx
index c966bebdba04..d8323d2fa443 100644
--- a/svtools/source/control/stdctrl.cxx
+++ b/svtools/source/control/stdctrl.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <svtools/stdctrl.hxx>
+#include <stdctrl.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index 1608004caffc..a7b3067cfb36 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -21,8 +21,8 @@
 #include <string.h>
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
-#include <svtools/ctrltool.hxx>
-#include <svtools/stdmenu.hxx>
+#include <ctrltool.hxx>
+#include <stdmenu.hxx>
 
 // ========================================================================
 
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 0d4eb047e617..2e63b7d0846d 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <svtools/tabbar.hxx>
+#include <tabbar.hxx>
 #include <tools/time.hxx>
 #include <tools/debug.hxx>
 #include <tools/poly.hxx>
@@ -30,8 +30,8 @@
 #include <vcl/image.hxx>
 #include "svtaccessiblefactory.hxx"
 #include <filectrl.hrc>
-#include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtresid.hxx>
+#include <svtools.hrc>
 #include <limits>
 
 // =======================================================================
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 3405dac90448..d95deac84749 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -27,8 +27,8 @@
 #include <vcl/taskpanelist.hxx>
 #include <vcl/toolbox.hxx>
 
-#include "svtools/valueset.hxx"
-#include "svtools/toolbarmenu.hxx"
+#include "valueset.hxx"
+#include "toolbarmenu.hxx"
 #include "toolbarmenuimp.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index c7f008e8e87a..e9d55f560c11 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -26,7 +26,7 @@
 
 #include <vcl/svapp.hxx>
 
-#include "svtools/toolbarmenu.hxx"
+#include "toolbarmenu.hxx"
 
 #include "toolbarmenuimp.hxx"
 
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index ee62f1b49255..b22de6a639ba 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <svtools/urlcontrol.hxx>
+#include <urlcontrol.hxx>
 #include "svl/filenotation.hxx"
 
 //.........................................................................
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 1bef13a9a1ef..f5e7224a7772 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -19,7 +19,7 @@
 
 #include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/valueset.hxx>
+#include <valueset.hxx>
 #include "valueimp.hxx"
 #include <comphelper/servicehelper.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 75a8d5374c54..3d709e52f8c8 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -30,7 +30,7 @@
 #include <rtl/ustring.hxx>
 #include "valueimp.hxx"
 
-#include <svtools/valueset.hxx>
+#include <valueset.hxx>
 
 namespace
 {
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 8b51a33ef211..534c3d1f1f22 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -11,7 +11,7 @@
 #include "ServerDetailsControls.hxx"
 
 #include <officecfg/Office/Common.hxx>
-#include <svtools/svtresid.hxx>
+#include <svtresid.hxx>
 #include <vcl/msgbox.hxx>
 
 using namespace boost;
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 295153228f7e..f71510092d69 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -19,11 +19,11 @@
 
 
 #include <stdio.h>
-#include <svtools/addresstemplate.hxx>
+#include <addresstemplate.hxx>
 #include "addresstemplate.hrc"
-#include <svtools/svtools.hrc>
-#include <svtools/helpid.hrc>
-#include <svtools/svtresid.hxx>
+#include <svtools.hrc>
+#include <helpid.hrc>
+#include <svtresid.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/interaction.hxx>
@@ -47,7 +47,7 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-#include <svtools/localresaccess.hxx>
+#include <localresaccess.hxx>
 #include "svl/filenotation.hxx"
 #include <tools/urlobj.hxx>
 #include <algorithm>
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index 21a70661dd11..51b1b743c25f 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -28,7 +28,7 @@
 
 #include <toolkit/helper/vclunohelper.hxx>
 
-#include <svtools/colrdlg.hxx>
+#include <colrdlg.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 2ba079b0e2bb..795a58933241 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/insdlg.hxx>
-#include <svtools/sores.hxx>
-#include <svtools/svtresid.hxx>
+#include <insdlg.hxx>
+#include <sores.hxx>
+#include <svtresid.hxx>
 
 #include <unotools/configmgr.hxx>
 #include <comphelper/classids.hxx>
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index df83136ae848..1a311bc3b3d1 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/prnsetup.hxx>
-#include <svtools/svtools.hrc>
-#include <svtools/svtresid.hxx>
+#include <prnsetup.hxx>
+#include <svtools.hrc>
+#include <svtresid.hxx>
 #include <vcl/print.hxx>
 
 // =======================================================================
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
index 81655a5dc8c3..e17b932a8d14 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -15,7 +15,7 @@
 #include "com/sun/star/task/XInteractionHandler.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/XComponentContext.hpp"
-#include "svtools/restartdialog.hxx"
+#include "restartdialog.hxx"
 #include "tools/link.hxx"
 #include "vcl/button.hxx"
 #include "vcl/dialog.hxx"
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 3b785a04aff7..fdf9d89f2d6b 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include <svtools/roadmapwizard.hxx>
-#include <svtools/svtools.hrc>
-#include <svtools/svtresid.hxx>
-#include <svtools/roadmap.hxx>
+#include <roadmapwizard.hxx>
+#include <svtools.hrc>
+#include <svtresid.hxx>
+#include <roadmap.hxx>
 #include <tools/debug.hxx>
 
 #include <stdarg.h>
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 38775201b5ae..9b25679a0ef0 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/wizardmachine.hxx>
-#include <svtools/helpid.hrc>
+#include <wizardmachine.hxx>
+#include <helpid.hrc>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
-#include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtresid.hxx>
+#include <svtools.hrc>
 
 //.........................................................................
 namespace svt
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 1a9191af5855..8a8a970cdf83 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -20,7 +20,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/tabpage.hxx>
-#include <svtools/wizdlg.hxx>
+#include <wizdlg.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index 05cc7b46008a..d3df007d08d6 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include <svtools/svmedit.hxx>
+#include <svmedit.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/builder.hxx>
-#include <svtools/editsyntaxhighlighter.hxx>
+#include <editsyntaxhighlighter.hxx>
 #include <vcl/txtattr.hxx>
 
 
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 6a7c977c234c..4a455bea27d0 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -20,7 +20,7 @@
 
 
 #include "unoiface.hxx"
-#include <svtools/textwindowpeer.hxx>
+#include <textwindowpeer.hxx>
 
 
 
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
index 911c47f9c06c..45ba1f6fed91 100644
--- a/svtools/source/edit/svmedit2.cxx
+++ b/svtools/source/edit/svmedit2.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <svtools/svmedit2.hxx>
+#include <svmedit2.hxx>
 #include <vcl/xtextedt.hxx>
 
 ExtMultiLineEdit::ExtMultiLineEdit( Window* pParent, WinBits nWinStyle ) :
diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx
index bbe30dd9f894..4f7d65d8d6e6 100644
--- a/svtools/source/edit/textwindowpeer.cxx
+++ b/svtools/source/edit/textwindowpeer.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <svtools/textwindowpeer.hxx>
+#include <textwindowpeer.hxx>
 #include <vcl/textview.hxx>
 #include "svtaccessiblefactory.hxx"
 
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index c9e648b75940..103fbb899c10 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -25,8 +25,8 @@
 #include <tools/stream.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/FilterConfigItem.hxx>
-#include <svtools/svtools.hrc>
-#include <svtools/svtresid.hxx>
+#include <svtools.hrc>
+#include <svtresid.hxx>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx
index b7fffe7645ec..8c2bc12c590c 100644
--- a/svtools/source/graphic/graphicunofactory.cxx
+++ b/svtools/source/graphic/graphicunofactory.cxx
@@ -22,7 +22,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/graphic/XGraphicObject.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <svtools/grfmgr.hxx>
+#include <grfmgr.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx
index 33234ed7d5bb..0af9dea0839a 100644
--- a/svtools/source/graphic/grfattr.cxx
+++ b/svtools/source/graphic/grfattr.cxx
@@ -19,7 +19,7 @@
 
 
 #include <tools/vcompat.hxx>
-#include <svtools/grfmgr.hxx>
+#include <grfmgr.hxx>
 
 // ---------------
 // - GraphicAttr -
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index f0d462967ca5..fea0f916f6f5 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <salhelper/timer.hxx>
-#include <svtools/grfmgr.hxx>
+#include <grfmgr.hxx>
 #include <tools/debug.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 6577c0ef1d89..b146c0124353 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -31,7 +31,7 @@
 #include <vcl/cvtgrf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/grfmgr.hxx>
+#include <grfmgr.hxx>
 
 #include <vcl/pdfextoutdevdata.hxx>
 
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 45c368612b2c..6305e5b23189 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -28,7 +28,7 @@
 #include <vcl/alpha.hxx>
 #include <vcl/virdev.hxx>
 #include "grfcache.hxx"
-#include <svtools/grfmgr.hxx>
+#include <grfmgr.hxx>
 
 // -----------
 // - defines -
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 9bc54b915211..200a24fcb5a7 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -37,7 +37,7 @@
 
 #include "descriptor.hxx"
 #include "graphic.hxx"
-#include <svtools/grfmgr.hxx>
+#include <grfmgr.hxx>
 #include "provider.hxx"
 #include <vcl/dibtools.hxx>
 
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 95097fbe7bd1..6d8da70301f6 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -26,7 +26,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <svl/itemprop.hxx>
-#include <svtools/grfmgr.hxx>
+#include <grfmgr.hxx>
 #include <comphelper/servicehelper.hxx>
 #include "graphic.hxx"
 #include "renderer.hxx"