12 files changed, 5 insertions, 14 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 59f1073092fd..877dd15acaa6 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 
 #include "commonpicker.hxx"
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index db55849881b2..6f3863b53157 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include "commonpicker.hxx"
 
 class Dialog;
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 2fc919f9b1d9..0ad9e0f4c88d 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -10,7 +10,6 @@
 #include "PlacesListBox.hxx"
 #include <svtools/PlaceEditDialog.hxx>
 
-#include <vcl/event.hxx>
 #include <bitmaps.hlst>
 
 PlacesListBox::PlacesListBox(std::unique_ptr<weld::TreeView> xControl,
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index d676cbae3e1b..30115abd93e8 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -23,9 +23,10 @@
 #include <tools/debug.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <vcl/errinf.hxx>
-#include <bitmaps.hlst>
 #include <officecfg/Office/Common.hxx>
 
+using namespace ::svt;
+
 RemoteFilesDialog::RemoteFilesDialog( weld::Window* pParent, PickerFlags nBits )
     : SvtFileDialog_Base( pParent, "fps/ui/remotefilesdialog.ui", "RemoteFilesDialog" )
     , m_xContext( comphelper::getProcessComponentContext() )
diff --git a/fpicker/source/office/autocmpledit.cxx b/fpicker/source/office/autocmpledit.cxx
index ab7887fff612..89f6d87b014b 100644
--- a/fpicker/source/office/autocmpledit.cxx
+++ b/fpicker/source/office/autocmpledit.cxx
@@ -8,8 +8,6 @@
  */
 
 #include "autocmpledit.hxx"
-#include <vcl/svapp.hxx>
-#include <vcl/event.hxx>
 
 AutocompleteEdit::AutocompleteEdit(std::unique_ptr<weld::Entry> xEntry)
     : m_xEntry(std::move(xEntry))
diff --git a/fpicker/source/office/contentenumeration.cxx b/fpicker/source/office/contentenumeration.cxx
index 6ed0d7626007..044e67e7bc43 100644
--- a/fpicker/source/office/contentenumeration.cxx
+++ b/fpicker/source/office/contentenumeration.cxx
@@ -31,7 +31,6 @@
 #include <comphelper/sequence.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx
index 184a330d2830..32b0df044673 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -25,7 +25,6 @@
 #include <svtools/querydelete.hxx>
 #include <svtools/strings.hrc>
 #include <bitmaps.hlst>
-#include <toolkit/helper/vclunohelper.hxx>
 #include "contentenumeration.hxx"
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
diff --git a/fpicker/source/office/fileview.hxx b/fpicker/source/office/fileview.hxx
index 19c22391e7fb..81b0cc6279c4 100644
--- a/fpicker/source/office/fileview.hxx
+++ b/fpicker/source/office/fileview.hxx
@@ -21,7 +21,6 @@
 
 #include <memory>
 #include <com/sun/star/uno/Sequence.h>
-#include <vcl/errinf.hxx>
 #include <vcl/weld.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/fpicker/source/office/foldertree.cxx b/fpicker/source/office/foldertree.cxx
index 49007c982b3d..2c37f25677f2 100644
--- a/fpicker/source/office/foldertree.cxx
+++ b/fpicker/source/office/foldertree.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <comphelper/processfactory.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <com/sun/star/task/InteractionHandler.hpp>
@@ -18,6 +17,8 @@
 
 using namespace ::com::sun::star::task;
 
+using namespace ::svt;
+
 FolderTree::FolderTree(std::unique_ptr<weld::TreeView> xTreeView, weld::Window* pTopLevel)
     : m_xTreeView(std::move(xTreeView))
     , m_xScratchIter(m_xTreeView->make_iterator())
diff --git a/fpicker/source/office/foldertree.hxx b/fpicker/source/office/foldertree.hxx
index da888e332308..9dc019cdc03e 100644
--- a/fpicker/source/office/foldertree.hxx
+++ b/fpicker/source/office/foldertree.hxx
@@ -17,7 +17,6 @@ namespace com :: sun :: star :: ucb { class XCommandEnvironment; }
 
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
-using namespace ::svt;
 
 class FolderTree
 {
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 87e3170c8e4f..cabdd16af71d 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -30,6 +30,7 @@
 #include <tools/diagnose_ex.h>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
+#include <vcl/errinf.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
@@ -41,7 +42,6 @@
 #include <fpicker/strings.hrc>
 #include <svtools/helpids.h>
 #include <strings.hrc>
-#include <bitmaps.hlst>
 #include "asyncfilepicker.hxx"
 #include "iodlgimp.hxx"
 #include <svtools/inettbc.hxx>
@@ -65,7 +65,6 @@
 
 #include <osl/file.hxx>
 #include <vcl/dibtools.hxx>
-#include <vcl/settings.hxx>
 
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 89716e5c5b5d..eef79a9a2233 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -23,7 +23,6 @@
 #include <tools/urlobj.hxx>
 #include <svtools/inettbc.hxx>
 #include "iodlg.hxx"
-#include <bitmaps.hlst>
 #include <svtools/imagemgr.hxx>
 #include <svl/svlresid.hxx>
 #include <svl/svl.hrc>