[Libreoffice-commits] core.git: avmedia/source basctl/source basic/source chart2/inc chart2/source connectivity/source cui/source dbaccess/qa dbaccess/source desktop/inc desktop/qa desktop/source editeng/source embeddedobj/source embedserv/source extensions/source filter/source forms/source framework/inc framework/source include/comphelper include/framework include/sfx2 include/svtools include/svx include/unotools include/xmloff linguistic/source lotuswordpro/source oox/inc oox/source reportdesign/source sc/qa scripting/source sc/source sdext/source sd/inc sd/qa sd/source sfx2/inc sfx2/source slideshow/source smoketest/smoketest.cxx svtools/source svx/source sw/inc sw/qa sw/source ucb/source UnoControls/source unotools/source vbahelper/source vcl/source vcl/unx writerperfect/qa xmlhelp/source xmloff/source

Jochen Nitschke j.nitschke+logerrit at ok.de
Mon Jun 12 11:06:05 UTC 2017


 UnoControls/source/controls/framecontrol.cxx                               |    1 
 UnoControls/source/inc/framecontrol.hxx                                    |    4 --
 avmedia/source/framework/soundhandler.hxx                                  |    1 
 basctl/source/inc/docsignature.hxx                                         |    1 
 basic/source/classes/sbxmod.cxx                                            |    1 
 chart2/inc/ChartView.hxx                                                   |    1 
 chart2/source/controller/chartapiwrapper/AxisWrapper.hxx                   |    1 
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx        |    1 
 chart2/source/controller/inc/MultipleChartConverters.hxx                   |    1 
 chart2/source/controller/inc/MultipleItemConverter.hxx                     |    2 -
 chart2/source/controller/main/ChartController.cxx                          |    1 
 chart2/source/controller/main/ControllerCommandDispatch.hxx                |    2 -
 chart2/source/controller/main/DrawCommandDispatch.cxx                      |    1 
 chart2/source/controller/main/ElementSelector.cxx                          |    1 
 chart2/source/controller/main/FeatureCommandDispatchBase.hxx               |    1 
 chart2/source/controller/main/ShapeController.cxx                          |    1 
 chart2/source/controller/sidebar/ChartColorWrapper.hxx                     |    2 -
 chart2/source/inc/chartview/ExplicitValueProvider.hxx                      |    1 
 chart2/source/tools/ExplicitCategoriesProvider.cxx                         |    1 
 chart2/source/tools/ModifyListenerHelper.cxx                               |    2 -
 chart2/source/view/main/VLegend.hxx                                        |    1 
 connectivity/source/drivers/calc/CConnection.cxx                           |    1 
 connectivity/source/drivers/firebird/Connection.cxx                        |    7 ----
 connectivity/source/drivers/hsqldb/HTerminateListener.cxx                  |    1 
 cui/source/customize/acccfg.cxx                                            |    2 -
 cui/source/customize/cfg.cxx                                               |    1 
 cui/source/customize/cfgutil.cxx                                           |    1 
 cui/source/customize/eventdlg.cxx                                          |    2 -
 cui/source/dialogs/hlmailtp.cxx                                            |    2 -
 cui/source/dialogs/scriptdlg.cxx                                           |    1 
 cui/source/inc/acccfg.hxx                                                  |    2 -
 cui/source/inc/cfg.hxx                                                     |    2 -
 cui/source/inc/cfgutil.hxx                                                 |    2 -
 cui/source/options/optopencl.cxx                                           |    1 
 dbaccess/qa/unit/dbtest_base.cxx                                           |    3 -
 dbaccess/source/core/dataaccess/ModelImpl.hxx                              |    2 -
 dbaccess/source/core/dataaccess/databasedocument.hxx                       |    1 
 dbaccess/source/core/dataaccess/documentdefinition.cxx                     |    3 -
 dbaccess/source/core/dataaccess/documentdefinition.hxx                     |    1 
 dbaccess/source/filter/xml/dbloader2.cxx                                   |    3 -
 dbaccess/source/filter/xml/xmlStyleImport.cxx                              |    1 
 dbaccess/source/ui/app/AppController.cxx                                   |    1 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx                             |    2 -
 dbaccess/source/ui/app/AppDetailView.hxx                                   |    1 
 dbaccess/source/ui/app/AppView.cxx                                         |    1 
 dbaccess/source/ui/app/subcomponentmanager.hxx                             |    2 -
 dbaccess/source/ui/browser/unodatbr.cxx                                    |    1 
 dbaccess/source/ui/control/dbtreelistbox.cxx                               |    2 -
 dbaccess/source/ui/dlg/tablespage.cxx                                      |    1 
 dbaccess/source/ui/inc/TableDesignView.hxx                                 |    1 
 dbaccess/source/ui/inc/TokenWriter.hxx                                     |    1 
 dbaccess/source/ui/inc/databaseobjectview.hxx                              |    1 
 dbaccess/source/ui/inc/linkeddocuments.hxx                                 |    2 -
 dbaccess/source/ui/misc/TableCopyHelper.cxx                                |    1 
 dbaccess/source/ui/misc/TokenWriter.cxx                                    |    1 
 dbaccess/source/ui/misc/databaseobjectview.cxx                             |    3 -
 dbaccess/source/ui/misc/linkeddocuments.cxx                                |    2 -
 dbaccess/source/ui/querydesign/JoinController.cxx                          |    1 
 dbaccess/source/ui/querydesign/QueryTextView.cxx                           |    1 
 dbaccess/source/ui/querydesign/querycontroller.cxx                         |    2 -
 dbaccess/source/ui/relationdesign/RelationController.cxx                   |    1 
 dbaccess/source/ui/tabledesign/TEditControl.cxx                            |    1 
 dbaccess/source/ui/tabledesign/TableController.cxx                         |    2 -
 desktop/inc/lib/init.hxx                                                   |    1 
 desktop/qa/desktop_lib/test_desktop_lib.cxx                                |    1 
 desktop/source/app/app.cxx                                                 |    4 --
 desktop/source/app/dispatchwatcher.cxx                                     |    4 --
 desktop/source/app/dispatchwatcher.hxx                                     |    1 
 desktop/source/app/sofficemain.cxx                                         |    3 -
 editeng/source/misc/unolingu.cxx                                           |    1 
 embeddedobj/source/commonembedding/embedobj.cxx                            |    3 -
 embeddedobj/source/commonembedding/persistence.cxx                         |    1 
 embeddedobj/source/commonembedding/specialobject.cxx                       |    3 -
 embeddedobj/source/general/docholder.cxx                                   |    2 -
 embeddedobj/source/msole/ownview.cxx                                       |    1 
 embedserv/source/embed/docholder.cxx                                       |    3 -
 embedserv/source/embed/ed_ioleobject.cxx                                   |    1 
 embedserv/source/embed/ed_ipersiststr.cxx                                  |    1 
 extensions/source/bibliography/bibbeam.cxx                                 |    1 
 extensions/source/bibliography/bibcont.cxx                                 |    3 -
 extensions/source/dbpilots/optiongrouplayouter.hxx                         |    1 
 extensions/source/propctrlr/formcomponenthandler.hxx                       |    1 
 extensions/source/propctrlr/genericpropertyhandler.cxx                     |    1 
 extensions/source/propctrlr/propcontroller.hxx                             |    1 
 extensions/source/update/check/updatecheck.cxx                             |    3 -
 filter/source/graphic/GraphicExportDialog.cxx                              |    1 
 filter/source/msfilter/mstoolbar.cxx                                       |    1 
 filter/source/pdf/pdfexport.cxx                                            |    1 
 filter/source/svg/svgdialog.cxx                                            |    2 -
 filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx                        |    3 -
 filter/source/xsltdialog/xmlfilterjar.cxx                                  |    2 -
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx                       |    2 -
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx                          |    3 -
 filter/source/xsltdialog/xmlfiltertestdialog.cxx                           |    2 -
 forms/source/component/clickableimage.hxx                                  |    1 
 forms/source/solar/component/navbarcontrol.hxx                             |    1 
 forms/source/xforms/submission/submission_put.hxx                          |    1 
 framework/inc/classes/framecontainer.hxx                                   |    1 
 framework/inc/classes/taskcreator.hxx                                      |    2 -
 framework/inc/dispatch/oxt_handler.hxx                                     |    1 
 framework/inc/dispatch/popupmenudispatcher.hxx                             |    4 --
 framework/inc/dispatch/startmoduledispatcher.hxx                           |    1 
 framework/inc/helper/titlebarupdate.hxx                                    |    1 
 framework/inc/jobs/helponstartup.hxx                                       |    1 
 framework/inc/jobs/job.hxx                                                 |    1 
 framework/inc/jobs/jobdata.hxx                                             |    1 
 framework/inc/jobs/shelljob.hxx                                            |    2 -
 framework/inc/services/desktop.hxx                                         |    5 --
 framework/inc/services/layoutmanager.hxx                                   |    3 -
 framework/inc/uielement/addonstoolbarmanager.hxx                           |    2 -
 framework/inc/uielement/addonstoolbarwrapper.hxx                           |    1 
 framework/inc/uielement/buttontoolbarcontroller.hxx                        |    3 -
 framework/inc/uielement/comboboxtoolbarcontroller.hxx                      |    1 
 framework/inc/uielement/dropdownboxtoolbarcontroller.hxx                   |    1 
 framework/inc/uielement/edittoolbarcontroller.hxx                          |    1 
 framework/inc/uielement/fontmenucontroller.hxx                             |    3 -
 framework/inc/uielement/fontsizemenucontroller.hxx                         |    2 -
 framework/inc/uielement/headermenucontroller.hxx                           |    5 --
 framework/inc/uielement/imagebuttontoolbarcontroller.hxx                   |    1 
 framework/inc/uielement/langselectionmenucontroller.hxx                    |    3 -
 framework/inc/uielement/macrosmenucontroller.hxx                           |    5 --
 framework/inc/uielement/menubarwrapper.hxx                                 |    2 -
 framework/inc/uielement/newmenucontroller.hxx                              |    5 --
 framework/inc/uielement/notebookbarmenucontroller.hxx                      |    3 -
 framework/inc/uielement/spinfieldtoolbarcontroller.hxx                     |    1 
 framework/inc/uielement/statusbarmanager.hxx                               |    1 
 framework/inc/uielement/statusbarwrapper.hxx                               |    1 
 framework/inc/uielement/togglebuttontoolbarcontroller.hxx                  |    1 
 framework/inc/uielement/toolbarmanager.hxx                                 |    1 
 framework/inc/uielement/toolbarmodemenucontroller.hxx                      |    3 -
 framework/inc/uielement/toolbarsmenucontroller.hxx                         |    4 --
 framework/inc/uielement/toolbarwrapper.hxx                                 |    1 
 framework/source/dispatch/dispatchdisabler.cxx                             |    1 
 framework/source/dispatch/popupmenudispatcher.cxx                          |    1 
 framework/source/dispatch/startmoduledispatcher.cxx                        |    2 -
 framework/source/fwe/xml/menuconfiguration.cxx                             |    1 
 framework/source/helper/oframes.cxx                                        |    1 
 framework/source/helper/titlebarupdate.cxx                                 |    1 
 framework/source/inc/loadenv/loadenv.hxx                                   |    3 -
 framework/source/inc/pattern/frame.hxx                                     |    3 -
 framework/source/jobs/jobexecutor.cxx                                      |    1 
 framework/source/layoutmanager/toolbarlayoutmanager.hxx                    |    3 -
 framework/source/services/desktop.cxx                                      |    1 
 framework/source/uiconfiguration/uicategorydescription.cxx                 |    1 
 framework/source/uielement/addonstoolbarmanager.cxx                        |    2 -
 framework/source/uielement/comboboxtoolbarcontroller.cxx                   |    6 ---
 framework/source/uielement/complextoolbarcontroller.cxx                    |    2 -
 framework/source/uielement/controlmenucontroller.cxx                       |    1 
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx                |    6 ---
 framework/source/uielement/edittoolbarcontroller.cxx                       |    6 ---
 framework/source/uielement/footermenucontroller.cxx                        |    2 -
 framework/source/uielement/headermenucontroller.cxx                        |    1 
 framework/source/uielement/imagebuttontoolbarcontroller.cxx                |    2 -
 framework/source/uielement/langselectionmenucontroller.cxx                 |    1 
 framework/source/uielement/langselectionstatusbarcontroller.cxx            |    4 --
 framework/source/uielement/macrosmenucontroller.cxx                        |    2 -
 framework/source/uielement/menubarmanager.cxx                              |    1 
 framework/source/uielement/notebookbarmenucontroller.cxx                   |    1 
 framework/source/uielement/objectmenucontroller.cxx                        |    4 --
 framework/source/uielement/popuptoolbarcontroller.cxx                      |    1 
 framework/source/uielement/spinfieldtoolbarcontroller.cxx                  |    6 ---
 framework/source/uielement/subtoolbarcontroller.cxx                        |    1 
 framework/source/uielement/togglebuttontoolbarcontroller.cxx               |    2 -
 framework/source/uielement/toolbarmodemenucontroller.cxx                   |    1 
 framework/source/uifactory/statusbarfactory.cxx                            |    3 -
 framework/source/uifactory/toolbarfactory.cxx                              |    3 -
 framework/source/uifactory/uielementfactorymanager.cxx                     |    1 
 include/comphelper/embeddedobjectcontainer.hxx                             |    1 
 include/framework/menuconfiguration.hxx                                    |    1 
 include/sfx2/bindings.hxx                                                  |    2 -
 include/sfx2/notebookbar/NotebookbarTabControl.hxx                         |    1 
 include/sfx2/notebookbar/SfxNotebookBar.hxx                                |    1 
 include/sfx2/objsh.hxx                                                     |    1 
 include/sfx2/recentdocsview.hxx                                            |    2 -
 include/sfx2/sfxbasemodel.hxx                                              |    1 
 include/sfx2/sidebar/ControlFactory.hxx                                    |    2 -
 include/sfx2/sidebar/SidebarPanelBase.hxx                                  |    1 
 include/sfx2/sidebar/SidebarToolBox.hxx                                    |    1 
 include/sfx2/tbxctrl.hxx                                                   |    1 
 include/sfx2/unoctitm.hxx                                                  |    6 ---
 include/sfx2/viewfrm.hxx                                                   |    3 -
 include/svtools/statusbarcontroller.hxx                                    |    1 
 include/svx/PaletteManager.hxx                                             |    3 -
 include/svx/fmtools.hxx                                                    |    6 ---
 include/svx/tbcontrl.hxx                                                   |    1 
 include/unotools/eventcfg.hxx                                              |    1 
 include/xmloff/ProgressBarHelper.hxx                                       |    1 
 include/xmloff/formlayerexport.hxx                                         |    1 
 include/xmloff/numehelp.hxx                                                |    1 
 linguistic/source/misc.cxx                                                 |    1 
 lotuswordpro/source/filter/lwpfilter.cxx                                   |    3 -
 oox/inc/drawingml/textrun.hxx                                              |    1 
 oox/source/drawingml/chart/converterbase.cxx                               |    2 -
 oox/source/drawingml/chart/objectformatter.cxx                             |    1 
 oox/source/drawingml/shape3dproperties.cxx                                 |    1 
 oox/source/drawingml/textbody.cxx                                          |    1 
 oox/source/drawingml/textparagraph.cxx                                     |    1 
 oox/source/drawingml/textrun.cxx                                           |    1 
 oox/source/helper/graphichelper.cxx                                        |    1 
 oox/source/ppt/pptshape.cxx                                                |    1 
 oox/source/ppt/timenode.cxx                                                |    2 -
 reportdesign/source/core/api/ReportDefinition.cxx                          |    2 -
 reportdesign/source/filter/xml/dbloader2.cxx                               |    1 
 reportdesign/source/filter/xml/dbloader2.hxx                               |    5 --
 reportdesign/source/filter/xml/xmlExport.cxx                               |    1 
 reportdesign/source/filter/xml/xmlHelper.hxx                               |    1 
 reportdesign/source/filter/xml/xmlStyleImport.cxx                          |    1 
 reportdesign/source/ui/inc/AddField.hxx                                    |    1 
 reportdesign/source/ui/inc/DesignView.hxx                                  |    1 
 reportdesign/source/ui/misc/toolboxcontroller.cxx                          |    1 
 sc/qa/extras/check_data_pilot_field.cxx                                    |    1 
 sc/qa/extras/check_data_pilot_table.cxx                                    |    1 
 sc/qa/extras/check_xcell_ranges_query.cxx                                  |    1 
 sc/qa/perf/scperfobj.cxx                                                   |    1 
 sc/qa/unit/copy_paste_test.cxx                                             |    1 
 sc/qa/unit/subsequent_filters-test.cxx                                     |    2 -
 sc/source/filter/xml/xmlimprt.hxx                                          |    1 
 sc/source/filter/xml/xmlstyli.cxx                                          |    1 
 sc/source/ui/docshell/dbdocimp.cxx                                         |    1 
 sc/source/ui/docshell/docsh4.cxx                                           |    1 
 sc/source/ui/drawfunc/fuins2.cxx                                           |    2 -
 sc/source/ui/inc/tbzoomsliderctrl.hxx                                      |    1 
 sc/source/ui/optdlg/calcoptionsdlg.cxx                                     |    3 -
 sc/source/ui/vba/vbaapplication.cxx                                        |    1 
 sc/source/ui/vba/vbaformatcondition.hxx                                    |    1 
 sc/source/ui/vba/vbaworkbook.cxx                                           |    1 
 sc/source/ui/vba/vbaworkbooks.cxx                                          |    5 --
 sc/source/ui/vba/vbaworksheet.cxx                                          |    1 
 scripting/source/provider/MasterScriptProvider.hxx                         |    1 
 scripting/source/provider/ProviderCache.hxx                                |    1 
 sd/inc/drawdoc.hxx                                                         |    1 
 sd/qa/unit/dialogs-test.cxx                                                |    2 -
 sd/qa/unit/export-tests-ooxml2.cxx                                         |    1 
 sd/source/filter/html/HtmlOptionsDialog.cxx                                |    2 -
 sd/source/filter/sdfilter.cxx                                              |    1 
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx                  |    1 
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx                  |    1 
 sd/source/ui/accessibility/AccessibleOutlineView.cxx                       |    1 
 sd/source/ui/animations/CustomAnimationPane.hxx                            |    1 
 sd/source/ui/annotations/annotationmanager.cxx                             |    2 -
 sd/source/ui/controller/slidelayoutcontroller.cxx                          |    1 
 sd/source/ui/framework/factories/BasicViewFactory.hxx                      |    1 
 sd/source/ui/framework/factories/FullScreenPane.cxx                        |    1 
 sd/source/ui/framework/factories/FullScreenPane.hxx                        |    1 
 sd/source/ui/inc/ToolBarManager.hxx                                        |    1 
 sd/source/ui/inc/ViewShellBase.hxx                                         |    2 -
 sd/source/ui/inc/tools/SlotStateListener.hxx                               |    1 
 sd/source/ui/remotecontrol/Listener.cxx                                    |    1 
 sd/source/ui/remotecontrol/Listener.hxx                                    |    1 
 sd/source/ui/remotecontrol/Receiver.cxx                                    |    2 -
 sd/source/ui/sidebar/DocumentHelper.cxx                                    |    1 
 sd/source/ui/sidebar/LayoutMenu.cxx                                        |    1 
 sd/source/ui/sidebar/MasterPageContainer.cxx                               |    1 
 sd/source/ui/sidebar/MasterPageContainer.hxx                               |    1 
 sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx                           |    1 
 sd/source/ui/sidebar/SlideBackground.hxx                                   |    1 
 sd/source/ui/slideshow/slideshowimpl.cxx                                   |    1 
 sd/source/ui/table/tablefunction.cxx                                       |    1 
 sd/source/ui/tools/SlotStateListener.cxx                                   |    1 
 sd/source/ui/unoidl/UnoDocumentSettings.cxx                                |    1 
 sd/source/ui/unoidl/UnoDocumentSettings.hxx                                |    2 -
 sd/source/ui/view/PresentationViewShellBase.cxx                            |    1 
 sd/source/ui/view/ViewShellBase.cxx                                        |    3 -
 sd/source/ui/view/viewoverlaymanager.cxx                                   |    2 -
 sdext/source/minimizer/configurationaccess.cxx                             |    1 
 sdext/source/minimizer/graphiccollector.cxx                                |    1 
 sdext/source/minimizer/informationdialog.hxx                               |    3 -
 sdext/source/minimizer/optimizerdialog.cxx                                 |    3 -
 sdext/source/minimizer/optimizerdialog.hxx                                 |    3 -
 sdext/source/minimizer/optimizerdialogcontrols.cxx                         |    1 
 sdext/source/minimizer/unodialog.cxx                                       |    1 
 sdext/source/pdfimport/pdfiadaptor.cxx                                     |    1 
 sdext/source/presenter/PresenterProtocolHandler.cxx                        |    1 
 sdext/source/presenter/PresenterViewFactory.hxx                            |    1 
 sfx2/inc/bluthsndapi.hxx                                                   |    1 
 sfx2/source/appl/app.cxx                                                   |    5 --
 sfx2/source/appl/appbas.cxx                                                |    2 -
 sfx2/source/appl/appcfg.cxx                                                |    2 -
 sfx2/source/appl/appmisc.cxx                                               |    3 -
 sfx2/source/appl/appopen.cxx                                               |    4 --
 sfx2/source/appl/appserv.cxx                                               |    4 --
 sfx2/source/appl/childwin.cxx                                              |    1 
 sfx2/source/appl/helpdispatch.cxx                                          |    1 
 sfx2/source/appl/helpinterceptor.cxx                                       |    1 
 sfx2/source/appl/newhelp.cxx                                               |    2 -
 sfx2/source/appl/newhelp.hxx                                               |    2 -
 sfx2/source/appl/sfxhelp.cxx                                               |    4 --
 sfx2/source/appl/shutdownicon.cxx                                          |    1 
 sfx2/source/bastyp/fltfnc.cxx                                              |   17 ----------
 sfx2/source/bastyp/progress.cxx                                            |    1 
 sfx2/source/control/bindings.cxx                                           |    9 -----
 sfx2/source/control/recentdocsview.cxx                                     |    3 -
 sfx2/source/control/statcach.cxx                                           |    6 ---
 sfx2/source/control/templatelocalview.cxx                                  |    3 -
 sfx2/source/control/unoctitm.cxx                                           |    5 --
 sfx2/source/dialog/backingwindow.hxx                                       |    2 -
 sfx2/source/dialog/bluthsnd.cxx                                            |    1 
 sfx2/source/dialog/dockwin.cxx                                             |    1 
 sfx2/source/dialog/recfloat.cxx                                            |    2 -
 sfx2/source/doc/doctempl.cxx                                               |    1 
 sfx2/source/doc/objcont.cxx                                                |    1 
 sfx2/source/doc/objserv.cxx                                                |    4 --
 sfx2/source/doc/objstor.cxx                                                |    2 -
 sfx2/source/doc/sfxbasemodel.cxx                                           |    1 
 sfx2/source/doc/templatedlg.cxx                                            |    1 
 sfx2/source/inc/appdata.hxx                                                |    1 
 sfx2/source/inc/eventsupplier.hxx                                          |    1 
 sfx2/source/inc/objshimp.hxx                                               |    1 
 sfx2/source/inc/statcach.hxx                                               |    4 --
 sfx2/source/inc/workwin.hxx                                                |    1 
 sfx2/source/inet/inettbc.cxx                                               |    1 
 sfx2/source/notebookbar/SfxNotebookBar.cxx                                 |    1 
 sfx2/source/sidebar/ControllerItem.cxx                                     |    2 -
 sfx2/source/sidebar/SidebarController.cxx                                  |    1 
 sfx2/source/toolbox/tbxitem.cxx                                            |    6 ---
 sfx2/source/view/frame2.cxx                                                |    1 
 sfx2/source/view/impframe.hxx                                              |    1 
 sfx2/source/view/sfxbasecontroller.cxx                                     |    1 
 sfx2/source/view/viewfrm.cxx                                               |    2 -
 sfx2/source/view/viewfrm2.cxx                                              |    1 
 slideshow/source/engine/shapes/drawshape.cxx                               |    1 
 smoketest/smoketest.cxx                                                    |    1 
 svtools/source/control/toolbarmenuimp.hxx                                  |    1 
 svtools/source/filter/SvFilterOptionsDialog.cxx                            |    1 
 svtools/source/uno/generictoolboxcontroller.cxx                            |    2 -
 svtools/source/uno/statusbarcontroller.cxx                                 |    1 
 svx/source/dialog/SafeModeDialog.cxx                                       |    2 -
 svx/source/dialog/docrecovery.cxx                                          |    1 
 svx/source/form/datanavi.cxx                                               |    1 
 svx/source/form/fmshell.cxx                                                |    1 
 svx/source/form/fmtools.cxx                                                |    1 
 svx/source/form/formcontroller.cxx                                         |    1 
 svx/source/form/tbxform.cxx                                                |    1 
 svx/source/inc/fmpgeimp.hxx                                                |    1 
 svx/source/inc/fmshimp.hxx                                                 |    1 
 svx/source/inc/fmtextcontrolshell.hxx                                      |    1 
 svx/source/inc/formcontroller.hxx                                          |    3 -
 svx/source/sidebar/PanelLayout.cxx                                         |    1 
 svx/source/sidebar/styles/StylesPropertyPanel.hxx                          |    1 
 svx/source/tbxctrls/fillctrl.cxx                                           |    1 
 svx/source/tbxctrls/tbcontrl.cxx                                           |    1 
 svx/source/tbxctrls/tbunosearchcontrollers.cxx                             |    1 
 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx |    2 -
 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx |    1 
 svx/source/unodraw/UnoGraphicExporter.cxx                                  |    2 -
 svx/source/unodraw/recoveryui.cxx                                          |    1 
 sw/inc/swabstdlg.hxx                                                       |    1 
 sw/qa/core/layout-test.cxx                                                 |    1 
 sw/qa/core/macros-test.cxx                                                 |    3 -
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx                                  |    1 
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx                                  |    1 
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx                                  |    1 
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx                                  |    1 
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx                              |    1 
 sw/qa/extras/rtfexport/rtfexport.cxx                                       |    1 
 sw/source/filter/xml/xmlexp.cxx                                            |    1 
 sw/source/filter/xml/xmltbli.cxx                                           |    1 
 sw/source/ui/envelp/mailmrge.cxx                                           |    1 
 sw/source/ui/frmdlg/cption.cxx                                             |    1 
 sw/source/ui/utlui/swrenamexnameddlg.cxx                                   |    1 
 sw/source/ui/vba/vbadocuments.cxx                                          |    5 --
 sw/source/ui/vba/vbaheaderfooterhelper.cxx                                 |    1 
 sw/source/uibase/app/apphdl.cxx                                            |    1 
 sw/source/uibase/uiview/viewmdi.cxx                                        |    1 
 ucb/source/ucp/tdoc/tdoc_docmgr.cxx                                        |    1 
 unotools/source/config/eventcfg.cxx                                        |    1 
 unotools/source/misc/ZipPackageHelper.cxx                                  |    2 -
 vbahelper/source/msforms/vbauserform.hxx                                   |    1 
 vbahelper/source/vbahelper/vbaapplicationbase.cxx                          |    1 
 vbahelper/source/vbahelper/vbacommandbar.cxx                               |    2 -
 vbahelper/source/vbahelper/vbacommandbars.cxx                              |    1 
 vbahelper/source/vbahelper/vbadocumentsbase.cxx                            |    4 --
 vbahelper/source/vbahelper/vbaeventshelperbase.cxx                         |    1 
 vbahelper/source/vbahelper/vbahelper.cxx                                   |    2 -
 vcl/source/app/svapp.cxx                                                   |    1 
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx                                   |    1 
 vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx                                 |    1 
 vcl/unx/gtk/fpicker/SalGtkPicker.hxx                                       |    1 
 writerperfect/qa/unit/WpftLoader.cxx                                       |    1 
 xmlhelp/source/cxxhelp/provider/databases.cxx                              |    1 
 xmlhelp/source/treeview/tvread.cxx                                         |    2 -
 xmloff/source/chart/SchXMLTableContext.cxx                                 |    1 
 xmloff/source/core/XMLEmbeddedObjectImportContext.cxx                      |    2 -
 xmloff/source/core/xmlimp.cxx                                              |    1 
 xmloff/source/draw/sdxmlexp_impl.hxx                                       |    1 
 xmloff/source/draw/sdxmlimp_impl.hxx                                       |    1 
 xmloff/source/forms/formlayerexport.cxx                                    |    1 
 xmloff/source/forms/officeforms.cxx                                        |    1 
 xmloff/source/meta/MetaExportComponent.cxx                                 |    1 
 xmloff/source/style/styleexp.cxx                                           |    1 
 xmloff/source/text/XMLTextShapeImportHelper.cxx                            |    1 
 xmloff/source/text/txtflde.cxx                                             |    1 
 xmloff/source/text/txtparae.cxx                                            |    1 
 xmloff/source/text/txtstyli.cxx                                            |    2 -
 394 files changed, 24 insertions(+), 656 deletions(-)

New commits:
commit febbad7263ea25b76f4e53d2f136693a52207a1c
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Tue May 30 10:57:29 2017 +0200

    cleanup unused css/frame/* includes
    
    Change-Id: I173a29fd1ee889127369d2bc2fce8e010b89ca65
    Reviewed-on: https://gerrit.libreoffice.org/38633
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index ef8c028d47f8..5d6ad23db8a9 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/frame/Frame.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index 6b8e511a6e8e..7db39b4c4340 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -20,11 +20,7 @@
 #ifndef INCLUDED_UNOCONTROLS_SOURCE_INC_FRAMECONTROL_HXX
 #define INCLUDED_UNOCONTROLS_SOURCE_INC_FRAMECONTROL_HXX
 
-#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/frame/XFrame2.hpp>
-#include <com/sun/star/frame/FrameActionEvent.hpp>
-#include <com/sun/star/frame/FrameAction.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XConnectionPointContainer.hpp>
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index 5ee3fc7ae831..0cc3de24e83b 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <com/sun/star/media/XPlayer.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/basctl/source/inc/docsignature.hxx b/basctl/source/inc/docsignature.hxx
index b5c49dd6d311..5fd07704d691 100644
--- a/basctl/source/inc/docsignature.hxx
+++ b/basctl/source/inc/docsignature.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_BASCTL_SOURCE_INC_DOCSIGNATURE_HXX
 #define INCLUDED_BASCTL_SOURCE_INC_DOCSIGNATURE_HXX
 
-#include <com/sun/star/frame/XModel.hpp>
 #include <sfx2/signaturestate.hxx>
 #include <memory>
 
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index c637478f7cd9..25b45ca3b36f 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -54,7 +54,6 @@
 #include <sys/resource.h>
 #endif
 
-#include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 #include <map>
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index fcb4f2b05593..f8f39b8b827f 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -27,7 +27,6 @@
 #include <svl/lstner.hxx>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index 4adc3b77ff36..727cb0a99fa5 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -26,7 +26,6 @@
 #include <comphelper/interfacecontainer2.hxx>
 #include <com/sun/star/chart/XAxis.hpp>
 #include <com/sun/star/chart2/XAxis.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index 6f3120b40502..c3ca4802a03d 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -25,7 +25,6 @@
 #include <comphelper/uno3.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <com/sun/star/chart2/XDataSeries.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx
index 066c9b272462..c29fa506769e 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -21,6 +21,7 @@
 
 #include "MultipleItemConverter.hxx"
 #include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 class SdrModel;
diff --git a/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx
index 9e05c4eef383..3abcbb05144b 100644
--- a/chart2/source/controller/inc/MultipleItemConverter.hxx
+++ b/chart2/source/controller/inc/MultipleItemConverter.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_MULTIPLEITEMCONVERTER_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_MULTIPLEITEMCONVERTER_HXX
 
-#include <com/sun/star/frame/XModel.hpp>
-
 #include "ItemConverter.hxx"
 
 #include <vector>
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index a385278e8cc9..c1a91ee6a389 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -55,7 +55,6 @@
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
-#include <com/sun/star/frame/XLoadable.hpp>
 #include <com/sun/star/frame/XController2.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/embed/XEmbeddedClient.hpp>
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx
index e338fdbacb92..f0b125444bf6 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.hxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx
@@ -20,8 +20,6 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CONTROLLERCOMMANDDISPATCH_HXX
 
 #include "CommandDispatch.hxx"
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 0656572a9ef7..4b06f17c9d26 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -24,6 +24,7 @@
 #include "chartview/DrawModelWrapper.hxx"
 #include "macros.hxx"
 
+#include <com/sun/star/frame/CommandGroup.hpp>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/itempool.hxx>
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index f29678e78c90..5b951ad5398f 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -34,7 +34,6 @@
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/frame/XControlNotificationListener.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
index 12db19ccdc75..6d06c63d240a 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
@@ -21,7 +21,6 @@
 
 #include "CommandDispatch.hxx"
 
-#include <com/sun/star/frame/CommandGroup.hpp>
 #include <com/sun/star/frame/DispatchInformation.hpp>
 #include <com/sun/star/util/URL.hpp>
 
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 49d7de285103..1895f2db54d2 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -27,6 +27,7 @@
 #include "chartview/DrawModelWrapper.hxx"
 #include "macros.hxx"
 
+#include <com/sun/star/frame/CommandGroup.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 
 #include <osl/mutex.hxx>
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx b/chart2/source/controller/sidebar/ChartColorWrapper.hxx
index b98750312c16..9237bf36e218 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTCOLORWRAPPER_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTCOLORWRAPPER_HXX
 
-#include <com/sun/star/frame/XFramesSupplier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <tools/color.hxx>
 #include <svx/Palette.hxx>
 
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 456e89ba8ada..184632ec12de 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/chart2/XDataSeries.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include "chartviewdllapi.hxx"
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 9f5998297ff0..a234fae7f653 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 
 namespace chart
 {
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 2aa55ef38d73..87a8f356073a 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -23,8 +23,6 @@
 
 #include <cppuhelper/interfacecontainer.hxx>
 
-#include <com/sun/star/frame/XModel.hpp>
-
 using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx
index 04f9f6b84859..0f9a14b35639 100644
--- a/chart2/source/view/main/VLegend.hxx
+++ b/chart2/source/view/main/VLegend.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 
 #include "ChartModel.hxx"
 
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 04b37c071993..17c50c4c0c95 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -25,7 +25,6 @@
 #include "resource/sharedresources.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <tools/urlobj.hxx>
 #include "calc/CPreparedStatement.hxx"
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 34c808989b2b..2d03917cc3e7 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -30,12 +30,6 @@
 
 #include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XFrames.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/io/TempFile.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -77,7 +71,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::embed;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index 6d1b5f1b254e..c62b5d87def0 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
@@ -27,7 +27,6 @@ namespace connectivity
 
     using namespace hsqldb;
     using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::frame;
     using namespace ::com::sun::star::lang;
 
 // XEventListener
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 0ee24f8631b1..ebfc9e0b2014 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -47,8 +47,6 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/form/XReset.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index fdd046357b67..5a535bd1acd8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -69,7 +69,6 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/FileSystemStorageFactory.hpp>
 #include <com/sun/star/frame/UnknownModuleException.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/frame/XFrames.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 64b9a3ee117b..d81813ee8193 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/theUICommandDescription.hpp>
+#include <com/sun/star/frame/XDispatchInformationProvider.hpp>
 #include <com/sun/star/script/browse/XBrowseNode.hpp>
 #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #include <com/sun/star/script/browse/theBrowseNodeFactory.hpp>
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index bfaac6c5d7e2..4053836ce02d 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/frame/XStorable.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/documentinfo.hxx>
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 9170db2e63fc..6de31e614e0c 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -17,9 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <sfx2/request.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 7be590b167de..0c744ca4c12e 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -34,7 +34,6 @@
 #include "cfgutil.hxx"
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/script/provider/ScriptFrameworkErrorException.hpp>
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
 #include <com/sun/star/script/provider/XScriptProvider.hpp>
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 307b1093c20e..ded5f76078dc 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -22,10 +22,8 @@
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 0436f15888ec..6ffbf8bf73c4 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -31,13 +31,11 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/ui/XUIConfigurationListener.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index acc0020daa1f..d409054acd92 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -23,11 +23,11 @@
 #include <memory>
 #include <rtl/ustring.hxx>
 
+#include <com/sun/star/frame/DispatchInformation.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/XDispatchInformationProvider.hpp>
 #include <com/sun/star/script/browse/XBrowseNode.hpp>
 #include <vcl/timer.hxx>
 #include <svtools/svtabbx.hxx>
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 4706951f129a..b99cd7f04767 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 
 #include <cuires.hrc>
diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
index d3b07f811662..9d3183b21e93 100644
--- a/dbaccess/qa/unit/dbtest_base.cxx
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -10,14 +10,11 @@
 #include <comphelper/processfactory.hxx>
 #include <test/unoapi_test.hxx>
 
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 62574861b490..3a9f2c750db0 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/XTransactionListener.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/NotInitializedException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -56,7 +55,6 @@
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/sdb/XDocumentDataSource.hpp>
-#include <com/sun/star/frame/DoubleInitializationException.hpp>
 
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/namedvaluecollection.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 8fd8ccc137b9..0532a764fb9b 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -27,6 +27,7 @@
 #include "documenteventnotifier.hxx"
 
 #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
+#include <com/sun/star/frame/DoubleInitializationException.hpp>
 #include <com/sun/star/frame/XModel2.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 2ea984863578..919577442777 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -37,8 +37,6 @@
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/task/XJobExecutor.hpp>
-#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <com/sun/star/report/XReportEngine.hpp>
@@ -94,7 +92,6 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 #include <comphelper/storagehelper.hxx>
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index dcf2cfbb6847..4885f97e314a 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -28,7 +28,6 @@
 #include "apitools.hxx"
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/embed/XStateChangeListener.hpp>
 #include <com/sun/star/sdb/XSubDocument.hpp>
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index a1010534703c..aff11ddd5376 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -29,10 +29,9 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/frame/XController2.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XFrameLoader.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/frame/XLoadEventListener.hpp>
 #include <com/sun/star/frame/XModel2.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index be5152de4821..b60d11fad841 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -41,7 +41,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::style;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace xmloff::token;
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index e542a07c0a1d..b271d29ddcff 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameContainer.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/ErrorMessageDialog.hpp>
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 5262a422fff2..a4d508006ca5 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -34,8 +34,6 @@
 #include <com/sun/star/frame/thePopupMenuControllerFactory.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/Frame.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/frame/XFrames.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index c9b14279c90c..634ebadfabbd 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILVIEW_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILVIEW_HXX
 
-#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 6695065bb57e..c57c414464ba 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -54,7 +54,6 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::datatransfer::clipboard;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::container;
 using ::com::sun::star::sdb::application::NamedDatabaseObject;
 
diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx
index a7a1fb8bed96..cadd8b326721 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.hxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.hxx
@@ -23,7 +23,7 @@
 #include "AppElementType.hxx"
 
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
 
 #include <comphelper/sharedmutex.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index c727bdb0bba5..0517b4382832 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -91,7 +91,6 @@
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
 
 #include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 27036b7125c9..8b768662079f 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
@@ -50,7 +49,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::datatransfer;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::ui;
 using namespace ::com::sun::star::view;
 
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index c6b45907751f..8d29764cf207 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -63,7 +63,6 @@ namespace dbaui
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::i18n;
     using namespace ::com::sun::star::container;
-    using namespace ::com::sun::star::frame;
     using namespace ::com::sun::star::util;
     using namespace ::dbtools;
     using namespace ::comphelper;
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index 6f9dd87af9e7..0ede6f9d76cc 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -21,7 +21,6 @@
 
 #include <dbaccess/dataview.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/frame/XController.hpp>
 #include <vcl/split.hxx>
 #include "IClipBoardTest.hxx"
 
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index ceca8068ae8c..fc779bcd3c6d 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx
index be810b75b1a0..fe42de6415ed 100644
--- a/dbaccess/source/ui/inc/databaseobjectview.hxx
+++ b/dbaccess/source/ui/inc/databaseobjectview.hxx
@@ -23,7 +23,6 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx
index d1dd97d3f704..acad9b7e7b30 100644
--- a/dbaccess/source/ui/inc/linkeddocuments.hxx
+++ b/dbaccess/source/ui/inc/linkeddocuments.hxx
@@ -27,8 +27,6 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
 #include <comphelper/namedvaluecollection.hxx>
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 57eb77fe1cd6..a52e7c8176ab 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -68,7 +68,6 @@ using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdb::application;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::ucb;
 
 OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pControler)
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 4ab9b6e26bce..842c57ea1c7e 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -68,7 +68,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::awt;
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index d764b507dd45..d92e9b244a81 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -23,10 +23,7 @@
 
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/frame/TaskCreator.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XFrames.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/application/XTableUIProvider.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index 2904b81b7eca..0e006a5a95ef 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -25,10 +25,8 @@
 #include <comphelper/classids.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/ucb/XCommandProcessor.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument.hpp>
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 28f72782687f..7241301b61c5 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -23,7 +23,6 @@
 #include <comphelper/types.hxx>
 #include "dbustrings.hrc"
 #include <connectivity/dbtools.hxx>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <comphelper/extract.hxx>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 6090b28014a3..c92eeaf1dfb6 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -35,7 +35,6 @@
 using namespace dbaui;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::frame;
 
 // end of temp classes
 OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 6a5ad4796f18..118dd30d837e 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -43,7 +43,6 @@
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/frame/XLoadEventListener.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -61,7 +60,6 @@
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/VetoException.hpp>
-#include <com/sun/star/frame/XUntitledNumbers.hpp>
 #include <com/sun/star/ui/XUIElement.hpp>
 
 #include <comphelper/propertysequence.hxx>
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index cf32dbacdd39..0f171ef16410 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -31,7 +31,6 @@
 #include <comphelper/types.hxx>
 #include "dbustrings.hrc"
 #include <connectivity/dbtools.hxx>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <comphelper/extract.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/container/XChild.hpp>
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index db857f810671..2499e94cc618 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -54,7 +54,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 2da0d3c63ff3..a3264d3cb609 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -37,9 +37,7 @@
 
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XTitleChangeListener.hpp>
-#include <com/sun/star/frame/XUntitledNumbers.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index ca8b14d09b08..78b3437f4ef4 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -19,7 +19,6 @@
 #include <vcl/idle.hxx>
 #include <LibreOfficeKit/LibreOfficeKit.h>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
 #include <desktop/dllapi.h>
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 752f2d445855..b7b32544878d 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -10,7 +10,6 @@
 #include <memory>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/XReschedule.hpp>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 023c06af6e7e..640c2ec550cc 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -49,7 +49,6 @@
 #include <com/sun/star/frame/theAutoRecovery.hpp>
 #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp>
 #include <com/sun/star/frame/SessionListener.hpp>
-#include <com/sun/star/frame/XSessionManagerListener.hpp>
 #include <com/sun/star/frame/XSynchronousDispatch.hpp>
 #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp>
 #include <com/sun/star/configuration/CorruptedConfigurationException.hpp>
@@ -59,12 +58,10 @@
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/StartModule.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/view/XPrintable.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/configuration/MissingBootstrapFileException.hpp>
 #include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
@@ -77,7 +74,6 @@
 #include <com/sun/star/document/XDocumentEventListener.hpp>
 #include <com/sun/star/ui/theUIElementFactoryManager.hpp>
 #include <com/sun/star/ui/theWindowStateConfiguration.hpp>
-#include <com/sun/star/frame/thePopupMenuControllerFactory.hpp>
 #include <com/sun/star/office/Quickstart.hpp>
 
 #include <desktop/exithelper.h>
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index a1b65114b43f..242e73a625fc 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -39,12 +39,10 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
+#include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/view/XPrintable.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 4755690a7686..591f8524b8d5 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_DESKTOP_SOURCE_APP_DISPATCHWATCHER_HXX
 
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/frame/XDispatchResultListener.hpp>
 
 #include "officeipcthread.hxx"
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 27b9efa600db..6ec3481a649b 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -36,9 +36,6 @@
 #include <vcl/svmain.hxx>
 
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
-#include <com/sun/star/frame/XStorable2.hpp>
 #include <comphelper/storagehelper.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <unotools/mediadescriptor.hxx>
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index cc5c76b6c8e4..722ee855f9dd 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -22,7 +22,6 @@
 #include <editeng/unolingu.hxx>
 #include <unotools/pathoptions.hxx>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index c70a7ba40bd6..c87d945441b6 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -34,9 +34,6 @@
 #include <com/sun/star/util/XCloseBroadcaster.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
-#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index fc93ae18db25..27db3956834b 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/frame/XModule.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx
index 5b8cdb8c12b6..e6f04fdf5b06 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -31,9 +31,6 @@
 #include <com/sun/star/util/XCloseBroadcaster.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
-#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/embed/EmbedMapUnits.hpp>
 
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 2a3e733c4b34..1c24905e9dbd 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -35,8 +35,6 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
-#include <com/sun/star/frame/XDispatchHelper.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XControllerBorder.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 72bea300c678..0ba477264e20 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -20,7 +20,6 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/embed/XClassifiedObject.hpp>
 #include <com/sun/star/io/TempFile.hpp>
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 076c5b6b8ec5..d11f662ddc3f 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -49,10 +49,7 @@
 #include <com/sun/star/frame/Frame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include <com/sun/star/lang/SystemDependent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx
index 17905f13929a..e71d528d44ca 100644
--- a/embedserv/source/embed/ed_ioleobject.cxx
+++ b/embedserv/source/embed/ed_ioleobject.cxx
@@ -19,7 +19,6 @@
 
 #include "embeddoc.hxx"
 #include <osl/diagnose.h>
-#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index 6b610785443f..cc4c77f5b920 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/frame/XLoadable.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index fe7f72e5783c..23d856f69df1 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -21,7 +21,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 
 #include "bibliography.hrc"
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index cf0c2625c7c2..2002ac9377bf 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -23,8 +23,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XWindowPeer.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include "bibconfig.hxx"
 
@@ -60,7 +58,6 @@ BibSplitWindow::BibSplitWindow( vcl::Window* pParent, WinBits nStyle ) : SplitWi
 using namespace osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
 
 //split window size is a percent value
 #define WIN_MIN_HEIGHT 10
diff --git a/extensions/source/dbpilots/optiongrouplayouter.hxx b/extensions/source/dbpilots/optiongrouplayouter.hxx
index bf67374e1665..98bb21cf99b8 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.hxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include "dbptypes.hxx"
 
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index 9002e2ba0f40..1bf8df0f152e 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -27,7 +27,6 @@
 #include <comphelper/uno3.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index de446b6116e4..b5d931aa8182 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 12b5c30f833d..8d937f7b6a30 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -38,7 +38,6 @@
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 0538f40403aa..4e9f9be10a9b 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -25,9 +25,6 @@
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/DispatchResultEvent.hpp>
-#include <com/sun/star/frame/DispatchResultState.hpp>
 #include <com/sun/star/office/Quickstart.hpp>
 #include <com/sun/star/system/SystemShellExecute.hpp>
 #include <com/sun/star/system/SystemShellExecuteException.hpp>
diff --git a/filter/source/graphic/GraphicExportDialog.cxx b/filter/source/graphic/GraphicExportDialog.cxx
index b3b82ca98762..4cd6346ae3c7 100644
--- a/filter/source/graphic/GraphicExportDialog.cxx
+++ b/filter/source/graphic/GraphicExportDialog.cxx
@@ -22,7 +22,6 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
 
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 61ff445f40d1..e12a71ac7499 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -17,7 +17,6 @@
 #include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/ui/ItemStyle.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
 #include <fstream>
 #include <vcl/dibtools.hxx>
 #include <vcl/graph.hxx>
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 4fdd7a450626..1132009ae1e7 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -60,7 +60,6 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index e08ecf7280dd..9c282498ebb2 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -26,7 +26,6 @@
 #include <cppuhelper/queryinterface.hxx>
 
 #include <com/sun/star/view/XRenderable.hpp>
-#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
 #define SVG_DIALOG_SERVICE_NAME         "com.sun.star.comp.Draw.SVGFilterDialog"
@@ -37,7 +36,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::document;
 
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 1c9ef265b501..6266e2f113fd 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -30,10 +30,8 @@
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
-#include <com/sun/star/frame/XConfigManager.hpp>
 #include <com/sun/star/xml/XImportFilter.hpp>
 #include <com/sun/star/xml/XExportFilter.hpp>
-#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -59,7 +57,6 @@ using namespace com::sun::star::document;
 using namespace com::sun::star::style;
 using namespace com::sun::star::xml;
 using namespace com::sun::star::xml::sax;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::task;
 
 bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index d44d00ac3d5c..599f3e9091d7 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -19,7 +19,6 @@
 
 #include <com/sun/star/io/XActiveDataControl.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/frame/XConfigManager.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -52,7 +51,6 @@ using namespace osl;
 using namespace comphelper;
 using namespace com::sun::star;
 using namespace com::sun::star::lang;
-using namespace com::sun::star::frame;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::util;
 using namespace com::sun::star::container;
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 31051679b3c5..dbf14e752ceb 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/frame/XConfigManager.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
 
@@ -53,7 +52,6 @@ using namespace osl;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::io;
-using namespace com::sun::star::frame;
 using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::util;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index e7f3f989885a..2f0f18dec73d 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/frame/XConfigManager.hpp>
-
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 #include <sfx2/filedlghelper.hxx>
 #include <unotools/localfilehelper.hxx>
@@ -30,7 +28,6 @@
 #include "xmlfiltersettingsdialog.hxx"
 
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::lang;
 
 XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( vcl::Window* pParent) :
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 5367bc1a39cc..f06cc88d3304 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -25,9 +25,7 @@
 #include <com/sun/star/document/XGraphicObjectResolver.hpp>
 #include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
 #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp>
-#include <com/sun/star/frame/XConfigManager.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/system/SystemShellExecute.hpp>
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 1b435e617e79..bb1ac3dfa553 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/form/XApproveActionBroadcaster.hpp>
 #include <com/sun/star/form/submission/XSubmissionSupplier.hpp>
 #include <com/sun/star/form/submission/XSubmission.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include <com/sun/star/graphic/XGraphicObject.hpp>
 #include <cppuhelper/implbase3.hxx>
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index b13995a6ee0c..22ebb3046b2b 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -23,7 +23,6 @@
 #include "formnavigation.hxx"
 
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
 
 #include <toolkit/controls/unocontrol.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
diff --git a/forms/source/xforms/submission/submission_put.hxx b/forms/source/xforms/submission/submission_put.hxx
index 7486debdb0e9..fc3d43d6d6a7 100644
--- a/forms/source/xforms/submission/submission_put.hxx
+++ b/forms/source/xforms/submission/submission_put.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_PUT_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 
 #include "submission.hxx"
 
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index 75cf8eebbfa4..2e44244eb601 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -30,7 +30,6 @@
 #include <general.h>
 
 #include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 
 #include <cppuhelper/weakref.hxx>
diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index e5d9916e9564..3c34bb00e1ad 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -22,7 +22,7 @@
 
 #include <general.h>
 
-#include <com/sun/star/frame/XFramesSupplier.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 4deb733aeb4a..03143577c51e 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/util/URL.hpp>
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 463d69f493de..2255391c23a9 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -31,10 +31,6 @@
 #include <com/sun/star/frame/DispatchDescriptor.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XFrameLoader.hpp>
-#include <com/sun/star/frame/XLoadEventListener.hpp>
-#include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
 #include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 7ace2d5c5c5e..6dc49f794135 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -24,7 +24,6 @@
 #include <general.h>
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index 7cf4fcaa5f47..cbab719bb9a6 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <com/sun/star/frame/XTitleChangeListener.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index 207ca9f80ecf..b260f4365619 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -24,7 +24,6 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index b6b07d9b6c71..8481064bb9a8 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/frame/XDispatchResultListener.hpp>
 #include <com/sun/star/task/XJobListener.hpp>
 #include <com/sun/star/util/XCloseListener.hpp>
-#include <com/sun/star/frame/DispatchResultEvent.hpp>
 
 #include <cppuhelper/implbase.hxx>
 #include <osl/conditn.hxx>
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 08ab0e1d97c9..97ba371b5387 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/DispatchResultEvent.hpp>
 
 #include <rtl/ustring.hxx>
 
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 7e77252155b6..0ad5e938a639 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -24,11 +24,9 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
 
 namespace framework{
 
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 609419c322d4..2b07a2487d97 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -32,15 +32,10 @@
 #include <com/sun/star/frame/XDesktop2.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/frame/XTask.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/frame/XFrames.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
-#include <com/sun/star/frame/FrameAction.hpp>
 #include <com/sun/star/frame/XTasksSupplier.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 7dca5f09269e..e5abb700de58 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/XUIConfiguration.hpp>
 #include <com/sun/star/frame/XModuleManager2.hpp>
-#include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <com/sun/star/awt/XWindowListener.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/ui/XUIElementFactory.hpp>
@@ -41,8 +40,6 @@
 #include <com/sun/star/awt/XTopWindow2.hpp>
 #include <com/sun/star/awt/XDockableWindow.hpp>
 #include <com/sun/star/awt/XDockableWindowListener.hpp>
-#include <com/sun/star/frame/XMenuBarMergingAcceptor.hpp>
-#include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp>
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/propshlp.hxx>
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index fbd1a5baaba0..cd3f61e45d3d 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -23,11 +23,9 @@
 #include <uielement/toolbarmanager.hxx>
 
 #include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
 
 #include <rtl/ustring.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx
index a30e8e7db858..9427f52165f9 100644
--- a/framework/inc/uielement/addonstoolbarwrapper.hxx
+++ b/framework/inc/uielement/addonstoolbarwrapper.hxx
@@ -22,7 +22,6 @@
 
 #include <helper/uielementwrapperbase.hxx>
 
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index 822841fce60a..913f2997bdb3 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -23,12 +23,9 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/ControlCommand.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XToolbarController.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index 6b7b1a49595f..4ffbba2af918 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/ControlCommand.hpp>
 
 #include <uielement/complextoolbarcontroller.hxx>
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index 423fb8bcc37f..67b72a6be2b8 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/ControlCommand.hpp>
 
 #include <uielement/complextoolbarcontroller.hxx>
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index 2397b6e73fcd..4674b0cf0ec3 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_EDITTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/ControlCommand.hpp>
 
 #include <uielement/complextoolbarcontroller.hxx>
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index b12ed5bd2e6b..1a91747bc702 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -27,10 +27,7 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
 
 #include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 259fb7ddfedf..078e4935298e 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -29,8 +29,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/frame/status/FontHeight.hpp>
 
 #include <svtools/popupmenucontrollerbase.hxx>
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index 4039809326f0..66fcc9b347ad 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -27,11 +27,6 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
-#include <com/sun/star/frame/status/Verb.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
 #include <svtools/popupmenucontrollerbase.hxx>
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index 74e04cae7ed5..3c1f3a9f4e7e 100644
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/ControlCommand.hpp>
 
 #include <uielement/complextoolbarcontroller.hxx>
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index d439a1068da5..294b913cc38a 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -27,10 +27,7 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
 
 #include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index 4fd1ab8c7403..d0893f8c5e4b 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -26,12 +26,7 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index c07e414d0ead..ee5345d1d450 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -25,8 +25,6 @@
 #include <macros/xtypeprovider.hxx>
 #include <uielement/menubarmanager.hxx>
 
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 81b679fd58e0..5d0cb2402f99 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -27,11 +27,6 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
 
diff --git a/framework/inc/uielement/notebookbarmenucontroller.hxx b/framework/inc/uielement/notebookbarmenucontroller.hxx
index 5de553cdf3cc..2ebb4c626682 100644
--- a/framework/inc/uielement/notebookbarmenucontroller.hxx
+++ b/framework/inc/uielement/notebookbarmenucontroller.hxx
@@ -27,10 +27,7 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
 
 #include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index 9fb8dee3b3b6..cfa073fae74f 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/ControlCommand.hpp>
 
 #include <uielement/complextoolbarcontroller.hxx>
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index 51ad4ebbd074..bbafb5f55f43 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/frame/XStatusbarController.hpp>
 #include <com/sun/star/frame/XUIControllerFactory.hpp>
 #include <com/sun/star/ui/XUIConfiguration.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 
diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx
index e47a8d1034f4..7be5e5e47bb9 100644
--- a/framework/inc/uielement/statusbarwrapper.hxx
+++ b/framework/inc/uielement/statusbarwrapper.hxx
@@ -23,7 +23,6 @@
 #include <helper/uiconfigelementwrapperbase.hxx>
 #include <uielement/statusbarmanager.hxx>
 
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 7d9532eea5ac..1550e554d59f 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/ControlCommand.hpp>
 
 #include <uielement/complextoolbarcontroller.hxx>
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 86d5820b143e..9821c05cace3 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/frame/XUIControllerFactory.hpp>
 #include <com/sun/star/frame/XSubToolbarController.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
diff --git a/framework/inc/uielement/toolbarmodemenucontroller.hxx b/framework/inc/uielement/toolbarmodemenucontroller.hxx
index e4a526ed8460..40ddbae29465 100644
--- a/framework/inc/uielement/toolbarmodemenucontroller.hxx
+++ b/framework/inc/uielement/toolbarmodemenucontroller.hxx
@@ -27,10 +27,7 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
 
 #include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 4f7b8085beea..c9a8429e479e 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -27,12 +27,8 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index 9bf9a8c62018..0e8da868a5a4 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -22,7 +22,6 @@
 
 #include <helper/uiconfigelementwrapperbase.hxx>
 
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/XUIFunctionListener.hpp>
diff --git a/framework/source/dispatch/dispatchdisabler.cxx b/framework/source/dispatch/dispatchdisabler.cxx
index 725b2e7557fe..c93c5927ef58 100644
--- a/framework/source/dispatch/dispatchdisabler.cxx
+++ b/framework/source/dispatch/dispatchdisabler.cxx
@@ -12,7 +12,6 @@
 #include "services.h"
 #include "dispatch/dispatchdisabler.hxx"
 
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/DispatchDescriptor.hpp>
 
 using namespace css;
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 7f86dbd6de18..98db6c40c283 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -24,7 +24,6 @@
 #include <services.h>
 #include <properties.h>
 
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XLayoutManager2.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <com/sun/star/awt/WindowDescriptor.hpp>
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 64f5974e227e..5fa4a17cb590 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -28,11 +28,9 @@
 
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/CommandGroup.hpp>
 #include <com/sun/star/frame/StartModule.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index 81ad5c94425c..0dcbfc24ab07 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/xml/sax/Writer.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <comphelper/processfactory.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 19082f52503f..90f324c5240d 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -19,7 +19,6 @@
 
 #include <helper/oframes.hxx>
 
-#include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vcl/svapp.hxx>
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 2b10d69972f1..ea8120050863 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMaterialHolder.hpp>
+#include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index bc0b0190354d..277f75a7779a 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -25,9 +25,6 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
-#include <com/sun/star/frame/XFrameLoader.hpp>
-#include <com/sun/star/frame/XLoadEventListener.hpp>
-#include <com/sun/star/frame/XDispatchResultListener.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index a31ced460cb6..c8e9f1fa21f2 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -22,9 +22,6 @@
 
 #include <general.h>
 
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/util/CloseVetoException.hpp>
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 11f5c9bfb6fd..30feb2813b5c 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XEventListener.hpp>
-#include <com/sun/star/frame/XModuleManager2.hpp>
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 5fa25c937041..4e646c2701fc 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -34,11 +34,8 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/XUIConfiguration.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
-#include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <com/sun/star/awt/XWindowListener.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/ui/XUIElementFactory.hpp>
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index be8b18f8a48b..7c3c2e4b80d1 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -50,7 +50,6 @@
 #include <com/sun/star/task/ErrorCodeRequest.hpp>
 #include <com/sun/star/ucb/InteractiveIOException.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-#include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index d00238d6c9b5..1dcd2681c1e2 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -46,7 +46,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::configuration;
 using namespace com::sun::star::container;
-using namespace ::com::sun::star::frame;
 using namespace framework;
 
 namespace {
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index c44f7090ac8a..63b8c4729b89 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -37,10 +37,8 @@
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/frame/XToolbarController.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/ui/DockingArea.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index b8c671edb931..f295feff2d14 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -20,12 +20,7 @@
 #include "uielement/comboboxtoolbarcontroller.hxx"
 
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/status/ItemStatus.hpp>
-#include <com/sun/star/frame/status/ItemState.hpp>
-#include <com/sun/star/frame/status/Visibility.hpp>
-#include <com/sun/star/frame/XControlNotificationListener.hpp>
 #include <com/sun/star/util/Color.hpp>
 
 #include <svtools/toolboxcontroller.hxx>
@@ -40,7 +35,6 @@ using namespace css::uno;
 using namespace css::beans;
 using namespace css::lang;
 using namespace css::frame;
-using namespace css::frame::status;
 using namespace css::util;
 
 namespace framework
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index ced85e93f49f..7809d910c983 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -21,11 +21,9 @@
 
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
-#include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 #include <com/sun/star/frame/XControlNotificationListener.hpp>
 
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index ebbcb52b616f..ca5fd47985d9 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
 
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/builder.hxx>
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 348d0634f4dd..d5f372cbe12a 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -20,12 +20,7 @@
 #include "uielement/dropdownboxtoolbarcontroller.hxx"
 
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/status/ItemStatus.hpp>
-#include <com/sun/star/frame/status/ItemState.hpp>
-#include <com/sun/star/frame/status/Visibility.hpp>
-#include <com/sun/star/frame/XControlNotificationListener.hpp>
 
 #include <svtools/toolboxcontroller.hxx>
 #include <osl/mutex.hxx>
@@ -39,7 +34,6 @@ using namespace css::uno;
 using namespace css::beans;
 using namespace css::lang;
 using namespace css::frame;
-using namespace css::frame::status;
 using namespace css::util;
 
 namespace framework
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index c82b5dfbb7c1..3498aa5aaea4 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -20,12 +20,7 @@
 #include "uielement/edittoolbarcontroller.hxx"
 
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/status/ItemStatus.hpp>
-#include <com/sun/star/frame/status/ItemState.hpp>
-#include <com/sun/star/frame/status/Visibility.hpp>
-#include <com/sun/star/frame/XControlNotificationListener.hpp>
 
 #include <svtools/toolboxcontroller.hxx>
 #include <osl/mutex.hxx>
@@ -38,7 +33,6 @@ using namespace css::uno;
 using namespace css::beans;
 using namespace css::lang;
 using namespace css::frame;
-using namespace css::frame::status;
 using namespace css::util;
 
 namespace framework
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index 8efb744c9581..d139475079bf 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -41,7 +40,6 @@
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
-using namespace com::sun::star::frame;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::util;
 using namespace com::sun::star::style;
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 8c1a64b34f44..aa6ad944faed 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 54762061bda9..dc0fe07af16a 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -22,9 +22,7 @@
 #include <framework/addonsoptions.hxx>
 
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/XControlNotificationListener.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <osl/mutex.hxx>
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index dc9ecb06c6cd..e8c1c11a33c8 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -34,7 +34,6 @@
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/document/XDocumentLanguages.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
 
 #include <i18nlangtag/mslangid.hxx>
 #include <svl/languageoptions.hxx>
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 15b0b488833e..471295f6a64f 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -37,12 +37,8 @@
 #include <com/sun/star/document/XDocumentLanguages.hpp>
 #include <i18nlangtag/mslangid.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <com/sun/star/frame/XModule.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 
 #include <com/sun/star/frame/XFrame.hpp>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list