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

This reverts commit 1cbdcc31b8a921c508f2fdf09847f64d004a7faa.

Sadly this was going in the wrong direction...

41 files changed, 111 insertions, 111 deletions

diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 53e6bd9f0939..a93d65bf12e0 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -18,9 +18,9 @@
  */
 
 #include <tools/debug.hxx>
-#include <brwbox.hxx>
+#include <svtools/brwbox.hxx>
 #include "datwin.hxx"
-#include <colorcfg.hxx>
+#include <svtools/colorcfg.hxx>
 #include <vcl/salgtype.hxx>
 
 #include <tools/multisel.hxx>
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 7c93f140a5c5..7b511c0e961d 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <brwbox.hxx>
-#include <AccessibleBrowseBoxObjType.hxx>
+#include <svtools/brwbox.hxx>
+#include <svtools/AccessibleBrowseBoxObjType.hxx>
 #include <tools/debug.hxx>
 #include <tools/multisel.hxx>
 #include "datwin.hxx"
diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index 76c7acd9a369..d3b7a7e9d0f9 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include <brwhead.hxx>
-#include <brwbox.hxx>
+#include <svtools/brwhead.hxx>
+#include <svtools/brwbox.hxx>
 
 //===================================================================
 
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index b18627a910ff..b66822750d16 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -20,11 +20,11 @@
 #ifndef _SFXDATWIN_HXX
 #define _SFXDATWIN_HXX
 
-#include <brwbox.hxx>
-#include <brwhead.hxx>
+#include <svtools/brwbox.hxx>
+#include <svtools/brwhead.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/image.hxx>
-#include <transfer.hxx>
+#include <svtools/transfer.hxx>
 #include <vector>
 
 //===================================================================
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index b826732b9d83..7e68ebf434c2 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editbrowsebox.hxx>
+#include <svtools/editbrowsebox.hxx>
 #include <vcl/decoview.hxx>
-#include <fmtfield.hxx>
+#include <svtools/fmtfield.hxx>
 #include <vcl/xtextedt.hxx>
 
 #include <algorithm>
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 26d3127b1734..9e0ab710991a 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editbrowsebox.hxx>
+#include <svtools/editbrowsebox.hxx>
 
 #include "editbrowsebox.hrc"
 
@@ -28,9 +28,9 @@
 #include <vcl/edit.hxx>
 #include <tools/resid.hxx>
 #include <vcl/spinfld.hxx>
-#include <svtresid.hxx>
+#include <svtools/svtresid.hxx>
 
-#include <svtools.hrc>
+#include <svtools/svtools.hrc>
 
 #include <algorithm>
 #include <tools/multisel.hxx>
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 7b318a8e5999..b5e9b80664c3 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editbrowsebox.hxx>
+#include <svtools/editbrowsebox.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include "editbrowseboximpl.hxx"
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index daecf54e4836..6ba0a24574bb 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <accessibilityoptions.hxx>
+#include <svtools/accessibilityoptions.hxx>
 
 #include <unotools/configmgr.hxx>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 7a6c44ab03f8..f2dbec06358c 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <colorcfg.hxx>
+#include <svtools/colorcfg.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 7390e21e4641..eb189e46fe01 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <fontsubstconfig.hxx>
+#include <svtools/fontsubstconfig.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 9c8ec2b505b3..aa1a87402e55 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <helpopt.hxx>
+#include <svtools/helpopt.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 37e8501326a2..f3f2e7d03158 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include <htmlcfg.hxx>
-#include <parhtml.hxx>
+#include <svtools/htmlcfg.hxx>
+#include <svtools/parhtml.hxx>
 #include <unotools/syslocale.hxx>
 #include <tools/debug.hxx>
 #include <tools/link.hxx>
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index ae06e591c699..856125f4a8d2 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -24,15 +24,15 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 
-#include <accessibilityoptions.hxx>
-#include <apearcfg.hxx>
-#include <menuoptions.hxx>
-#include <colorcfg.hxx>
-#include <fontsubstconfig.hxx>
-#include <helpopt.hxx>
-#include <printoptions.hxx>
+#include <svtools/accessibilityoptions.hxx>
+#include <svtools/apearcfg.hxx>
+#include <svtools/menuoptions.hxx>
+#include <svtools/colorcfg.hxx>
+#include <svtools/fontsubstconfig.hxx>
+#include <svtools/helpopt.hxx>
+#include <svtools/printoptions.hxx>
 #include <unotools/options.hxx>
-#include <miscopt.hxx>
+#include <svtools/miscopt.hxx>
 
 
 #include <tools/debug.hxx>
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 813d85291f18..1a320b18e4ab 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <menuoptions.hxx>
+#include <svtools/menuoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 2a4cb2a786b7..fc5aac873a2e 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <miscopt.hxx>
+#include <svtools/miscopt.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -28,7 +28,7 @@
 #include <rtl/instance.hxx>
 #include "itemholder2.hxx"
 
-#include <imgdef.hxx>
+#include <svtools/imgdef.hxx>
 #include <vcl/svapp.hxx>
 
 #include <list>
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 150e2bd34389..31a84c28e4e6 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -21,7 +21,7 @@
 #pragma hdrstop
 #endif
 
-#include <optionsdrawinglayer.hxx>
+#include <svtools/optionsdrawinglayer.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 87a6e498b30e..f75866f38cc5 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <printoptions.hxx>
+#include <svtools/printoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <vcl/print.hxx>
diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx
index 0faf9f482f2d..9ef89c8191ed 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <slidesorterbaropt.hxx>
+#include <svtools/slidesorterbaropt.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx
index 3b08ef07a724..7c527356d5b8 100644
--- a/svtools/source/config/toolpanelopt.cxx
+++ b/svtools/source/config/toolpanelopt.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <toolpanelopt.hxx>
+#include <svtools/toolpanelopt.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -28,7 +28,7 @@
 #include <rtl/instance.hxx>
 #include "itemholder2.hxx"
 
-#include <imgdef.hxx>
+#include <svtools/imgdef.hxx>
 #include <vcl/svapp.hxx>
 
 #include <list>
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 96c6af4b0afe..2a546077986b 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -28,7 +28,7 @@
 #include "rtl/ustring.hxx"
 #include "svl/inettype.hxx"
 #include "svtools/DocumentInfoPreview.hxx"
-#include "imagemgr.hxx"
+#include "svtools/imagemgr.hxx"
 #include "vcl/txtattr.hxx"
 #include "tools/datetime.hxx"
 #include "tools/urlobj.hxx"
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 4372fb42e418..39e337381775 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "contentenumeration.hxx"
-#include <inettbc.hxx>
-#include <imagemgr.hxx>
+#include <svtools/inettbc.hxx>
+#include <svtools/imagemgr.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 2f7ae829a111..f8104b65e2e2 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -19,17 +19,17 @@
 
 #include "fileview.hxx"
 #include "sal/config.h"
-#include "treelistentry.hxx"
+#include "svtools/treelistentry.hxx"
 #include <svtools/fileview.hxx>
-#include <svtresid.hxx>
-#include <imagemgr.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/imagemgr.hxx>
 #include <svtools/headbar.hxx>
-#include <svtabbx.hxx>
-#include <svtools.hrc>
-#include "viewdataentry.hxx"
+#include <svtools/svtabbx.hxx>
+#include <svtools/svtools.hrc>
+#include "svtools/viewdataentry.hxx"
 #include "fileview.hrc"
 #include "contentenumeration.hxx"
-#include <AccessibleBrowseBoxObjType.hxx>
+#include <svtools/AccessibleBrowseBoxObjType.hxx>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index a98fb5407d80..d43999895881 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -29,7 +29,7 @@
 
 #include <limits.h>
 
-#include <ivctrl.hxx>
+#include <svtools/ivctrl.hxx>
 #include <boost/ptr_container/ptr_map.hpp>
 
 class IcnCursor_Impl;
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 06240496b075..f1e5084e06c9 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -30,9 +30,9 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/controllayout.hxx>
 
-#include <ivctrl.hxx>
+#include <svtools/ivctrl.hxx>
 #include "imivctl.hxx"
-#include <svmedit.hxx>
+#include <svtools/svmedit.hxx>
 
 #include <algorithm>
 #include <memory>
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index a48bb0d244e7..36ecadc0a264 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <ivctrl.hxx>
+#include <svtools/ivctrl.hxx>
 #include "imivctl.hxx"
 #include <vcl/bitmapex.hxx>
 #include <vcl/controllayout.hxx>
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index e251f33af1bb..8070d9ccef7f 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -18,9 +18,9 @@
  */
 
 #include <comphelper/processfactory.hxx>
-#include <simptabl.hxx>
-#include <svlbitm.hxx>
-#include <treelistentry.hxx>
+#include <svtools/simptabl.hxx>
+#include <svtools/svlbitm.hxx>
+#include <svtools/treelistentry.hxx>
 #include <unotools/intlwrapper.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 275706f58950..f950f0effc4d 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -23,18 +23,18 @@
 
 #include <stack>
 
-#include <treelistbox.hxx>
-#include <svlbitm.hxx>
+#include <svtools/treelistbox.hxx>
+#include <svtools/svlbitm.hxx>
 #include <svimpbox.hxx>
 #include <rtl/instance.hxx>
-#include <svtresid.hxx>
+#include <svtools/svtresid.hxx>
 #include <tools/wintypes.hxx>
-#include <svtools.hrc>
+#include <svtools/svtools.hrc>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 
-#include "treelistentry.hxx"
-#include "viewdataentry.hxx"
+#include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 
 #define NODE_BMP_TABDIST_NOTVALID   -2000000
 #define FIRST_ENTRY_TAB             1
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 702d1102fed1..ca3b3423659d 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <treelistbox.hxx>
-#include <svlbitm.hxx>
-#include "treelistentry.hxx"
-#include "viewdataentry.hxx"
+#include <svtools/treelistbox.hxx>
+#include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/button.hxx>
 #include <vcl/decoview.hxx>
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 30ecd6de567f..0a0de29d2008 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtabbx.hxx>
-#include <headbar.hxx>
-#include <svtresid.hxx>
-#include <svlbitm.hxx>
-#include <svtools.hrc>
-#include <treelistentry.hxx>
+#include <svtools/svtabbx.hxx>
+#include <svtools/headbar.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/svlbitm.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/treelistentry.hxx>
 #include <vcl/builder.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index aa32615788d2..ec99e649f140 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -18,22 +18,22 @@
  */
 
 #include "templwin.hxx"
-#include <templdlg.hxx>
-#include <svtresid.hxx>
-#include <langhelp.hxx>
+#include <svtools/templdlg.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/langhelp.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/dynamicmenuoptions.hxx>
 #include <unotools/extendedsecurityoptions.hxx>
 #include <vcl/xtextedt.hxx>
 #include <svl/inettype.hxx>
-#include <imagemgr.hxx>
-#include <miscopt.hxx>
-#include <templatefoldercache.hxx>
-#include <imgdef.hxx>
+#include <svtools/imagemgr.hxx>
+#include <svtools/miscopt.hxx>
+#include <svtools/templatefoldercache.hxx>
+#include <svtools/imgdef.hxx>
 #include <vcl/txtattr.hxx>
-#include <svtools.hrc>
+#include <svtools/svtools.hrc>
 #include "templwin.hrc"
-#include <helpid.hrc>
+#include <svtools/helpid.hrc>
 #include <unotools/viewoptions.hxx>
 #include <unotools/ucbhelper.hxx>
 #include "unotools/configmgr.hxx"
@@ -74,7 +74,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/split.hxx>
 #include <vcl/msgbox.hxx>
-#include <DocumentInfoPreview.hxx>
+#include <svtools/DocumentInfoPreview.hxx>
 #include <vcl/mnemonic.hxx>
 
 #include <ucbhelper/content.hxx>
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index 71c906a162f7..19cdfc1a5385 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -25,8 +25,8 @@
 #include <vcl/window.hxx>
 #include <svtools/headbar.hxx>
 #include <svtools/fileview.hxx>
-#include <ivctrl.hxx>
-#include <svmedit2.hxx>
+#include <svtools/ivctrl.hxx>
+#include <svtools/svmedit2.hxx>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index fdd779d79318..55beae96826a 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "treelist.hxx"
-#include "treelistentry.hxx"
-#include "viewdataentry.hxx"
+#include "svtools/treelist.hxx"
+#include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 #include "osl/diagnose.h"
 
 #include <stdio.h>
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index ef0625ea6907..45e8317f6ba7 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -23,7 +23,7 @@
         - SelectAll( sal_False ) => only repaint the delselected entries
 */
 
-#include <treelistbox.hxx>
+#include <svtools/treelistbox.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <vcl/svapp.hxx>
 #include <vcl/accel.hxx>
@@ -34,10 +34,10 @@
 #include <rtl/instance.hxx>
 #include <comphelper/string.hxx>
 
-#include <svmedit.hxx>
-#include <svlbitm.hxx>
-#include "treelistentry.hxx"
-#include "viewdataentry.hxx"
+#include <svtools/svmedit.hxx>
+#include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 #include "svimpbox.hxx"
 
 #include <set>
diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx
index 5680bdad5341..5a97b097819b 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "treelistentry.hxx"
-#include "treelist.hxx"
+#include "svtools/treelistentry.hxx"
+#include "svtools/treelist.hxx"
 
 #include <limits>
 
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 44b321b34618..06ba46349cf2 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "viewdataentry.hxx"
+#include "svtools/viewdataentry.hxx"
 
 #include "tools/debug.hxx"
 
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 582c2f03aa9b..a222fb42dfc6 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <asynclink.hxx>
+#include <svtools/asynclink.hxx>
 #include <osl/mutex.hxx>
 #include <tools/debug.hxx>
 #include <vcl/timer.hxx>
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 0dea0c50e22c..0955133a70e9 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -33,9 +33,9 @@
 #include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 
-#include <svtools.hrc>
-#include <svtresid.hxx>
-#include <calendar.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/svtresid.hxx>
+#include <svtools/calendar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index 4255bffd96b3..cc2d73062955 100644
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include <svtresid.hxx>
-#include <svtools.hrc>
-#include <collatorres.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/collatorres.hxx>
 
 // -------------------------------------------------------------------------
 //
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 39049e2d2a46..7de9b71e96eb 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -27,12 +27,12 @@
 #include <comphelper/string.hxx>
 #include <unotools/charclass.hxx>
 
-#include <sampletext.hxx>
-#include <svtresid.hxx>
-#include <svtools.hrc>
-#include <ctrlbox.hxx>
-#include <ctrltool.hxx>
-#include <borderhelper.hxx>
+#include <svtools/sampletext.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/ctrlbox.hxx>
+#include <svtools/ctrltool.hxx>
+#include <svtools/borderhelper.hxx>
 
 #include <vcl/i18nhelp.hxx>
 #include <vcl/fontcapabilities.hxx>
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 026dc945548c..877e39012b12 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -26,9 +26,9 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <sal/macros.h>
-#include <svtools.hrc>
-#include <svtresid.hxx>
-#include <ctrltool.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/svtresid.hxx>
+#include <svtools/ctrltool.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 6d82f3e62980..f605f8a8ab59 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtresid.hxx>
-#include <filectrl.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/filectrl.hxx>
 #include <filectrl.hrc>
 
 // =======================================================================