gnumake2: undo toolpanel header move

25 files changed, 55 insertions, 50 deletions

diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index 0944d0a491d6..c0f22768b473 100644
--- a/svl/Package_inc.mk
+++ b/svl/Package_inc.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/sharecontrolfile.hxx,svl/share
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/slstitm.hxx,svl/slstitm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/smplhint.hxx,svl/smplhint.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/solar.hrc,svl/solar.hrc))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svl.hrc,svl/svl.hrc))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/stritem.hxx,svl/stritem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hxx,svl/style.hxx))
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 38cd74c74a6f..b74e2fd022c5 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -26,12 +26,9 @@
 #*************************************************************************
 
 $(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx))
@@ -51,8 +48,11 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/decklayouter.hxx,svtools/toolpanel/decklayouter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/drawerlayouter.hxx,svtools/toolpanel/drawerlayouter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx))
@@ -63,10 +63,11 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/e
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx))
@@ -89,8 +90,8 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx))
@@ -108,12 +109,17 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svt
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/paneltabbar.hxx,svtools/toolpanel/paneltabbar.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupmenucontrollerbase.hxx,svtools/popupmenucontrollerbase.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupwindowcontroller.hxx,svtools/popupwindowcontroller.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/refbase.hxx,svtools/toolpanel/refbase.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx))
@@ -132,17 +138,21 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svt
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabalignment.hxx,svtools/toolpanel/tabalignment.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabitemcontent.hxx,svtools/toolpanel/tabitemcontent.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tablayouter.hxx,svtools/toolpanel/tablayouter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx))
@@ -160,7 +170,10 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textdata.hxx,svtools/t
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/texteng.hxx,svtools/texteng.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/textview.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolbarmenu.hxx,svtools/toolbarmenu.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpaneldeck.hxx,svtools/toolpanel/toolpaneldeck.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpanel.hxx,svtools/toolpanel/toolpanel.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx))
@@ -177,13 +190,4 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svto
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/decklayouter.hxx,svtools/decklayouter.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/refbase.hxx,svtools/refbase.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tablayouter.hxx,svtools/tablayouter.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/drawerlayouter.hxx,svtools/drawerlayouter.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabalignment.hxx,svtools/tabalignment.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpaneldeck.hxx,svtools/toolpaneldeck.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/paneltabbar.hxx,svtools/paneltabbar.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabitemcontent.hxx,svtools/tabitemcontent.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel.hxx,svtools/toolpanel.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xwindowitem.hxx,svtools/xwindowitem.hxx))
diff --git a/svtools/inc/svtools/decklayouter.hxx b/svtools/inc/svtools/toolpanel/decklayouter.hxx
index da03d7c6c3aa..da03d7c6c3aa 100755
--- a/svtools/inc/svtools/decklayouter.hxx
+++ b/svtools/inc/svtools/toolpanel/decklayouter.hxx
diff --git a/svtools/inc/svtools/drawerlayouter.hxx b/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
index 5174fa613697..0ecf493d0e98 100644
--- a/svtools/inc/svtools/drawerlayouter.hxx
+++ b/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
@@ -28,9 +28,9 @@
 #define SVT_DRAWERLAYOUTER_HXX
 
 #include "svtools/svtdllapi.h"
-#include "svtools/refbase.hxx"
-#include "svtools/toolpaneldeck.hxx"
-#include "svtools/decklayouter.hxx"
+#include "svtools/toolpanel/refbase.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpanel/decklayouter.hxx"
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/svtools/inc/svtools/paneltabbar.hxx b/svtools/inc/svtools/toolpanel/paneltabbar.hxx
index e499ce70ff6c..668935d8a739 100644
--- a/svtools/inc/svtools/paneltabbar.hxx
+++ b/svtools/inc/svtools/toolpanel/paneltabbar.hxx
@@ -28,8 +28,8 @@
 #define SVT_PANELTABBAR_HXX
 
 #include "svtools/svtdllapi.h"
-#include "svtools/tabalignment.hxx"
-#include "svtools/tabitemcontent.hxx"
+#include "svtools/toolpanel/tabalignment.hxx"
+#include "svtools/toolpanel/tabitemcontent.hxx"
 
 #include <vcl/ctrl.hxx>
 
diff --git a/svtools/inc/svtools/refbase.hxx b/svtools/inc/svtools/toolpanel/refbase.hxx
index 991d6e619090..991d6e619090 100644
--- a/svtools/inc/svtools/refbase.hxx
+++ b/svtools/inc/svtools/toolpanel/refbase.hxx
diff --git a/svtools/inc/svtools/tabalignment.hxx b/svtools/inc/svtools/toolpanel/tabalignment.hxx
index cc3f17469ffe..cc3f17469ffe 100644
--- a/svtools/inc/svtools/tabalignment.hxx
+++ b/svtools/inc/svtools/toolpanel/tabalignment.hxx
diff --git a/svtools/inc/svtools/tabitemcontent.hxx b/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
index a1cf9deae9f4..a1cf9deae9f4 100644
--- a/svtools/inc/svtools/tabitemcontent.hxx
+++ b/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
diff --git a/svtools/inc/svtools/tablayouter.hxx b/svtools/inc/svtools/toolpanel/tablayouter.hxx
index 2cd20bc7fcda..92b36acf9114 100755
--- a/svtools/inc/svtools/tablayouter.hxx
+++ b/svtools/inc/svtools/toolpanel/tablayouter.hxx
@@ -28,10 +28,10 @@
 #define SVT_TABLAYOUTER_HXX
 
 #include "svtools/svtdllapi.h"
-#include "svtools/decklayouter.hxx"
-#include "svtools/tabalignment.hxx"
-#include "svtools/tabitemcontent.hxx"
-#include "svtools/refbase.hxx"
+#include "svtools/toolpanel/decklayouter.hxx"
+#include "svtools/toolpanel/tabalignment.hxx"
+#include "svtools/toolpanel/tabitemcontent.hxx"
+#include "svtools/toolpanel/refbase.hxx"
 
 #include <memory>
 
diff --git a/svtools/inc/svtools/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx
index 084182231480..d38d8e7d257d 100644
--- a/svtools/inc/svtools/toolpanel.hxx
+++ b/svtools/inc/svtools/toolpanel/toolpanel.hxx
@@ -28,7 +28,7 @@
 #define SVT_TOOLPANEL_HXX
 
 #include "svtools/svtdllapi.h"
-#include "svtools/refbase.hxx"
+#include "svtools/toolpanel/refbase.hxx"
 
 #include <rtl/ustring.hxx>
 #include <vcl/image.hxx>
diff --git a/svtools/inc/svtools/toolpaneldeck.hxx b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
index 75d210c5ad2a..a1009591ffba 100755
--- a/svtools/inc/svtools/toolpaneldeck.hxx
+++ b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
@@ -28,8 +28,8 @@
 #define SVT_TOOLPANELDECK_HXX
 
 #include "svtools/svtdllapi.h"
-#include "svtools/toolpanel.hxx"
-#include "svtools/decklayouter.hxx"
+#include "svtools/toolpanel/toolpanel.hxx"
+#include "svtools/toolpanel/decklayouter.hxx"
 
 #include <vcl/ctrl.hxx>
 
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index 63b35f5835b7..7fc7d05ea0c9 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/drawerlayouter.hxx"
+#include "svtools/toolpanel/drawerlayouter.hxx"
 #include "toolpaneldrawer.hxx"
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx
index 0a3cb407a0b9..d2ca4480fce5 100644
--- a/svtools/source/toolpanel/dummypanel.hxx
+++ b/svtools/source/toolpanel/dummypanel.hxx
@@ -27,8 +27,8 @@
 #ifndef DUMMYPANEL_HXX
 #define DUMMYPANEL_HXX
 
-#include "svtools/toolpanel.hxx"
-#include "svtools/refbase.hxx"
+#include "svtools/toolpanel/toolpanel.hxx"
+#include "svtools/toolpanel/refbase.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/paneldecklisteners.cxx b/svtools/source/toolpanel/paneldecklisteners.cxx
index dc5407a79bb3..32ba9b5c6a24 100755
--- a/svtools/source/toolpanel/paneldecklisteners.cxx
+++ b/svtools/source/toolpanel/paneldecklisteners.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "paneldecklisteners.hxx"
-#include "svtools/toolpaneldeck.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/paneldecklisteners.hxx b/svtools/source/toolpanel/paneldecklisteners.hxx
index 8fb9414215f5..bc7e2ae7db88 100755
--- a/svtools/source/toolpanel/paneldecklisteners.hxx
+++ b/svtools/source/toolpanel/paneldecklisteners.hxx
@@ -27,7 +27,7 @@
 #ifndef PANELDECKLISTENERS_HXX
 #define PANELDECKLISTENERS_HXX
 
-#include "svtools/toolpaneldeck.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
 
 #include <boost/optional.hpp>
 #include <vector>
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index d0b52b577144..23067d3ee5d0 100755
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -26,8 +26,8 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/paneltabbar.hxx"
-#include "svtools/toolpaneldeck.hxx"
+#include "svtools/toolpanel/paneltabbar.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
 #include "svtools/svtdata.hxx"
 #include "svtools/svtools.hrc"
 
diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx
index 302c830a2253..d8329109ffb4 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.cxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "paneltabbarpeer.hxx"
-#include "svtools/paneltabbar.hxx"
+#include "svtools/toolpanel/paneltabbar.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/svtools/source/toolpanel/refbase.cxx b/svtools/source/toolpanel/refbase.cxx
index 309a87c2f436..f41aa2d9bb9c 100644
--- a/svtools/source/toolpanel/refbase.cxx
+++ b/svtools/source/toolpanel/refbase.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/refbase.hxx"
+#include "svtools/toolpanel/refbase.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/tabbargeometry.hxx b/svtools/source/toolpanel/tabbargeometry.hxx
index 97e460ff1397..059d69a3e233 100644
--- a/svtools/source/toolpanel/tabbargeometry.hxx
+++ b/svtools/source/toolpanel/tabbargeometry.hxx
@@ -27,7 +27,7 @@
 #ifndef TABBARGEOMETRY_HXX
 #define TABBARGEOMETRY_HXX
 
-#include "svtools/tabalignment.hxx"
+#include "svtools/toolpanel/tabalignment.hxx"
 
 #include "tabitemdescriptor.hxx"
 
diff --git a/svtools/source/toolpanel/tabitemdescriptor.hxx b/svtools/source/toolpanel/tabitemdescriptor.hxx
index 992f524cba94..8005816b0fe2 100644
--- a/svtools/source/toolpanel/tabitemdescriptor.hxx
+++ b/svtools/source/toolpanel/tabitemdescriptor.hxx
@@ -27,8 +27,8 @@
 #ifndef TABITEMDESCRIPTOR_HXX
 #define TABITEMDESCRIPTOR_HXX
 
-#include "svtools/toolpanel.hxx"
-#include "svtools/tabitemcontent.hxx"
+#include "svtools/toolpanel/toolpanel.hxx"
+#include "svtools/toolpanel/tabitemcontent.hxx"
 
 #include <tools/gen.hxx>
 #include <osl/diagnose.h>
diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx
index 377ef0477752..f68bbc1bbd0f 100755
--- a/svtools/source/toolpanel/tablayouter.cxx
+++ b/svtools/source/toolpanel/tablayouter.cxx
@@ -26,9 +26,9 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/tablayouter.hxx"
-#include "svtools/toolpaneldeck.hxx"
-#include "svtools/paneltabbar.hxx"
+#include "svtools/toolpanel/tablayouter.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpanel/paneltabbar.hxx"
 #include "svtaccessiblefactory.hxx"
 
 #include <tools/gen.hxx>
diff --git a/svtools/source/toolpanel/toolpanel.cxx b/svtools/source/toolpanel/toolpanel.cxx
index 128c3e2602e6..f7b999494563 100644
--- a/svtools/source/toolpanel/toolpanel.cxx
+++ b/svtools/source/toolpanel/toolpanel.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel.hxx"
+#include "svtools/toolpanel/toolpanel.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/toolpanelcollection.hxx b/svtools/source/toolpanel/toolpanelcollection.hxx
index 6f90469b543a..2bdba38546c9 100644
--- a/svtools/source/toolpanel/toolpanelcollection.hxx
+++ b/svtools/source/toolpanel/toolpanelcollection.hxx
@@ -27,7 +27,7 @@
 #ifndef TOOLPANELCOLLECTION_HXX
 #define TOOLPANELCOLLECTION_HXX
 
-#include "svtools/toolpaneldeck.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
 
 #include <memory>
 
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index 67003c441216..e157090bbf0e 100755
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -30,9 +30,9 @@
 #include "toolpanelcollection.hxx"
 #include "paneldecklisteners.hxx"
 #include "toolpaneldeckpeer.hxx"
-#include "svtools/toolpaneldeck.hxx"
-#include "svtools/tablayouter.hxx"
-#include "svtools/drawerlayouter.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpanel/tablayouter.hxx"
+#include "svtools/toolpanel/drawerlayouter.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
index 26e9bbc43b47..0a84a90b4fb3 100755
--- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "toolpaneldeckpeer.hxx"
-#include "svtools/toolpaneldeck.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/lang/DisposedException.hpp>