diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index ef8b46ad1b68..2f6f8f61c4e4 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -45,7 +45,6 @@
 #include <sfx2/app.hxx>
 #include <vcl/help.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/builderfactory.hxx>
 #include <osl/file.hxx>
 #include <editeng/optitems.hxx>
 #include <editeng/svxenum.hxx>
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 0bd5f7210559..e62d555a1f1c 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -10,7 +10,6 @@
 #include "optaboutconfig.hxx"
 #include "optHeaderTabListbox.hxx"
 
-#include <vcl/builderfactory.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistentry.hxx>
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index e0ae146281ef..b9fd2a02bbda 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -19,7 +19,6 @@
 
 #include <unotools/pathoptions.hxx>
 #include "optchart.hxx"
-#include <vcl/builderfactory.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 0c03337240ee..4f67e6f2e405 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -27,10 +27,10 @@
 #include <tools/debug.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/intlwrapper.hxx>
+#include <unotools/syslocale.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/event.hxx>
 #include <svx/dialogs.hrc>
 
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index e2d55c6bb749..648c6c6c366e 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -33,7 +33,6 @@
 #include <tools/fract.hxx>
 #include <svx/dialogs.hrc>
 #include <strings.hrc>
-#include <vcl/builderfactory.hxx>
 #include <vcl/field.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx
index a3f7c3e1371d..dc5d57b3db95 100644
--- a/dbaccess/source/ui/control/SqlNameEdit.cxx
+++ b/dbaccess/source/ui/control/SqlNameEdit.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <SqlNameEdit.hxx>
-#include <vcl/builderfactory.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index 8c2e048692d1..8915b65c9455 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -19,7 +19,6 @@
 
 #include <charsetlistbox.hxx>
 
-#include <vcl/builderfactory.hxx>
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 6ae44b05f0cd..3568f482c8fa 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -20,7 +20,6 @@
 #include <curledit.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/builderfactory.hxx>
 #include <osl/diagnose.h>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 3d3dc35f3af5..11fd76d81b84 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -23,7 +23,6 @@
 #include <strings.hrc>
 #include <vcl/layout.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/builderfactory.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include <stringconstants.hxx>
diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx
index b7212ab99114..89aa4f02a7c7 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <vcl/builderfactory.hxx>
 #include <LimitBox.hxx>
 #include <strings.hrc>
 #include <core_resource.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index a3caf7bb431c..af1cfdf7ccf2 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -94,7 +94,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/vclmedit.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 6b232b5a954a..6cda8170f77e 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -25,7 +25,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/prgsbar.hxx>
-#include <vcl/vclmedit.hxx>
 #include <vcl/weld.hxx>
 #include <rtl/ref.hxx>
 #include <vector>
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index b848fd5f5dce..b4bccbc64199 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FORMULA_SOURCE_UI_DLG_FUNCPAGE_HXX
 
 #include <vcl/lstbox.hxx>
-#include <svtools/svmedit.hxx>
+#include <vcl/edit.hxx>
 #include <vcl/tabpage.hxx>
 
 #include <vcl/tabctrl.hxx>
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index e2dff8d76467..013b9bf1fc0d 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX
 #define INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX
 
-#include <svtools/svmedit.hxx>
+#include <vcl/edit.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 17700aa08fd0..34c32e0a9cd2 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_STRUCTPG_HXX
 #define INCLUDED_FORMULA_SOURCE_UI_DLG_STRUCTPG_HXX
 
-#include <svtools/svmedit.hxx>
+#include <vcl/edit.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/treelistbox.hxx>
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 661b605387d9..9cca33cbc282 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -24,7 +24,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
-#include <vcl/vclmedit.hxx>
 
 #include "anyrefdg.hxx"
 #include <sc.hrc>
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 08a0202e2ba4..16d2799ef104 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -20,7 +20,6 @@
 #include <rangelst.hxx>
 #include <sfx2/bindings.hxx>
 #include <svl/zforlist.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 40cf98549757..a1e19a1fe2d3 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -46,7 +46,6 @@
 #include <basic/sbxcore.hxx>
 #include <unotools/useroptions.hxx>
 #include <vcl/waitobj.hxx>
-#include <vcl/builderfactory.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <editeng/editview.hxx>
 #include <svtools/cliplistener.hxx>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 68480ed2aea5..8f6ccd8af2be 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -91,7 +91,6 @@
 #include <svtools/imagemgr.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/imgdef.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/layout.hxx>
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 0c77b75d13c3..c28520d62c6b 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -19,7 +19,6 @@
 
 #include <osl/file.hxx>
 #include <sfx2/new.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/gdimtf.hxx>
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index c07ed5b13756..e6aecfceda1f 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -35,7 +35,6 @@
 
 #include <svtools/ivctrl.hxx>
 #include "imivctl.hxx"
-#include <svtools/svmedit.hxx>
 
 #include <algorithm>
 #include <memory>
diff --git a/svx/source/dialog/SafeModeDialog.hxx b/svx/source/dialog/SafeModeDialog.hxx
index 4fe0f02a991a..5c84bf9bde20 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -15,7 +15,6 @@
 #include <vcl/layout.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
-#include <vcl/vclmedit.hxx>
 #include <vcl/fixedhyper.hxx>
 #include <comphelper/backupfilehelper.hxx>
 
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 0cc49b19c9dd..e386c15dc2b0 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -31,7 +31,6 @@
 #include <svx/sxelditm.hxx>
 #include <sxmkitm.hxx>
 
-#include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
 #include <memory>
 
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 29aab08d5fde..547949ce5e2e 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -27,7 +27,6 @@
 #include <vcl/field.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/colorcfg.hxx>
-#include <vcl/builderfactory.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
 namespace svx {
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 01ad02c96341..dcc1f17bbe55 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 2e2b6bde357d..418e6981fa0c 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/fontlb.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/treelistentry.hxx>
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index ee747175db6f..b219843b13e1 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/frmsel.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/event.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 311f3d52ea1a..8fe40b56cc16 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -21,7 +21,6 @@
 #include <vcl/dialog.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <unotools/syslocale.hxx>
 #include <rtl/math.hxx>
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index c2cb6fde288d..56f4216ff298 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <vcl/bitmap.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
 #include <tools/fract.hxx>
 #include <editeng/frmdiritem.hxx>
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index db8beec709db..fd3ee567bce9 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -19,7 +19,6 @@
 
 #include <sfx2/dialoghelper.hxx>
 #include <svx/paraprev.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
 
 SvxParaPrevWindow::SvxParaPrevWindow() :
diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx
index 228f50c88788..5a814a281e91 100644
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@@ -19,7 +19,6 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/virdev.hxx>
 #include <svtools/colorcfg.hxx>
 
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index dd7840461135..c3bcb5736e1d 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/poly.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index d73deb101915..c3489a161397 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -39,7 +39,6 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/builderfactory.hxx>
 #include <bitmaps.hlst>
 
 #define GALLERY_BRWBOX_TITLE    1
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx
index 2018b8a6fce4..87c554c1bd75 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -19,7 +19,6 @@
 
 #include <svx/SvxPresetListBox.hxx>
 #include <svx/xtable.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index a614361058f9..d073b4a0215d 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/lineend.hxx>
 #include <unotools/charclass.hxx>
 #include <editeng/unolingu.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx
index 6f3a286521b3..8046da053a1f 100644
--- a/sw/source/uibase/cctrl/actctrl.cxx
+++ b/sw/source/uibase/cctrl/actctrl.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/builderfactory.hxx>
 #include <actctrl.hxx>
 #include <vcl/event.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx
index 01905312b4af..7b6abeb50ee6 100644
--- a/sw/source/uibase/inc/inpdlg.hxx
+++ b/sw/source/uibase/inc/inpdlg.hxx
@@ -20,10 +20,6 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_INPDLG_HXX
 
 #include <svx/stddlg.hxx>
-
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/vclmedit.hxx>
 #include <vcl/weld.hxx>
 
 class SwInputField;
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 23f7ca2f5e73..457c71be82dd 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -28,7 +28,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/vclmedit.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/mnemonic.hxx>