diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 7d1cd2259d1c..0a9e237e5c9c 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -25,13 +25,8 @@
 #include <svl/lngmisc.hxx>
 #include <vcl/event.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/svlbitm.hxx>
-#include <vcl/treelistbox.hxx>
-#include <vcl/treelistentry.hxx>
-#include <vcl/viewdataentry.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/builderfactory.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/svxerr.hxx>
 #include <editeng/unolingu.hxx>
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 965924b5c3fb..68e6879e92e0 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -22,7 +22,6 @@
 #include <svtools/ctrlbox.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svx/fntctrl.hxx>
-#include <svx/checklbx.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/langbox.hxx>
 #include <vcl/weld.hxx>
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index a00d9ae1d887..ae44cd6ad34b 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -21,10 +21,6 @@
 
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 
-#include <svx/checklbx.hxx>
-#include <vcl/button.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/idle.hxx>
 #include <sfx2/basedlgs.hxx>
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index af1cfdf7ccf2..cfcf3e300106 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -84,7 +84,6 @@
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistbox.hxx>
 #include <svtools/controldims.hxx>
-#include <svx/checklbx.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <tools/solar.h>
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 3a400f0c8e0d..72d7de9fd4c4 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -24,11 +24,8 @@
 #include <strings.hrc>
 #include "formstrings.hxx"
 #include <sal/log.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/waitobj.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/builderfactory.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index aba185426e5f..d9154dba6175 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -21,16 +21,10 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/mnemonic.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/tabctrl.hxx>
-#include <vcl/wall.hxx>
-#include <vcl/layout.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/weld.hxx>
 
-#include <svtools/svmedit.hxx>
-#include <vcl/treelistbox.hxx>
 #include <svl/stritem.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/eitem.hxx>
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 3cb0facba86c..801e2c715aa4 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -21,7 +21,6 @@
 #include <sfx2/docfile.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/stritem.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <formula/IFunctionDescription.hxx>
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 661312267147..71aba3e1a324 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -20,14 +20,7 @@
 #ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_FUNCPAGE_HXX
 #define INCLUDED_FORMULA_SOURCE_UI_DLG_FUNCPAGE_HXX
 
-#include <vcl/lstbox.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/tabpage.hxx>
-
-#include <vcl/tabctrl.hxx>
-#include <vcl/button.hxx>
-#include <vcl/treelistbox.hxx>
-
+#include <vcl/weld.hxx>
 #include <vector>
 
 namespace formula
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index e82da218b6a0..b1a37292728f 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -17,12 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/builder.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/event.hxx>
-#include <vcl/fixed.hxx>
 
 #include <formula/funcutl.hxx>
 #include <formula/IControlReferenceHandler.hxx>
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 8af875d50337..a4dfa71e9c3e 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -20,16 +20,10 @@
 #ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX
 #define INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX
 
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/tabctrl.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/weld.hxx>
-
-#include <vector>
 #include <formula/funcutl.hxx>
+#include <vcl/weld.hxx>
 #include "ControlHelper.hxx"
+#include <vector>
 
 namespace formula
 {
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index fcb536449b21..76d2f51fe0ad 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -19,8 +19,6 @@
 
 #include <svl/zforlist.hxx>
 #include <svl/stritem.hxx>
-#include <vcl/builderfactory.hxx>
-#include <vcl/treelistentry.hxx>
 #include <vcl/svapp.hxx>
 
 #include "structpg.hxx"
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 531fb366c4d8..38afd7172d24 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -20,11 +20,8 @@
 #ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_STRUCTPG_HXX
 #define INCLUDED_FORMULA_SOURCE_UI_DLG_STRUCTPG_HXX
 
-#include <vcl/edit.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/tabctrl.hxx>
-#include <vcl/treelistbox.hxx>
 #include <formula/IFunctionDescription.hxx>
+#include <vcl/weld.hxx>
 
 namespace formula
 {
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 353cc15d3233..2b69670aaeee 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -272,10 +272,6 @@ blacklist:
     include/vcl/FilterConfigItem.hxx:
     # Needed on Windows with --disable-pch
     - com/sun/star/beans/PropertyValue.hpp
-    include/vcl/builderfactory.hxx:
-    # Needed for macros
-    - vcl/builder.hxx
-    - vcl/vclptr.hxx
     include/vcl/decoview.hxx:
     # Full definition needed for VclPtr
     - vcl/outdev.hxx
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index e910bd64300f..1df42c2e9508 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -24,8 +24,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <tools/gen.hxx>
-#include <vcl/vclptr.hxx>
-#include <vcl/window.hxx>
 
 namespace formula
 {
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 7686181b40f2..7809db0b91a8 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -23,13 +23,8 @@
 #include <formula/formuladllapi.h>
 #include <rtl/ustring.hxx>
 #include <tools/link.hxx>
-#include <tools/wintypes.hxx>
-#include <vcl/button.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/idle.hxx>
-#include <vcl/image.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/vclptr.hxx>
 
 class KeyEvent;
 
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index 8711ba358e7f..8051074c93dd 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TPSUBT_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <svx/checklbx.hxx>
-#include <vcl/lstbox.hxx>
 #include <global.hxx>
 
 // +1 because one field is reserved for the "- none -" entry
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 71612ce19235..b3c62360c692 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -77,7 +77,6 @@
 #include <strings.hxx>
 #include <bitmaps.hlst>
 #include <vcl/help.hxx>
-#include <vcl/builderfactory.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index a51875ddde6e..cdd3508c87c3 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -50,8 +50,6 @@
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/status.hxx>
-#include <vcl/builderfactory.hxx>
 #include "dlgunit.hxx"
 #include <memory>
 
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 76d92cfa98c4..bd72af29a284 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -20,10 +20,8 @@
 #include <hintids.hxx>
 
 #include <o3tl/any.hxx>
-#include <vcl/menu.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/help.hxx>
-#include <vcl/builderfactory.hxx>
 #include <svl/stritem.hxx>
 #include <svl/macitem.hxx>
 #include <unotools/pathoptions.hxx>
@@ -46,7 +44,6 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <svl/urihelper.hxx>
 #include <unotools/charclass.hxx>
-#include <vcl/treelistentry.hxx>
 #include <swwait.hxx>
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index ac4c8b2f4eca..4e791093e135 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -23,7 +23,6 @@
 
 #include <tox.hxx>
 #include "toxmgr.hxx"
-#include <svx/checklbx.hxx>
 #include <svx/langbox.hxx>
 
 #define TOX_PAGE_SELECT 1
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 70db047a84bd..acd79532f240 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -55,9 +55,10 @@
 #include <bitmaps.hlst>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svx/srchdlg.hxx>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
 
 // Size check
 #define NAVI_ENTRIES 20