drop some unnecessary includes

Change-Id: I474b5762e6a07982fddc0315a67181399ea4c30e
Reviewed-on: https://gerrit.libreoffice.org/64156
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

73 files changed, 18 insertions, 109 deletions

diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index fb34de153aa8..1296d57d1673 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -24,7 +24,6 @@
 #include <basidesh.hxx>
 
 #include <sfx2/dispatch.hxx>
-#include <vcl/lstbox.hxx>
 
 namespace basctl
 {
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 4dbc6dce8a93..2ce9b4e3ce4c 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -26,7 +26,6 @@
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index 1f2f60c277a6..50471323f93f 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -29,7 +29,6 @@
 #include <vcl/combobox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/image.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 166c43d7264a..4c626059e6e2 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -33,7 +33,6 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/svtabbx.hxx>
 #include <vcl/treelistbox.hxx>
 #include <sfx2/tabdlg.hxx>
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 1f5257e9d2c1..374a57c7e25a 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -35,16 +35,11 @@
 #define ALIGNDLG_VERALIGN_BLOCK       4
 #define ALIGNDLG_VERALIGN_DISTRIBUTED 5
 
-
-#include <vcl/field.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svtools/valueset.hxx>
 #include <svx/dialcontrol.hxx>
 #include <svx/frmdirlbox.hxx>
+#include <vcl/weld.hxx>
 
 namespace svx {
 
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 4cf04050475a..0fe406e7c722 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -21,7 +21,6 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/weld.hxx>
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 1928fe344814..b37457249d69 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -19,11 +19,6 @@
 #ifndef INCLUDED_CUI_SOURCE_INC_CUICHARMAP_HXX
 #define INCLUDED_CUI_SOURCE_INC_CUICHARMAP_HXX
 
-#include <vcl/ctrl.hxx>
-#include <vcl/metric.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 0bd2e64f13bf..2e6f6fc2069e 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -24,7 +24,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/edit.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/fixedhyper.hxx>
 
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 7f233847fee7..68221259ba23 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -24,13 +24,11 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svl/macitem.hxx>
-#include <vcl/lstbox.hxx>
+#include <vcl/weld.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <memory>
 
 class SfxMacroTabPage_;
-class SvTabListBox;
-class SvTreeListBox;
 class SfxMacroTabPage_Impl;
 
 class SfxMacroTabPage final : public SfxTabPage
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 1144dc3d1898..5950a1ef3fa5 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <svl/macitem.hxx>
-#include <vcl/lstbox.hxx>
 #include <rtl/ustring.hxx>
 
 #include <unordered_map>
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index ea9ade6ac059..6df7608552e1 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_CUI_SOURCE_INC_MULTIPAT_HXX
 
 #include <vcl/dialog.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 932c7d9000a8..2b2bc55763e9 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -21,7 +21,7 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <svx/svdattr.hxx>
-#include <vcl/lstbox.hxx>
+#include <vcl/weld.hxx>
 
 class SdrView;
 
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 396cf63a20b7..712e99d04845 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -26,7 +26,6 @@
 #include <ucbhelper/content.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/weld.hxx>
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index f7d62eb831c7..de289d23341f 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -24,7 +24,6 @@
 #include <sfx2/tabdlg.hxx>
 #include <svtools/simptabl.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
 
 class SvxOpenCLTabPage : public SfxTabPage
 {
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 0915c666c0fa..5c92afaa74d1 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -82,7 +82,6 @@
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 
 #include <unotools/closeveto.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 841a90963d04..6d4dd7a9650d 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -61,7 +61,6 @@
 #include <listviewitems.hxx>
 #include "AppDetailView.hxx"
 #include <linkeddocuments.hxx>
-#include <vcl/lstbox.hxx>
 #include <connectivity/dbtools.hxx>
 #include <sqlmessage.hxx>
 #include <dbexchange.hxx>
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index ca3641fb6838..62f58c15248d 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_APP_APPSWAPWINDOW_HXX
 
 #include <IClipBoardTest.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/vclptr.hxx>
 #include "AppIconControl.hxx"
 #include <AppElementType.hxx>
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index f311325fe6b5..212d161bda43 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -28,7 +28,6 @@
 #include <svtools/roadmapwizard.hxx>
 #include <vcl/field.hxx>
 #include <rtl/ustring.hxx>
-#include <vcl/lstbox.hxx>
 
 namespace dbaui
 
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 43c6fbf3f32b..af7b586e8cff 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -38,7 +38,6 @@
 #include <vcl/button.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 
 #include <algorithm>
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 7db1e618dd2f..a285c733a2f0 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -25,7 +25,6 @@
 
 #include <svtools/dialogcontrolling.hxx>
 
-#include <vcl/lstbox.hxx>
 #include <vcl/field.hxx>
 
 #include <vector>
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index e5ab8cb68fbb..b476f2cad65f 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -25,7 +25,6 @@
 #include <charsetlistbox.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/button.hxx>
 #include "TextConnectionHelper.hxx"
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index 29666214237d..f4710a55142a 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -24,7 +24,6 @@
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
 #include "tabletree.hxx"
 
 namespace dbaui
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 42999baa3fdf..ab7311b6b2ea 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 795e7e6a7eab..092714bd514a 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -56,7 +56,6 @@
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <vcl/lstbox.hxx>
 #include <vcl/waitobj.hxx>
 
 #include <functional>
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 045406e49864..95039c6d012c 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 
-#include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <tools/debug.hxx>
 #include "bibbeam.hxx"
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 2d09a2910214..de0895795088 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/sdbc/XRowSetListener.hpp>
 
 #include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
 #include <svtools/svmedit.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/combobox.hxx>
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index dd53fa908634..a6c962d75205 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -32,8 +32,9 @@
 #include <tools/diagnose_ex.h>
 #include <comphelper/asyncnotification.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
 
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index d5a2aa64e85e..473301dcda2d 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/inspection/XPropertyControl.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <vcl/scrbar.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
 #include <tools/link.hxx>
 #include <rtl/ref.hxx>
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index 6d293997814e..50756980bdcd 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -28,7 +28,6 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
 
 namespace pcr
 {
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index b5469edc0081..adfe4e210f2d 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -25,7 +25,6 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/idle.hxx>
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 292785bc3a2f..e2dff8d76467 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX
 
 #include <svtools/svmedit.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index dc7b53a40b16..17700aa08fd0 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_STRUCTPG_HXX
 #define INCLUDED_FORMULA_SOURCE_UI_DLG_STRUCTPG_HXX
 
-#include <vcl/lstbox.hxx>
 #include <svtools/svmedit.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 2efcf4133195..a19f55c9319f 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -23,7 +23,6 @@
 #include <unotools/resmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/eitem.hxx>
 #include <unotools/viewoptions.hxx>
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index 67b72a6be2b8..c8721758627a 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/frame/ControlCommand.hpp>
 
 #include <uielement/complextoolbarcontroller.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/vclptr.hxx>
 
 class ToolBox;
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 0b2f951bdf33..fc8e43bd1440 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -25,6 +25,7 @@
 #include <svtools/toolboxcontroller.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
+#include <vcl/lstbox.hxx>
 #include <vcl/toolbox.hxx>
 
 using namespace ::com::sun::star;
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 3d88a8a524b3..8433237da033 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -19,12 +19,9 @@
 #ifndef INCLUDED_SFX2_MGETEMPL_HXX
 #define INCLUDED_SFX2_MGETEMPL_HXX
 
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/vclmedit.hxx>
 #include <sfx2/styfitem.hxx>
 #include <sfx2/tabdlg.hxx>
+#include <vcl/weld.hxx>
 #include <memory>
 
 /* expected:
diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx
index 8f925de475ae..29c2534c331f 100644
--- a/include/svtools/foldertree.hxx
+++ b/include/svtools/foldertree.hxx
@@ -23,7 +23,6 @@
 #include <ucbhelper/commandenvironment.hxx>
 
 #include <vcl/image.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/treelistentry.hxx>
 
 using namespace ::com::sun::star::ucb;
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 16eda958e21c..8d60b8f4fc27 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -23,7 +23,6 @@
 #include <vcl/graph.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/combobox.hxx>
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index 995e86418eba..25b0116b853f 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -30,7 +30,6 @@
 #include <svx/svxids.hrc>
 #include <svx/pageitem.hxx>
 #include <vcl/menubtn.hxx>
-#include <vcl/lstbox.hxx>
 
 ScHFEditDlg::ScHFEditDlg( vcl::Window*           pParent,
                           const SfxItemSet& rCoreSet,
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index a446914b6c57..c99b660735db 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -23,7 +23,6 @@
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/combobox.hxx>
 #include <svtools/svmedit.hxx>
 #include <svl/intitem.hxx>
 #include <svl/aeitem.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index d8b2baa6e533..072d7229ea97 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -46,7 +46,6 @@
 #include <vcl/layout.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/decoview.hxx>
-#include <vcl/combobox.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index ab695076ddc2..6c1c5a2ee9a8 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -47,7 +47,6 @@
 #include <vcl/fixed.hxx>
 
 #include <vcl/button.hxx>
-#include <vcl/combobox.hxx>
 #include <vcl/scrbar.hxx>
 
 #include <comphelper/sequence.hxx>
diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx
index b01640be56ca..7dfbc8a11f3c 100644
--- a/sd/source/ui/dlg/RemoteDialog.hxx
+++ b/sd/source/ui/dlg/RemoteDialog.hxx
@@ -9,12 +9,8 @@
 #ifndef INCLUDED_SD_SOURCE_UI_DLG_REMOTEDIALOG_HXX
 #define INCLUDED_SD_SOURCE_UI_DLG_REMOTEDIALOG_HXX
 
-#include <vcl/lstbox.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
-#include <vcl/field.hxx>
-#include <vcl/treelistbox.hxx>
 
 #include "RemoteDialogClientBox.hxx"
 
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 6f3e6464d15d..6abcb1716fda 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -28,7 +28,6 @@
 #include <sfx2/viewfrm.hxx>
 
 #include <vcl/button.hxx>
-#include <vcl/combobox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index ec42fdf1e928..f4b406d1300d 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -23,7 +23,6 @@
 
 #include <svtools/PlaceEditDialog.hxx>
 #include <svtools/ServerDetailsControls.hxx>
-#include <vcl/lstbox.hxx>
 
 #include <config_oauth2.h>
 
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 196ff7dfad6f..b71de0299855 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVX_INC_GALBRWS2_HXX
 #define INCLUDED_SVX_INC_GALBRWS2_HXX
 
-#include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/timer.hxx>
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 1797a6f3f7d4..2806d52a4740 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -18,14 +18,12 @@
  */
 
 #include "dlgunit.hxx"
-#include <vcl/fixed.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/slider.hxx>
+#include <vcl/weld.hxx>
 #include <svx/strings.hrc>
 #include <svx/svdograf.hxx>
 #include <svx/sdgcpitm.hxx>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index dcad04db9fe8..82aa9ac843c3 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -21,7 +21,6 @@
 #include <vcl/errinf.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <vcl/lstbox.hxx>
 #include <svl/eitem.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/dispatch.hxx>
@@ -37,6 +36,7 @@
 #include <sfx2/docfile.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 #include <svx/imapdlg.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 81d7d73cd3cb..5e177241adcd 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -31,7 +31,6 @@
 #include <comphelper/processfactory.hxx>
 #include <osl/thread.h>
 #include <tools/vcompat.hxx>
-#include <vcl/lstbox.hxx>
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <unotools/configmgr.hxx>
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 79b00202abad..f782081b30a1 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -56,7 +56,6 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <galobj.hxx>
 #include <svx/gallery1.hxx>
-#include <vcl/lstbox.hxx>
 #include "gallerydrawmodel.hxx"
 #include <memory>
 
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 1ea655b733a6..2c557f7bfcb4 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -34,7 +34,6 @@
 #include <svx/xlndsit.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/xlnwtit.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/toolbox.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xlnstit.hxx>
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
index bd54b58831d3..3111d5e3aa0e 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
@@ -18,7 +18,6 @@
 #include <sfx2/sidebar/ControllerItem.hxx>
 #include <svx/sidebar/PanelLayout.hxx>
 #include <svl/intitem.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/field.hxx>
 #include <com/sun/star/ui/XUIElement.hpp>
 #include <sfx2/request.hxx>
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index acbbac52f21e..7e930d4a9503 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -25,7 +25,6 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/lstbox.hxx>
 #include <svl/itempool.hxx>
 #include <helpids.h>
 
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index b79c721ba593..e3cfd14e3e66 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -35,7 +35,6 @@
 #include <hints.hxx>
 
 #include <vcl/svapp.hxx>
-#include <vcl/lstbox.hxx>
 
 #include <swuiccoll.hxx>
 
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index 393a5503eec7..87d2d72fe842 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.hxx
@@ -22,7 +22,6 @@
 #include <sfx2/basedlgs.hxx>
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 #include <vector>
 
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index 7df623622550..9c32032d13bd 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -18,11 +18,9 @@
  */
 #ifndef INCLUDED_SW_SOURCE_UI_DBUI_CUSTOMIZEADDRESSLISTDIALOG_HXX
 #define INCLUDED_SW_SOURCE_UI_DBUI_CUSTOMIZEADDRESSLISTDIALOG_HXX
-#include <sfx2/basedlgs.hxx>
 
-#include <vcl/button.hxx>
-#include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
+#include <sfx2/basedlgs.hxx>
+#include <vcl/weld.hxx>
 
 struct SwCSVData;
 
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 0ec9436aaab6..734f5cb58597 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -25,13 +25,14 @@
 #include <vcl/txtattr.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/treelistentry.hxx>
 #include <mmconfigitem.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
 #include <comphelper/string.hxx>
-#include <vcl/treelistentry.hxx>
 #include <sal/log.hxx>
 
 #include <vector>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 3033f7ef6518..4c8560988517 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -25,7 +25,6 @@
 #include <sfx2/basedlgs.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
 #include <svtools/svmedit.hxx>
 #include <vcl/headbar.hxx>
 #include <vcl/treelistbox.hxx>
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index 7411d29f91fd..eb94f9583006 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -21,8 +21,8 @@
 
 #include <svtools/wizardmachine.hxx>
 #include <mailmergehelper.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
+#include <vcl/weld.hxx>
+
 class SwMailMergeWizard;
 
 class SwMailMergeDocSelectPage : public svt::OWizardPage
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index f45cfdcdf20b..6342200ef316 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -21,11 +21,9 @@
 
 #include <svtools/wizardmachine.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/combobox.hxx>
 #include <mailmergehelper.hxx>
 #include <svtools/svmedit.hxx>
+#include <vcl/weld.hxx>
 
 class SwMailMergeWizard;
 
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 01709ead04f2..a0e1346ceb80 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -21,9 +21,7 @@
 #include <svtools/wizardmachine.hxx>
 #include <vcl/button.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/combobox.hxx>
 #include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/prgsbar.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 1f0f66fadb3c..0a6b070842a0 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -21,7 +21,6 @@
 
 #include <srtdlg.hxx>
 
-#include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index a52a59f38f30..6331e5a1d08d 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -48,7 +48,6 @@
 #include <swerror.h>
 #include <frmmgr.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/lstbox.hxx>
 
 #include <editeng/acorrcfg.hxx>
 #include <sfx2/event.hxx>
diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx
index 1a1fb115ba12..2a4af0693104 100644
--- a/sw/source/uibase/inc/ascfldlg.hxx
+++ b/sw/source/uibase/inc/ascfldlg.hxx
@@ -21,7 +21,6 @@
 #include <vcl/fixed.hxx>
 
 #include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <svx/txencbox.hxx>
 #include <svx/langbox.hxx>
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index 04bb890f29ae..d6e1f56f8fd5 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -24,7 +24,6 @@
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
 #include <sfx2/tabdlg.hxx>
 
 #include <tox.hxx>
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index 6aede63170d5..7791e2ae54e4 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -26,8 +26,6 @@
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 
-#include <vcl/combobox.hxx>
-
 #include <vcl/menubtn.hxx>
 #include <com/sun/star/text/XAutoTextContainer2.hpp>
 
diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx
index 0108662a5bcb..739ae22a1624 100644
--- a/sw/source/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/uibase/inc/mailconfigpage.hxx
@@ -21,7 +21,6 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx
index 593185708d9c..0cb067bc8666 100644
--- a/sw/source/uibase/inc/numberingtypelistbox.hxx
+++ b/sw/source/uibase/inc/numberingtypelistbox.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX
 
 #include <memory>
-#include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 #include <swdllapi.h>
 #include <o3tl/typed_flags_set.hxx>
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index c01209d886fb..fb9cf0d66db7 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -21,7 +21,6 @@
 
 #include <hintids.hxx>
 #include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 5d64b9d670c1..a44fbeed8722 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -20,21 +20,12 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_SWUIIDXMRK_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
 #include <sfx2/basedlgs.hxx>
-
+#include <sfx2/childwin.hxx>
 #include <svx/stddlg.hxx>
-
-#include <vcl/button.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
-
-#include <sfx2/childwin.hxx>
 #include <toxe.hxx>
-#include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
 #include <memory>
 
 class SwWrtShell;
diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx
index 902e86298442..f99a4ead5486 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.hxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.hxx
@@ -26,7 +26,6 @@
 #include <svtools/unitconv.hxx>
 #include <svx/tbxctl.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
 
 #include <vector>
 #include <svtools/valueset.hxx>
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
index f5b18a7671e3..eca0831f851e 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
@@ -28,7 +28,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/toolbox.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/field.hxx>
 #include <svl/intitem.hxx>
 #include <svl/lstner.hxx>
diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx
index 1ef9530510fb..b439362f18ee 100644
--- a/xmlsecurity/inc/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/tabdlg.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>