diff --git a/include/svtools/roadmap.hxx b/svtools/inc/roadmap.hxx
similarity index 100%
rename from include/svtools/roadmap.hxx
rename to svtools/inc/roadmap.hxx
diff --git a/include/svtools/table/defaultinputhandler.hxx b/svtools/inc/table/defaultinputhandler.hxx
similarity index 100%
rename from include/svtools/table/defaultinputhandler.hxx
rename to svtools/inc/table/defaultinputhandler.hxx
diff --git a/include/svtools/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx
similarity index 100%
rename from include/svtools/table/gridtablerenderer.hxx
rename to svtools/inc/table/gridtablerenderer.hxx
diff --git a/include/svtools/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
similarity index 100%
rename from include/svtools/table/tablecontrol.hxx
rename to svtools/inc/table/tablecontrol.hxx
diff --git a/include/svtools/table/tablecontrolinterface.hxx b/svtools/inc/table/tablecontrolinterface.hxx
similarity index 100%
rename from include/svtools/table/tablecontrolinterface.hxx
rename to svtools/inc/table/tablecontrolinterface.hxx
diff --git a/include/svtools/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx
similarity index 100%
rename from include/svtools/vclxaccessibleheaderbar.hxx
rename to svtools/inc/vclxaccessibleheaderbar.hxx
diff --git a/include/svtools/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx
similarity index 100%
rename from include/svtools/vclxaccessibleheaderbaritem.hxx
rename to svtools/inc/vclxaccessibleheaderbaritem.hxx
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index c569a16b8813..1b3970712db3 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svtools/headbar.hxx>
-#include <svtools/vclxaccessibleheaderbar.hxx>
+#include <vclxaccessibleheaderbar.hxx>
 #include <tools/debug.hxx>
 
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index cccb3cd732f2..11f65963e5f7 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>
 
 #include <vector>
 #include <algorithm>
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx
index 92fa5bde7838..9ec4012b9526 100644
--- a/svtools/source/control/vclxaccessibleheaderbar.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbar.cxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <svtools/vclxaccessibleheaderbar.hxx>
-#include <svtools/vclxaccessibleheaderbaritem.hxx>
+#include <vclxaccessibleheaderbar.hxx>
+#include <vclxaccessibleheaderbaritem.hxx>
 
 #include <toolkit/awt/vclxwindows.hxx>
 #include <svtools/headbar.hxx>
diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
index c6c0bc18e560..ca84d79d265c 100644
--- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <svtools/vclxaccessibleheaderbaritem.hxx>
+#include <vclxaccessibleheaderbaritem.hxx>
 
 #include <svtools/headbar.hxx>
 
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 8fad417ff008..c7c6666d4ba3 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -21,7 +21,7 @@
 #include <svtools/roadmapwizard.hxx>
 #include <svtools/svtools.hrc>
 #include <svtools/svtresid.hxx>
-#include <svtools/roadmap.hxx>
+#include <roadmap.hxx>
 #include <tools/debug.hxx>
 
 #include <stdarg.h>
diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index e4312489fb4a..ff006aa711a3 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "svtools/table/defaultinputhandler.hxx"
-#include "svtools/table/tablecontrolinterface.hxx"
+#include "table/defaultinputhandler.hxx"
+#include "table/tablecontrolinterface.hxx"
 
 #include "tabledatawindow.hxx"
 #include "mousefunction.hxx"
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index 2ec60b021fe1..776830457f06 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -19,7 +19,7 @@
 
 
 #include "cellvalueconversion.hxx"
-#include "svtools/table/gridtablerenderer.hxx"
+#include "table/gridtablerenderer.hxx"
 #include "svtools/colorcfg.hxx"
 
 #include <com/sun/star/graphic/XGraphic.hpp>
diff --git a/svtools/source/table/mousefunction.cxx b/svtools/source/table/mousefunction.cxx
index afb2eec89164..f921435c7901 100644
--- a/svtools/source/table/mousefunction.cxx
+++ b/svtools/source/table/mousefunction.cxx
@@ -19,7 +19,7 @@
 
 
 #include "mousefunction.hxx"
-#include "svtools/table/tablecontrolinterface.hxx"
+#include "table/tablecontrolinterface.hxx"
 
 #include <tools/diagnose_ex.h>
 #include <vcl/window.hxx>
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index b8d845144b26..b18d48ac436a 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svtools/table/tablecontrol.hxx"
+#include "table/tablecontrol.hxx"
 
 #include "tablegeometry.hxx"
 #include "tablecontrol_impl.hxx"
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 82d41e814d6c..9921ebb22ac7 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "svtools/table/tablecontrol.hxx"
-#include "svtools/table/defaultinputhandler.hxx"
+#include "table/tablecontrol.hxx"
+#include "table/defaultinputhandler.hxx"
 #include "svtools/table/tablemodel.hxx"
 
 #include "tabledatawindow.hxx"
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index e1a4921b9320..1da021f5e9b1 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVTOOLS_SOURCE_TABLE_TABLECONTROL_IMPL_HXX
 
 #include "svtools/table/tablemodel.hxx"
-#include "svtools/table/tablecontrolinterface.hxx"
+#include "table/tablecontrolinterface.hxx"
 
 #include "svtaccessiblefactory.hxx"
 
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index d867002a5c14..2d6e8373cf6d 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svtools/table/tablecontrol.hxx"
+#include "table/tablecontrol.hxx"
 
 #include "tabledatawindow.hxx"
 #include "tablecontrol_impl.hxx"
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 2f5d7da6ff90..e9c3f157501b 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -19,9 +19,9 @@
 
 #include "svtxgridcontrol.hxx"
 #include <com/sun/star/view/SelectionType.hpp>
-#include "svtools/table/tablecontrolinterface.hxx"
-#include "svtools/table/gridtablerenderer.hxx"
-#include "svtools/table/tablecontrol.hxx"
+#include "table/tablecontrolinterface.hxx"
+#include "table/gridtablerenderer.hxx"
+#include "table/tablecontrol.hxx"
 #include "unocontroltablemodel.hxx"
 #include <comphelper/sequence.hxx>
 #include <rtl/ref.hxx>
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index 929118275522..61d4c4361f70 100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVTOOLS_SOURCE_UNO_SVTXGRIDCONTROL_HXX
 
 #include <unocontroltablemodel.hxx>
-#include <svtools/table/tablecontrol.hxx>
+#include <table/tablecontrol.hxx>
 #include <com/sun/star/awt/grid/XGridControl.hpp>
 #include <com/sun/star/awt/grid/XGridRowSelection.hpp>
 #include <com/sun/star/awt/grid/XGridDataListener.hpp>
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index 10e94d7238ab..16e7507b87d8 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -20,9 +20,9 @@
 #include "unocontroltablemodel.hxx"
 #include "unogridcolumnfacade.hxx"
 
-#include "svtools/table/defaultinputhandler.hxx"
-#include "svtools/table/gridtablerenderer.hxx"
-#include "svtools/table/tablecontrol.hxx"
+#include "table/defaultinputhandler.hxx"
+#include "table/gridtablerenderer.hxx"
+#include "table/tablecontrol.hxx"
 
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
 #include <com/sun/star/view/SelectionType.hpp>
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index 106f69173861..acf2fbfbc639 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVTOOLS_SOURCE_UNO_UNOCONTROLTABLEMODEL_HXX
 
 #include "svtools/table/tablemodel.hxx"
-#include "svtools/table/tablecontrol.hxx"
+#include "table/tablecontrol.hxx"
 
 #include <com/sun/star/awt/grid/XGridControl.hpp>
 #include <com/sun/star/awt/grid/GridDataEvent.hpp>
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index 7d281ed2cc64..3acf350a7a38 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -20,9 +20,9 @@
 #include "unogridcolumnfacade.hxx"
 #include "unocontroltablemodel.hxx"
 
-#include "svtools/table/defaultinputhandler.hxx"
-#include "svtools/table/gridtablerenderer.hxx"
-#include "svtools/table/tablecontrol.hxx"
+#include "table/defaultinputhandler.hxx"
+#include "table/gridtablerenderer.hxx"
+#include "table/tablecontrol.hxx"
 
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
 #include <com/sun/star/view/SelectionType.hpp>
diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx
index d05db1564f20..f66af43929cb 100644
--- a/svtools/source/uno/unogridcolumnfacade.hxx
+++ b/svtools/source/uno/unogridcolumnfacade.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVTOOLS_SOURCE_UNO_UNOGRIDCOLUMNFACADE_HXX
 
 #include "svtools/table/tablemodel.hxx"
-#include "svtools/table/tablecontrol.hxx"
+#include "table/tablecontrol.hxx"
 
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 675ffd5f281e..3dcaaf65bfad 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -25,7 +25,7 @@
 #include <svtools/svmedit.hxx>
 #include <unoiface.hxx>
 #include <svtools/filectrl.hxx>
-#include <svtools/roadmap.hxx>
+#include <roadmap.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/awt/LineEndFormat.hpp>
@@ -38,7 +38,7 @@
 #include <svtools/treelistbox.hxx>
 #include "treecontrolpeer.hxx"
 #include "svtxgridcontrol.hxx"
-#include <svtools/table/tablecontrol.hxx>
+#include <table/tablecontrol.hxx>
 
 namespace
 {