From a5dba7dbec8fb6ac709375fc7c5af0430dfb6c0b Mon Sep 17 00:00:00 2001
From: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Date: Fri, 16 Jun 2017 23:30:28 +0200
Subject: remove unused osl/mutex.hxx includes

Change-Id: I3b50e45fdb99e9cd8bfda07356ee3ddb4dd0f8bb
Reviewed-on: https://gerrit.libreoffice.org/38905
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
---
 avmedia/source/viewer/mediawindow_impl.cxx                            | 1 -
 basctl/source/dlged/dlgedclip.cxx                                     | 1 -
 basic/source/classes/eventatt.cxx                                     | 2 --
 basic/source/classes/sb.cxx                                           | 1 -
 basic/source/classes/sbxmod.cxx                                       | 1 -
 basic/source/runtime/iosys.cxx                                        | 1 -
 basic/source/uno/dlgcont.cxx                                          | 2 --
 basic/source/uno/scriptcont.cxx                                       | 1 -
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx                     | 1 -
 bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx                    | 1 -
 bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx                    | 1 -
 bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx                    | 1 -
 bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx                  | 1 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx                  | 2 --
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx                 | 1 -
 canvas/source/cairo/cairo_devicehelper.cxx                            | 1 -
 canvas/source/cairo/cairo_spritedevicehelper.cxx                      | 1 -
 canvas/source/directx/dx_devicehelper.cxx                             | 1 -
 canvas/source/directx/dx_spritedevicehelper.cxx                       | 1 -
 canvas/source/opengl/ogl_spritedevicehelper.cxx                       | 1 -
 canvas/source/vcl/bitmapbackbuffer.cxx                                | 1 -
 chart2/source/controller/accessibility/AccessibleTextHelper.cxx       | 1 -
 chart2/source/controller/inc/ChartDocumentWrapper.hxx                 | 1 -
 chart2/source/controller/main/ChartController_EditData.cxx            | 1 -
 chart2/source/controller/main/ChartController_Insert.cxx              | 1 -
 chart2/source/controller/main/ChartController_Position.cxx            | 1 -
 chart2/source/controller/main/ChartController_Properties.cxx          | 1 -
 chart2/source/controller/main/ChartController_TextEdit.cxx            | 1 -
 chart2/source/controller/main/ChartController_Tools.cxx               | 1 -
 chart2/source/controller/main/ChartController_Window.cxx              | 1 -
 chart2/source/controller/main/DrawCommandDispatch.cxx                 | 1 -
 chart2/source/controller/main/ElementSelector.cxx                     | 1 -
 chart2/source/controller/main/SelectionHelper.cxx                     | 1 -
 chart2/source/controller/main/ShapeController.cxx                     | 1 -
 chart2/source/controller/main/UndoCommandDispatch.cxx                 | 1 -
 chart2/source/model/inc/DataSeries.hxx                                | 1 -
 chart2/source/model/main/DataPoint.hxx                                | 1 -
 chart2/source/model/main/GridProperties.hxx                           | 1 -
 cli_ure/source/uno_bridge/cli_proxy.cxx                               | 1 -
 configmgr/source/propertynode.cxx                                     | 1 -
 connectivity/source/cpool/ZDriverWrapper.hxx                          | 1 -
 connectivity/source/drivers/jdbc/Object.cxx                           | 1 -
 connectivity/source/drivers/mork/MColumnAlias.hxx                     | 1 -
 cppcanvas/source/mtfrenderer/implrenderer.cxx                         | 1 -
 cppu/source/threadpool/threadident.cxx                                | 1 -
 cppuhelper/source/exc_thrower.cxx                                     | 1 -
 cui/source/dialogs/cuifmsearch.cxx                                    | 1 -
 cui/source/dialogs/cuigaldlg.cxx                                      | 1 -
 cui/source/dialogs/scriptdlg.cxx                                      | 1 -
 dbaccess/source/core/dataaccess/documenteventexecutor.cxx             | 1 -
 dbaccess/source/core/inc/core_resource.hxx                            | 1 -
 dbaccess/source/ext/macromigration/progresscapture.cxx                | 1 -
 dbaccess/source/filter/xml/xmlfilter.cxx                              | 1 -
 dbaccess/source/ui/dlg/DbAdminImpl.cxx                                | 1 -
 dbaccess/source/ui/dlg/tablespage.cxx                                 | 1 -
 dbaccess/source/ui/dlg/tablespage.hxx                                 | 1 -
 dbaccess/source/ui/inc/brwctrlr.hxx                                   | 1 -
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx                 | 1 -
 dbaccess/source/ui/uno/dbinteraction.cxx                              | 1 -
 desktop/inc/app.hxx                                                   | 1 -
 desktop/source/app/check_ext_deps.cxx                                 | 1 -
 desktop/source/deployment/gui/dp_gui_theextmgr.cxx                    | 2 --
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx                 | 1 -
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx          | 1 -
 desktop/source/deployment/misc/dp_misc.cxx                            | 1 -
 desktop/source/migration/migration.cxx                                | 2 --
 editeng/source/accessibility/AccessibleEditableTextPara.cxx           | 1 -
 editeng/source/accessibility/AccessibleImageBullet.cxx                | 1 -
 editeng/source/editeng/eeobj.cxx                                      | 1 -
 editeng/source/editeng/impedit.cxx                                    | 1 -
 editeng/source/uno/UnoForbiddenCharsTable.cxx                         | 1 -
 editeng/source/uno/unoedprx.cxx                                       | 1 -
 editeng/source/uno/unofield.cxx                                       | 1 -
 editeng/source/uno/unonrule.cxx                                       | 1 -
 editeng/source/uno/unotext.cxx                                        | 1 -
 editeng/source/uno/unotext2.cxx                                       | 1 -
 embeddedobj/source/msole/graphconvert.cxx                             | 1 -
 extensions/source/bibliography/bibbeam.cxx                            | 1 -
 extensions/source/bibliography/bibcont.cxx                            | 2 --
 extensions/source/bibliography/bibload.cxx                            | 1 -
 extensions/source/bibliography/datman.cxx                             | 1 -
 extensions/source/bibliography/toolbar.cxx                            | 1 -
 extensions/source/resource/ResourceIndexAccess.cxx                    | 1 -
 extensions/source/update/ui/updatecheckui.cxx                         | 2 --
 filter/source/flash/swfuno.cxx                                        | 1 -
 filter/source/pdf/pdfuno.cxx                                          | 1 -
 filter/source/svg/svgfilter.cxx                                       | 2 --
 filter/source/t602/filterenv.cxx                                      | 1 -
 filter/source/xmlfilteradaptor/genericfilter.cxx                      | 1 -
 filter/source/xsltdialog/xmlfiltertestdialog.cxx                      | 1 -
 forms/source/richtext/richtextengine.cxx                              | 1 -
 formula/source/core/inc/core_resource.hxx                             | 1 -
 fpicker/source/office/OfficeFilePicker.cxx                            | 1 -
 framework/inc/classes/actiontriggerpropertyset.hxx                    | 1 -
 framework/inc/classes/actiontriggerseparatorpropertyset.hxx           | 1 -
 framework/source/dispatch/closedispatcher.cxx                         | 1 -
 framework/source/dispatch/popupmenudispatcher.cxx                     | 1 -
 framework/source/dispatch/startmoduledispatcher.cxx                   | 1 -
 framework/source/fwe/classes/fwkresid.cxx                             | 1 -
 framework/source/fwe/classes/imagewrapper.cxx                         | 1 -
 framework/source/fwe/helper/actiontriggerhelper.cxx                   | 1 -
 framework/source/inc/pattern/window.hxx                               | 1 -
 framework/source/uiconfiguration/imagemanager.cxx                     | 1 -
 framework/source/uiconfiguration/moduleimagemanager.cxx               | 1 -
 framework/source/uielement/buttontoolbarcontroller.cxx                | 1 -
 framework/source/uielement/comboboxtoolbarcontroller.cxx              | 1 -
 framework/source/uielement/complextoolbarcontroller.cxx               | 1 -
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx           | 1 -
 framework/source/uielement/edittoolbarcontroller.cxx                  | 1 -
 framework/source/uielement/generictoolbarcontroller.cxx               | 1 -
 framework/source/uielement/imagebuttontoolbarcontroller.cxx           | 1 -
 framework/source/uielement/langselectionstatusbarcontroller.cxx       | 1 -
 framework/source/uielement/spinfieldtoolbarcontroller.cxx             | 1 -
 framework/source/uielement/statusindicatorinterfacewrapper.cxx        | 1 -
 framework/source/uielement/togglebuttontoolbarcontroller.cxx          | 1 -
 i18npool/source/registerservices/registerservices.cxx                 | 1 -
 include/basic/sbstar.hxx                                              | 1 -
 include/canvas/vclwrapper.hxx                                         | 1 -
 include/comphelper/profilezone.hxx                                    | 1 -
 include/comphelper/unique_disposing_ptr.hxx                           | 1 -
 include/jvmfwk/framework.hxx                                          | 1 -
 include/sfx2/sfxbasecontroller.hxx                                    | 1 -
 include/sfx2/sfxbasemodel.hxx                                         | 1 -
 include/sfx2/sfxuno.hxx                                               | 1 -
 include/sfx2/thumbnailviewitem.hxx                                    | 1 -
 include/svtools/javacontext.hxx                                       | 1 -
 include/svtools/javainteractionhandler.hxx                            | 1 -
 include/toolkit/awt/vclxcontainer.hxx                                 | 1 -
 include/toolkit/awt/vclxdevice.hxx                                    | 1 -
 include/toolkit/awt/vclxgraphics.hxx                                  | 1 -
 include/toolkit/awt/vclxprinter.hxx                                   | 1 -
 include/toolkit/awt/vclxsystemdependentwindow.hxx                     | 1 -
 include/toolkit/awt/vclxtopwindow.hxx                                 | 1 -
 include/toolkit/controls/unocontrolmodel.hxx                          | 1 -
 include/toolkit/helper/listenermultiplexer.hxx                        | 1 -
 include/ucbhelper/contenthelper.hxx                                   | 1 -
 include/ucbhelper/fd_inputstream.hxx                                  | 1 -
 include/ucbhelper/macros.hxx                                          | 1 -
 include/ucbhelper/providerhelper.hxx                                  | 1 -
 include/unotools/historyoptions.hxx                                   | 1 -
 include/unotools/lingucfg.hxx                                         | 1 -
 io/test/stm/datatest.cxx                                              | 1 -
 io/test/stm/marktest.cxx                                              | 1 -
 io/test/stm/pipetest.cxx                                              | 1 -
 io/test/stm/pumptest.cxx                                              | 1 -
 jvmfwk/source/fwkutil.cxx                                             | 1 -
 l10ntools/source/xmlparse.cxx                                         | 1 -
 linguistic/source/convdicxml.cxx                                      | 2 --
 linguistic/source/thesdsp.hxx                                         | 2 --
 remotebridges/source/unourl_resolver/unourl_resolver.cxx              | 2 --
 reportdesign/source/core/sdr/UndoActions.cxx                          | 1 -
 reportdesign/source/filter/xml/xmlExport.cxx                          | 1 -
 reportdesign/source/filter/xml/xmlfilter.cxx                          | 1 -
 sal/qa/osl/pipe/osl_Pipe.cxx                                          | 2 --
 sc/source/ui/app/drwtrans.cxx                                         | 1 -
 sc/source/ui/app/transobj.cxx                                         | 1 -
 sc/source/ui/inc/AccessibleContextBase.hxx                            | 1 -
 sc/source/ui/unoobj/srchuno.cxx                                       | 1 -
 sc/source/ui/unoobj/unodoc.cxx                                        | 1 -
 scripting/source/basprov/baslibnode.cxx                               | 1 -
 scripting/source/basprov/basmethnode.cxx                              | 1 -
 scripting/source/basprov/basmodnode.cxx                               | 1 -
 scripting/source/basprov/basscript.cxx                                | 1 -
 scripting/source/protocolhandler/scripthandler.cxx                    | 2 --
 sd/source/core/CustomAnimationPreset.cxx                              | 1 -
 sd/source/core/TransitionPreset.cxx                                   | 1 -
 sd/source/core/sdpage_animations.cxx                                  | 1 -
 sd/source/core/stlfamily.cxx                                          | 1 -
 sd/source/ui/accessibility/AccessibleOutlineView.cxx                  | 1 -
 sd/source/ui/app/sdxfer.cxx                                           | 1 -
 sd/source/ui/controller/slidelayoutcontroller.cxx                     | 2 --
 sd/source/ui/dlg/TemplateScanner.cxx                                  | 1 -
 sd/source/ui/dlg/filedlg.cxx                                          | 1 -
 sd/source/ui/framework/factories/BasicPaneFactory.hxx                 | 1 -
 sd/source/ui/framework/factories/BasicToolBarFactory.hxx              | 1 -
 sd/source/ui/framework/factories/BasicViewFactory.hxx                 | 1 -
 sd/source/ui/framework/module/CenterViewFocusModule.hxx               | 1 -
 sd/source/ui/framework/module/ToolBarModule.hxx                       | 1 -
 sd/source/ui/framework/module/ViewTabBarModule.hxx                    | 1 -
 sd/source/ui/inc/framework/ModuleController.hxx                       | 1 -
 sd/source/ui/inc/framework/PresentationFactory.hxx                    | 1 -
 sd/source/ui/inc/framework/ViewShellWrapper.hxx                       | 1 -
 sd/source/ui/presenter/SlideRenderer.cxx                              | 1 -
 sd/source/ui/sidebar/MasterPageContainer.hxx                          | 1 -
 sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx                      | 1 -
 sd/source/ui/slideshow/slideshow.cxx                                  | 2 --
 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx              | 1 -
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx                  | 1 -
 sd/source/ui/slidesorter/shell/SlideSorterService.cxx                 | 1 -
 sd/source/ui/unoidl/DrawController.cxx                                | 1 -
 sd/source/ui/unoidl/SdUnoOutlineView.cxx                              | 1 -
 sd/source/ui/unoidl/UnoDocumentSettings.cxx                           | 2 --
 sd/source/ui/unoidl/unocpres.cxx                                      | 1 -
 sd/source/ui/unoidl/unodoc.cxx                                        | 1 -
 sd/source/ui/unoidl/unolayer.cxx                                      | 1 -
 sd/source/ui/unoidl/unomodel.cxx                                      | 2 --
 sd/source/ui/unoidl/unomodule.cxx                                     | 1 -
 sd/source/ui/unoidl/unoobj.cxx                                        | 1 -
 sd/source/ui/unoidl/unopage.cxx                                       | 2 --
 sd/source/ui/unoidl/unopback.cxx                                      | 1 -
 sd/source/ui/unoidl/unosrch.cxx                                       | 1 -
 sd/source/ui/view/ViewClipboard.cxx                                   | 1 -
 sd/source/ui/view/ViewTabBar.cxx                                      | 1 -
 sd/source/ui/view/drviews8.cxx                                        | 1 -
 sdext/source/minimizer/pppoptimizeruno.cxx                            | 1 -
 sdext/source/presenter/PresenterPane.cxx                              | 1 -
 sdext/source/presenter/PresenterPaneBase.cxx                          | 1 -
 sdext/source/presenter/PresenterSpritePane.cxx                        | 1 -
 sfx2/source/appl/appdata.cxx                                          | 2 --
 sfx2/source/appl/appmisc.cxx                                          | 1 -
 sfx2/source/appl/appopen.cxx                                          | 3 ---
 sfx2/source/appl/fwkhelper.cxx                                        | 1 -
 sfx2/source/appl/shutdowniconaqua.mm                                  | 1 -
 sfx2/source/appl/shutdowniconunx.cxx                                  | 1 -
 sfx2/source/bastyp/fltlst.cxx                                         | 1 -
 sfx2/source/control/sfxstatuslistener.cxx                             | 1 -
 sfx2/source/control/unoctitm.cxx                                      | 1 -
 sfx2/source/dialog/filedlghelper.cxx                                  | 1 -
 sfx2/source/doc/Metadatable.cxx                                       | 1 -
 sfx2/source/doc/objmisc.cxx                                           | 1 -
 sfx2/source/doc/objxtor.cxx                                           | 1 -
 sfx2/source/inc/sfxpicklist.hxx                                       | 1 -
 sfx2/source/inc/sfxtypes.hxx                                          | 2 --
 sfx2/source/inc/workwin.hxx                                           | 1 -
 sfx2/source/inet/inettbc.cxx                                          | 1 -
 sfx2/source/view/frmload.cxx                                          | 1 -
 sfx2/source/view/viewsh.cxx                                           | 1 -
 shell/source/cmdmail/cmdmailsuppl.hxx                                 | 1 -
 shell/source/unix/exec/shellexec.hxx                                  | 1 -
 slideshow/source/engine/slide/shapemanagerimpl.hxx                    | 1 -
 slideshow/source/engine/transitions/slidechangebase.hxx               | 2 --
 starmath/source/accessibility.cxx                                     | 1 -
 starmath/source/accessibility.hxx                                     | 1 -
 starmath/source/mathmlexport.cxx                                      | 1 -
 starmath/source/mathmlimport.cxx                                      | 1 -
 starmath/source/unodoc.cxx                                            | 1 -
 starmath/source/unomodel.cxx                                          | 1 -
 stoc/source/loader/dllcomponentloader.cxx                             | 1 -
 svl/source/svdde/ddecli.cxx                                           | 1 -
 svtools/source/config/test/test.cxx                                   | 1 -
 svtools/source/graphic/descriptor.cxx                                 | 1 -
 svtools/source/graphic/graphic.cxx                                    | 1 -
 svtools/source/graphic/provider.cxx                                   | 1 -
 svtools/source/graphic/renderer.cxx                                   | 1 -
 svtools/source/graphic/transformer.cxx                                | 1 -
 svtools/source/java/javainteractionhandler.cxx                        | 1 -
 svtools/source/misc/cliplistener.cxx                                  | 1 -
 svtools/source/misc/ehdl.cxx                                          | 1 -
 svtools/source/misc/embedhlp.cxx                                      | 1 -
 svtools/source/misc/imagemgr.cxx                                      | 1 -
 svtools/source/uno/framestatuslistener.cxx                            | 1 -
 svtools/source/uno/generictoolboxcontroller.cxx                       | 1 -
 svtools/source/uno/statusbarcontroller.cxx                            | 1 -
 svtools/source/uno/toolboxcontroller.cxx                              | 1 -
 svtools/source/uno/unocontroltablemodel.cxx                           | 1 -
 svtools/source/uno/unogridcolumnfacade.cxx                            | 1 -
 svtools/source/uno/unoimap.cxx                                        | 1 -
 svx/source/accessibility/AccessibleFrameSelector.cxx                  | 1 -
 svx/source/accessibility/ChildrenManagerImpl.hxx                      | 1 -
 svx/source/accessibility/DescriptionGenerator.cxx                     | 1 -
 svx/source/accessibility/ShapeTypeHandler.cxx                         | 1 -
 svx/source/dialog/graphctl.cxx                                        | 1 -
 svx/source/form/fmtextcontrolshell.cxx                                | 1 -
 svx/source/form/fmvwimp.cxx                                           | 1 -
 svx/source/inc/GraphCtlAccessibleContext.hxx                          | 1 -
 svx/source/inc/charmapacc.hxx                                         | 1 -
 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx              | 1 -
 svx/source/smarttags/SmartTagMgr.cxx                                  | 1 -
 svx/source/svdraw/sdrpagewindow.cxx                                   | 1 -
 svx/source/svdraw/svdoole2.cxx                                        | 1 -
 svx/source/table/accessibletableshape.cxx                             | 1 -
 svx/source/table/cell.cxx                                             | 1 -
 svx/source/tbxctrls/extrusioncontrols.cxx                             | 2 --
 svx/source/tbxctrls/tbunocontroller.cxx                               | 1 -
 svx/source/tbxctrls/tbunosearchcontrollers.cxx                        | 1 -
 .../unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx   | 1 -
 svx/source/unodraw/UnoGraphicExporter.cxx                             | 2 --
 svx/source/unodraw/UnoNameItemTable.cxx                               | 1 -
 svx/source/unodraw/UnoNamespaceMap.cxx                                | 2 --
 svx/source/unodraw/XPropertyTable.cxx                                 | 1 -
 svx/source/unodraw/unomlstr.cxx                                       | 1 -
 svx/source/unodraw/unomod.cxx                                         | 2 --
 svx/source/unodraw/unomtabl.cxx                                       | 1 -
 svx/source/unodraw/unopool.cxx                                        | 1 -
 svx/source/unodraw/unoprov.cxx                                        | 1 -
 svx/source/unodraw/unoshap2.cxx                                       | 1 -
 svx/source/unodraw/unoshap3.cxx                                       | 1 -
 svx/source/unodraw/unoshap4.cxx                                       | 2 --
 svx/source/unodraw/unoshtxt.cxx                                       | 4 ----
 svx/source/unogallery/unogalitem.cxx                                  | 1 -
 svx/source/unogallery/unogaltheme.cxx                                 | 1 -
 svx/source/unogallery/unogalthemeprovider.cxx                         | 1 -
 sw/inc/unobaseclass.hxx                                               | 1 -
 sw/source/core/access/accdoc.cxx                                      | 1 -
 sw/source/core/access/accfootnote.cxx                                 | 1 -
 sw/source/core/access/accheaderfooter.cxx                             | 1 -
 sw/source/core/access/acchyperlink.cxx                                | 1 -
 sw/source/core/access/accnotextframe.cxx                              | 1 -
 sw/source/core/access/acctable.cxx                                    | 1 -
 sw/source/core/access/acctextframe.cxx                                | 1 -
 sw/source/core/bastyp/SwSmartTagMgr.cxx                               | 1 -
 sw/source/core/doc/docchart.cxx                                       | 1 -
 sw/source/core/inc/swthreadmanager.hxx                                | 1 -
 sw/source/core/unocore/SwXTextDefaults.cxx                            | 1 -
 sw/source/core/unocore/unocoll.cxx                                    | 1 -
 sw/source/core/unocore/unoflatpara.cxx                                | 1 -
 sw/source/core/unocore/unoobj.cxx                                     | 1 -
 sw/source/core/unocore/unoobj2.cxx                                    | 1 -
 sw/source/core/unocore/unoport.cxx                                    | 1 -
 sw/source/core/unocore/unoportenum.cxx                                | 1 -
 sw/source/core/unocore/unoredline.cxx                                 | 1 -
 sw/source/core/unocore/unoredlines.cxx                                | 1 -
 sw/source/core/unocore/unosett.cxx                                    | 1 -
 sw/source/core/unocore/unosrch.cxx                                    | 1 -
 sw/source/core/unocore/unostyle.cxx                                   | 1 -
 sw/source/core/unocore/unotext.cxx                                    | 1 -
 sw/source/core/unocore/unotextmarkup.cxx                              | 1 -
 sw/source/filter/xml/XMLRedlineImportHelper.cxx                       | 1 -
 sw/source/filter/xml/xmlimp.cxx                                       | 1 -
 sw/source/filter/xml/xmltbli.cxx                                      | 1 -
 sw/source/filter/xml/xmltexti.cxx                                     | 1 -
 sw/source/ui/dbui/mmresultdialogs.cxx                                 | 1 -
 sw/source/uibase/dbui/dbtree.cxx                                      | 1 -
 sw/source/uibase/dochdl/swdtflvr.cxx                                  | 1 -
 sw/source/uibase/docvw/edtwin.cxx                                     | 1 -
 sw/source/uibase/uiview/pview.cxx                                     | 1 -
 sw/source/uibase/uiview/uivwimp.cxx                                   | 1 -
 sw/source/uibase/uno/SwXDocumentSettings.cxx                          | 1 -
 sw/source/uibase/uno/SwXFilterOptions.cxx                             | 1 -
 sw/source/uibase/uno/dlelstnr.cxx                                     | 1 -
 sw/source/uibase/uno/unoatxt.cxx                                      | 1 -
 sw/source/uibase/uno/unodoc.cxx                                       | 1 -
 sw/source/uibase/uno/unomod.cxx                                       | 1 -
 sw/source/uibase/uno/unomodule.cxx                                    | 1 -
 sw/source/uibase/uno/unotxvw.cxx                                      | 1 -
 toolkit/source/awt/asynccallback.cxx                                  | 1 -
 toolkit/source/controls/eventcontainer.cxx                            | 2 --
 ucb/source/core/FileAccess.cxx                                        | 2 --
 ucb/source/ucp/ftp/ftpcontentprovider.hxx                             | 1 -
 ucb/source/ucp/ftp/ftpurl.hxx                                         | 1 -
 unotools/source/config/bootstrap.cxx                                  | 1 -
 unoxml/source/service/services.cxx                                    | 1 -
 uui/source/fltdlg.cxx                                                 | 1 -
 uui/source/iahndl-authentication.cxx                                  | 1 -
 uui/source/iahndl-errorhandler.cxx                                    | 1 -
 uui/source/iahndl-filter.cxx                                          | 1 -
 uui/source/iahndl-locking.cxx                                         | 1 -
 uui/source/iahndl-ssl.cxx                                             | 1 -
 uui/source/iahndl.cxx                                                 | 1 -
 uui/source/iahndl.hxx                                                 | 1 -
 vbahelper/source/vbahelper/vbashape.cxx                               | 1 -
 vcl/inc/unx/x11/x11sys.hxx                                            | 1 -
 vcl/quartz/salgdi.cxx                                                 | 1 -
 vcl/source/app/svdata.cxx                                             | 1 -
 vcl/source/components/factory.cxx                                     | 1 -
 vcl/source/control/edit.cxx                                           | 2 --
 vcl/source/edit/textview.cxx                                          | 2 --
 vcl/source/helper/canvasbitmap.cxx                                    | 1 -
 vcl/unx/generic/app/saldata.cxx                                       | 1 -
 vcl/unx/gtk/a11y/atkutil.cxx                                          | 1 -
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx                              | 1 -
 vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx                            | 1 -
 vcl/unx/gtk/fpicker/SalGtkPicker.cxx                                  | 1 -
 vcl/unx/kde4/KDE4FilePicker.cxx                                       | 2 --
 winaccessibility/inc/AccEventListener.hxx                             | 2 --
 winaccessibility/inc/AccObjectWinManager.hxx                          | 1 -
 writerfilter/source/ooxml/OOXMLFactory.cxx                            | 1 -
 xmlhelp/source/cxxhelp/provider/provider.hxx                          | 1 -
 xmloff/source/core/attrlist.cxx                                       | 2 --
 xmloff/source/core/xmlimp.cxx                                         | 2 --
 xmloff/source/draw/animationimport.cxx                                | 1 -
 xmloff/source/forms/attriblistmerge.hxx                               | 1 -
 xmloff/source/style/StyleMap.cxx                                      | 2 --
 xmloff/source/transform/MutableAttrList.cxx                           | 2 --
 xmlscript/source/inc/xml_import.hxx                                   | 1 -
 xmlsecurity/source/gpg/GpgComponentFactory.cxx                        | 1 -
 xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx                    | 1 -
 xmlsecurity/source/xmlsec/nss/xsec_nss.cxx                            | 1 -
 378 files changed, 419 deletions(-)

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 62c2d976801f..d362a5b7e0c0 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -31,7 +31,6 @@
 #include <cmath>
 
 #include <comphelper/processfactory.hxx>
-#include <osl/mutex.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/securityoptions.hxx>
 #include <vcl/svapp.hxx>
diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx
index 1c0193b45e0b..8957d81576b5 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "dlgedclip.hxx"
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp>
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 29a20f8a5be9..1eb725e0c176 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 
@@ -62,7 +61,6 @@ using namespace ::com::sun::star::reflection;
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::io;
 using namespace ::cppu;
-using namespace ::osl;
 
 
 void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Reference< frame::XModel >& xModel )
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 23f6244ec28d..3f59b63118ff 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -38,7 +38,6 @@
 #include "filefmt.hxx"
 #include "sb.hrc"
 #include <basrid.hxx>
-#include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/XCloseBroadcaster.hpp>
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index d77e7dd0f881..cea279f14b7a 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -36,7 +36,6 @@
 #include <sal/log.hxx>
 
 #include <basic/basrdll.hxx>
-#include <osl/mutex.hxx>
 #include "sbobjmod.hxx"
 #include <basic/vbahelper.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index fc4868960837..5782026bc946 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -25,7 +25,6 @@
 #include <vcl/svapp.hxx>
 #include <osl/file.hxx>
 #include <tools/urlobj.hxx>
-#include <osl/mutex.hxx>
 
 #include "runtime.hxx"
 
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 201f873c4742..a30f822a3c44 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -34,7 +34,6 @@
 #include "dlgcont.hxx"
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
-#include <osl/mutex.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -58,7 +57,6 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::xml::sax;
 using namespace com::sun::star;
 using namespace cppu;
-using namespace osl;
 
 using com::sun::star::uno::Reference;
 
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index ab8dbadd350e..b93217485929 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -38,7 +38,6 @@
 #include <comphelper/storagehelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <rtl/digest.h>
 #include <rtl/strbuf.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 5a53fb038e5e..61a24879da09 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -21,7 +21,6 @@
 
 #include <rtl/alloc.h>
 #include <sal/log.hxx>
-#include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index ed30fc078d94..5491e0153b7e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -20,7 +20,6 @@
 #include <malloc.h>
 
 #include <rtl/alloc.h>
-#include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index cbb6f33b601f..c293f3ce6b64 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -21,7 +21,6 @@
 
 #include <rtl/alloc.h>
 #include <sal/log.hxx>
-#include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index c434f5d9fbc4..35e1f231d770 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -37,7 +37,6 @@ using namespace com::sun::star::uno;
 #ifdef BRDEBUG
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <osl/mutex.hxx>
 using namespace ::std;
 using namespace ::osl;
 using namespace ::rtl;
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
index 7b1f4ef27b93..7282208dddb9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
@@ -38,7 +38,6 @@ using namespace com::sun::star::uno;
 #ifdef BRDEBUG
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <osl/mutex.hxx>
 using namespace ::std;
 using namespace ::osl;
 using namespace ::rtl;
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 0c41d0358773..3f5857fdc5d4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -23,7 +23,6 @@
 
 #include <rtl/alloc.h>
 #include <sal/log.hxx>
-#include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
@@ -41,7 +40,6 @@
 #include "rtti.hxx"
 #include "share.hxx"
 
-using namespace ::osl;
 using namespace ::com::sun::star::uno;
 
 // Perform the UNO call
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index e639e0c1167f..b340c08b1a6a 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -23,7 +23,6 @@
 
 #include <rtl/alloc.h>
 #include <sal/log.hxx>
-#include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index 4058882f46e6..a54bc83e42bc 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -22,7 +22,6 @@
 #include <basegfx/tools/canvastools.hxx>
 #include <basegfx/tools/unopolypolygon.hxx>
 #include <com/sun/star/lang/NoSupportException.hpp>
-#include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/stream.hxx>
 #include <vcl/canvastools.hxx>
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index 3f224b2771e4..e5c2d2c5d29d 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -22,7 +22,6 @@
 #include <basegfx/tools/canvastools.hxx>
 #include <basegfx/tools/unopolypolygon.hxx>
 #include <com/sun/star/lang/NoSupportException.hpp>
-#include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/cairo.hxx>
 #include <vcl/canvastools.hxx>
diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx
index 618d4c189f09..24721af75c53 100644
--- a/canvas/source/directx/dx_devicehelper.cxx
+++ b/canvas/source/directx/dx_devicehelper.cxx
@@ -21,7 +21,6 @@
 
 #include <basegfx/tools/canvastools.hxx>
 #include <com/sun/star/lang/NoSupportException.hpp>
-#include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/canvastools.hxx>
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index 2b01ed9a072d..f2757289b4c9 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -22,7 +22,6 @@
 #include <basegfx/tools/canvastools.hxx>
 #include <canvas/canvastools.hxx>
 #include <com/sun/star/lang/NoSupportException.hpp>
-#include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/sysdata.hxx>
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 49c7cfd2f285..25d0eaeef0cf 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -15,7 +15,6 @@
 #include <com/sun/star/rendering/XColorSpace.hpp>
 #include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/canvastools.hxx>
diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx
index 96404f46d74f..34d5be4943e2 100644
--- a/canvas/source/vcl/bitmapbackbuffer.cxx
+++ b/canvas/source/vcl/bitmapbackbuffer.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <osl/mutex.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/svapp.hxx>
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index 6276daf18d2e..61f8e050df14 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -26,7 +26,6 @@
 #include "DrawViewWrapper.hxx"
 
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 #include <svx/AccessibleTextHelper.hxx>
 #include <svx/unoshtxt.hxx>
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index eacf8d011936..66f628cdb692 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
 #include <unotools/eventlisteneradapter.hxx>
 #include <comphelper/uno3.hxx>
 
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index 143b5995f597..ffab4b3a90d1 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -30,7 +30,6 @@
 
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 5156efe72111..27ff61e1772b 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -59,7 +59,6 @@
 #include <vcl/msgbox.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 0775d6432d26..1e0762bdfc92 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -39,7 +39,6 @@
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <memory>
 
 namespace chart
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 51860ab2f02b..ed48e382f06d 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -57,7 +57,6 @@
 
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <svx/ActionDescriptionProvider.hxx>
 
 namespace chart
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 11fb754eec6e..3fb555bace30 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -37,7 +37,6 @@
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <svl/stritem.hxx>
 #include <editeng/fontitem.hxx>
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 6c98f4f77015..240ab15f6952 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -60,7 +60,6 @@
 #include <svx/svdmodel.hxx>
 #include <unotools/streamwrap.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <editeng/outliner.hxx>
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 5ca9f2012f52..b20645327821 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -73,7 +73,6 @@
 #include <svx/svddrgmt.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/msgbox.hxx>
 #include <rtl/math.hxx>
 #include <svtools/acceleratorexecute.hxx>
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index d9f8cc0b1229..92485496c731 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -25,7 +25,6 @@
 #include "macros.hxx"
 
 #include <com/sun/star/frame/CommandGroup.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/itempool.hxx>
 #include <editeng/adjustitem.hxx>
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 5b951ad5398f..9a4436197a97 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -30,7 +30,6 @@
 
 #include <cppuhelper/supportsservice.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 65b289edf48d..94d6948ad12d 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -28,7 +28,6 @@
 #include "svx/obj3d.hxx"
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index c9a34316a727..2a3d28f649d9 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/frame/CommandGroup.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 
-#include <osl/mutex.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <editeng/formatbreakitem.hxx>
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 25ff8605d9f7..459ac3eb79b8 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/document/UndoFailedException.hpp>
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index e74da8a2baab..f56746fe511e 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -35,7 +35,6 @@
 // helper classes
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
-#include <osl/mutex.hxx>
 
 // STL
 #include <vector>
diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx
index 187c6350aaa7..453913565601 100644
--- a/chart2/source/model/main/DataPoint.hxx
+++ b/chart2/source/model/main/DataPoint.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_CHART2_SOURCE_MODEL_MAIN_DATAPOINT_HXX
 #define INCLUDED_CHART2_SOURCE_MODEL_MAIN_DATAPOINT_HXX
 
-#include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx
index 798ae0e8a3b7..36dd9138903d 100644
--- a/chart2/source/model/main/GridProperties.hxx
+++ b/chart2/source/model/main/GridProperties.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_CHART2_SOURCE_MODEL_MAIN_GRIDPROPERTIES_HXX
 #define INCLUDED_CHART2_SOURCE_MODEL_MAIN_GRIDPROPERTIES_HXX
 
-#include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index bf75a08e02c8..b703cc05cb17 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -20,7 +20,6 @@
 #include "typelib/typedescription.h"
 #include "rtl/ustrbuf.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
-#include "osl/mutex.hxx"
 #include "cli_proxy.h"
 #include "cli_base.h"
 #include "cli_bridge.h"
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
index 041cd50f890d..6dcc1bad18b4 100644
--- a/configmgr/source/propertynode.cxx
+++ b/configmgr/source/propertynode.cxx
@@ -23,7 +23,6 @@
 
 #include <com/sun/star/beans/Optional.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index c9b1d8d9362c..23c5c8d753bf 100644
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include <com/sun/star/uno/XAggregation.hpp>
 
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 4f68ea755701..3b819d94cb65 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include "java/tools.hxx"
 #include "java/sql/SQLException.hxx"
-#include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include "java/LocalRef.hxx"
 #include "resource/conn_shared_res.hrc"
diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx
index 8dd54baac84b..cc1d2e18727c 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.hxx
@@ -23,7 +23,6 @@
 
 #include <unotools/confignode.hxx>
 
-#include <osl/mutex.hxx>
 #include <unordered_map>
 #include <vector>
 
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index af385be7aa5d..10c8d875d22e 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/diagnose_ex.h>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/anytostring.hxx>
diff --git a/cppu/source/threadpool/threadident.cxx b/cppu/source/threadpool/threadident.cxx
index 24037f6e4d2e..ef880c7aa7bc 100644
--- a/cppu/source/threadpool/threadident.cxx
+++ b/cppu/source/threadpool/threadident.cxx
@@ -19,7 +19,6 @@
 
 #include <list>
 
-#include <osl/mutex.hxx>
 #include <osl/thread.hxx>
 #include <osl/diagnose.h>
 
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 8bd5084c7e8c..4e39ae6c8b5a 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -21,7 +21,6 @@
 #include <rtl/instance.hxx>
 #include <osl/diagnose.h>
 #include <osl/doublecheckedlocking.h>
-#include <osl/mutex.hxx>
 #include <uno/dispatcher.hxx>
 #include <uno/lbnames.h>
 #include <uno/mapping.hxx>
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index fabefa73844d..82c3000d21f2 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -22,7 +22,6 @@
 #include <vcl/svapp.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <osl/mutex.hxx>
 #include <sfx2/app.hxx>
 #include <cuires.hrc>
 #include <svx/fmsrccfg.hxx>
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 4015db7bc5e5..cb01345bbf7e 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -24,7 +24,6 @@
 
 #include <vcl/errinf.hxx>
 #include <ucbhelper/content.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <avmedia/mediawindow.hxx>
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 0c744ca4c12e..82ccd5666915 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -25,7 +25,6 @@
 #include <vcl/layout.hxx>
 #include <vcl/builderfactory.hxx>
 #include <o3tl/make_unique.hxx>
-#include <osl/mutex.hxx>
 
 #include <cuires.hrc>
 #include <bitmaps.hlst>
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index 30026d4b325b..ff823f811875 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -29,7 +29,6 @@
 #include <cppuhelper/weakref.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx
index 3c6a7eb229e9..2c52c7a41872 100644
--- a/dbaccess/source/core/inc/core_resource.hxx
+++ b/dbaccess/source/core/inc/core_resource.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX
 
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
 
 class ResMgr;
 
diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx
index daaba9d2d26d..ecd6f7b62b41 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.cxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.cxx
@@ -21,7 +21,6 @@
 #include "migrationprogress.hxx"
 
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 namespace dbmm
 {
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 5b2e76546b03..6dd868a4a0b1 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -50,7 +50,6 @@
 #include "xmlHelper.hxx"
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <osl/mutex.hxx>
 #include <svtools/sfxecode.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 29f0dd00bc24..9899384304da 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -66,7 +66,6 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/waitobj.hxx>
-#include <osl/mutex.hxx>
 
 #include <algorithm>
 #include <iterator>
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 8d29764cf207..36be59392b21 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -43,7 +43,6 @@
 #include <vcl/msgbox.hxx>
 #include "dbaccess_helpid.hrc"
 #include "UITools.hxx"
-#include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 #include <svtools/imgdef.hxx>
 #include "svtools/treelistentry.hxx"
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index eaeb984968bf..798e722e335a 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -22,7 +22,6 @@
 
 #include "adminpages.hxx"
 #include <com/sun/star/i18n/XCollator.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/layout.hxx>
 #include "tabletree.hxx"
 #include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index bf59d4da692a..ae53e8ee88a6 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -41,7 +41,6 @@
 
 #include <vcl/timer.hxx>
 #include <svtools/transfer.hxx>
-#include <osl/mutex.hxx>
 #include <osl/thread.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <svtools/cliplistener.hxx>
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index fc06709657d0..9ae3c5fdd89c 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -16,7 +16,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <osl/mutex.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index a41e1f730e79..f4e413fd1273 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -36,7 +36,6 @@
 #include "dbu_uno.hrc"
 #include "paramdialog.hxx"
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include "CollectionView.hxx"
 #include "UITools.hxx"
 #include <comphelper/processfactory.hxx>
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 56ec44ac89db..974d0ef3fac0 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/frame/XDesktop2.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <osl/mutex.hxx>
 
 #include <memory>
 #include <thread>
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index a0d6093f6762..9c7a300f01eb 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -21,7 +21,6 @@
 #include <config_features.h>
 
 #include <osl/file.hxx>
-#include <osl/mutex.hxx>
 
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 4bbae0635642..ebbad45dd4e3 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -20,8 +20,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <osl/mutex.hxx>
-
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 51c213c5d97b..a3d40f08f28d 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -95,7 +95,6 @@
 #include <vcl/image.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 #include <comphelper/processfactory.hxx>
 
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index ddadb5f7afd1..e112cd38d389 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -28,7 +28,6 @@
 #include <vcl/dialog.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 3655a4c05c13..ee3e93cb0d95 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -34,7 +34,6 @@
 #include <osl/pipe.hxx>
 #include <osl/security.hxx>
 #include <osl/thread.hxx>
-#include <osl/mutex.hxx>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/bridge/BridgeFactory.hpp>
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index bc4df65f6cfa..d0291d73290b 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -38,7 +38,6 @@
 #include <i18nlangtag/lang.h>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
-#include <osl/mutex.hxx>
 #include <osl/security.hxx>
 #include <unotools/configmgr.hxx>
 
@@ -605,7 +604,6 @@ strings_vr MigrationImpl::applyPatterns(const strings_v& vSet, const strings_v&
 
 strings_vr MigrationImpl::getAllFiles(const OUString& baseURL) const
 {
-    using namespace osl;
     strings_vr vrResult(new strings_v);
 
     // get sub dirs
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index e7840ce52cf3..558614f6fc34 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -24,7 +24,6 @@
 #include <limits.h>
 #include <vector>
 #include <algorithm>
-#include <osl/mutex.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 4015d7e08e4d..586d931a69c5 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/gen.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <rtl/ustring.hxx>
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index 1daac5eb10ed..4105dd88800f 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -30,7 +30,6 @@
 #include <editeng/editeng.hxx>
 #include <svl/itempool.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <osl/mutex.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index c9f74a9df97e..cba53df3c486 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
-#include <osl/mutex.hxx>
 #include <editeng/flditem.hxx>
 #include <svl/intitem.hxx>
 #include <svtools/transfer.hxx>
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index 9a9b9854b20a..bfa10a6ca526 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <editeng/UnoForbiddenCharsTable.hxx>
 #include <editeng/forbiddencharacterstable.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <editeng/unolingu.hxx>
 
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 2ac4bea3d59d..ae9c77496cf9 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -26,7 +26,6 @@
 #include <memory>
 #include <vector>
 #include <algorithm>
-#include <osl/mutex.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 26aaff95392b..f2369ad69580 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 92c0b3a9f3ed..dfdc218ad1fc 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/graph.hxx>
 #include <svtools/grfmgr.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index d3b27a366914..befcc07afa72 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/text/TextRangeSelection.hpp>
 
-#include <osl/mutex.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 #include <svl/intitem.hxx>
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index f1809e8dc25a..93e746ae378f 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 
 #include <editeng/eeitem.hxx>
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index a8e0cc669804..3223ccd09cf0 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <osl/mutex.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/seqstream.hxx>
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 23d856f69df1..c34b99164e74 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 2002ac9377bf..9266949b1159 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <osl/mutex.hxx>
 #include <cppuhelper/weak.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
@@ -55,7 +54,6 @@ BibSplitWindow::BibSplitWindow( vcl::Window* pParent, WinBits nStyle ) : SplitWi
 {
 }
 
-using namespace osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 86d2cf3c71af..121641c5966f 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 2d15f612518c..3514fba2c249 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <o3tl/any.hxx>
-#include <osl/mutex.hxx>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 4f425f92929c..86b82b7e28a5 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -38,7 +38,6 @@
 #include "bitmaps.hlst"
 
 #include "bibtools.hxx"
-#include <osl/mutex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx
index bebd3af63e2a..e935131668f1 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -13,7 +13,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
 #include <tools/rcid.h>
 #include <tools/resary.hxx>
 #include <tools/resmgr.hxx>
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 67ac2c6c3ed2..6eacc4a9e82d 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -35,8 +35,6 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <osl/mutex.hxx>
-
 #include <vcl/window.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/timer.hxx>
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index 9956662cdf0f..eb71a0f1a2d0 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx
index 94c8769120f0..e3ce4a7091cc 100644
--- a/filter/source/pdf/pdfuno.cxx
+++ b/filter/source/pdf/pdfuno.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 02ef2098ee3d..88e0525cc4cc 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -50,8 +50,6 @@
 #include <unotools/streamwrap.hxx>
 #include <tools/zcodec.hxx>
 
-#include <osl/mutex.hxx>
-
 #include "svgfilter.hxx"
 #include "svgwriter.hxx"
 
diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx
index 959d4af6e9e9..99491384c1c8 100644
--- a/filter/source/t602/filterenv.cxx
+++ b/filter/source/t602/filterenv.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
 
diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx
index 57c5a61dcd03..f40ef510ccb2 100644
--- a/filter/source/xmlfilteradaptor/genericfilter.cxx
+++ b/filter/source/xmlfilteradaptor/genericfilter.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index f06cc88d3304..bc07a5ae176d 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -38,7 +38,6 @@
 
 #include <comphelper/oslfile2streamwrap.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <osl/file.hxx>
 #include <unotools/tempfile.hxx>
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 4a9a217253ef..d920aa0fe485 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -31,7 +31,6 @@
 #include <vcl/settings.hxx>
 #include <unotools/lingucfg.hxx>
 #include <svl/undo.hxx>
-#include <osl/mutex.hxx>
 
 #include <algorithm>
 #include <functional>
diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx
index fbd6aa389657..aaf3b5a9bb53 100644
--- a/formula/source/core/inc/core_resource.hxx
+++ b/formula/source/core/inc/core_resource.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HXX
 
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
 
 class ResMgr;
 
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 7d505a9c8db1..c3ec876ce6d4 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -41,7 +41,6 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include "osl/mutex.hxx"
 #include <vcl/svapp.hxx>
 
 using namespace     ::com::sun::star::container;
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 65ab7c4f6611..15cacb23e7cc 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -23,7 +23,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
 #include <com/sun/star/awt/XBitmap.hpp>
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 917728f90c0e..6bd6e9168655 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -23,7 +23,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 97527aaa607e..2df66d3c36b1 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -38,7 +38,6 @@
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
-#include <osl/mutex.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 98db6c40c283..5a93197c8b99 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/ui/XUIElement.hpp>
 
 #include <cppuhelper/supportsservice.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <ucbhelper/content.hxx>
 #include <vcl/svapp.hxx>
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 5fa4a17cb590..b2c87cbbe0b4 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -35,7 +35,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index c2e7f7ae4ebd..e9a2998629fd 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "classes/fwkresid.hxx"
-#include <osl/mutex.hxx>
 #include <tools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx
index f475dd2bf7bb..1d72f61bb0c2 100644
--- a/framework/source/fwe/classes/imagewrapper.cxx
+++ b/framework/source/fwe/classes/imagewrapper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <classes/imagewrapper.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 515383b1929c..ad67b2208900 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <tools/stream.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index 04aa9d0a4ead..2f2b21b21761 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -30,7 +30,6 @@
 #include <vcl/syswin.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
 // namespaces
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 00519550bfe5..32c325c533c3 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -33,7 +33,6 @@
 #include <vcl/svapp.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <osl/mutex.hxx>
 #include <comphelper/sequence.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/pngread.hxx>
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 279be2c92ba9..11a31b22e397 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -37,7 +37,6 @@
 
 #include <vcl/svapp.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <osl/mutex.hxx>
 #include <osl/file.hxx>
 #include <comphelper/sequence.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index f79eb470bfc6..c02b31732eed 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <rtl/uri.hxx>
-#include <osl/mutex.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index f295feff2d14..1e80d29e661d 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/util/Color.hpp>
 
 #include <svtools/toolboxcontroller.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 7809d910c983..b173c94f541e 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -29,7 +29,6 @@
 
 #include <comphelper/processfactory.hxx>
 #include <svtools/toolboxcontroller.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index d5f372cbe12a..ccac50e0a70c 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <svtools/toolboxcontroller.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 3498aa5aaea4..023df2c2573f 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <svtools/toolboxcontroller.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index af627d73b17f..886bee4fcf83 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -32,7 +32,6 @@
 
 #include <comphelper/processfactory.hxx>
 #include <svtools/toolboxcontroller.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <tools/urlobj.hxx>
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index fcc1e38654b3..9e73b0b58536 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <osl/mutex.hxx>
 #include <comphelper/getexpandeduri.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 471295f6a64f..6f3daabb5109 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -20,7 +20,6 @@
 #include <classes/fwkresid.hxx>
 #include <services.h>
 #include <classes/resource.hrc>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index e1c8668cc9c5..3d45fb7be8b1 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <svtools/toolboxcontroller.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
index 69951565d352..3dc19068c66e 100644
--- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx
+++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
@@ -21,7 +21,6 @@
 #include <uielement/progressbarwrapper.hxx>
 
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 using namespace cppu;
 using namespace com::sun::star::uno;
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index eb994abc893b..07588648bc11 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <rtl/uri.hxx>
-#include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/svapp.hxx>
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index 243c98cb2662..d08d33b7b7e3 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -26,7 +26,6 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
 
 #include <servicename.hxx>
 
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index c625abc4820f..2edd8ad906ab 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -24,7 +24,6 @@
 #include <basic/sbxobj.hxx>
 #include <basic/sbmod.hxx>
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
 #include <tools/link.hxx>
 
 #include <basic/sbdef.hxx>
diff --git a/include/canvas/vclwrapper.hxx b/include/canvas/vclwrapper.hxx
index bdda0ce65f8f..e35cb5fa13b9 100644
--- a/include/canvas/vclwrapper.hxx
+++ b/include/canvas/vclwrapper.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CANVAS_VCLWRAPPER_HXX
 #define INCLUDED_CANVAS_VCLWRAPPER_HXX
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 namespace canvas
diff --git a/include/comphelper/profilezone.hxx b/include/comphelper/profilezone.hxx
index 0c64ed7bfee4..6702619b6008 100644
--- a/include/comphelper/profilezone.hxx
+++ b/include/comphelper/profilezone.hxx
@@ -12,7 +12,6 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/comphelperdllapi.h>
-#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
 #include <vector>
diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx
index d39f9f3aec8d..395398f3965f 100644
--- a/include/comphelper/unique_disposing_ptr.hxx
+++ b/include/comphelper/unique_disposing_ptr.hxx
@@ -18,7 +18,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 namespace comphelper
 {
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index 767727146c63..ac7087b320d2 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -30,7 +30,6 @@
 #include <jvmfwk/jvmfwkdllapi.hxx>
 #include <rtl/byteseq.hxx>
 #include <rtl/ustring.hxx>
-#include <osl/mutex.h>
 #include "jni.h"
 
 /** @file
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index 524e6ad4122d..6f8f8fbf3323 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <osl/mutex.hxx>
 #include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
 #include <com/sun/star/ui/XContextMenuInterception.hpp>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index fac7f5420c99..6620fed6f1e5 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -77,7 +77,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/script/XStarBasicAccess.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/document/XViewDataSupplier.hpp>
diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx
index 03ce7902ba3b..9b968dff5d5c 100644
--- a/include/sfx2/sfxuno.hxx
+++ b/include/sfx2/sfxuno.hxx
@@ -35,7 +35,6 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
 
diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
index 11236f3bdfa2..cf58e18bcad9 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -23,7 +23,6 @@
 #include <basegfx/vector/b2dvector.hxx>
 #include <drawinglayer/attribute/fontattribute.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/bitmapex.hxx>
 #include <sfx2/dllapi.h>
 
diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx
index 1fa0f700a8c4..8372c1a6562b 100644
--- a/include/svtools/javacontext.hxx
+++ b/include/svtools/javacontext.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVTOOLS_JAVACONTEXT_HXX
 
 #include <svtools/svtdllapi.h>
-#include <osl/mutex.hxx>
 
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx
index 09bef97a0250..34fa14a935c4 100644
--- a/include/svtools/javainteractionhandler.hxx
+++ b/include/svtools/javainteractionhandler.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVTOOLS_JAVAINTERACTIONHANDLER_HXX
 
 #include <svtools/svtdllapi.h>
-#include <osl/mutex.hxx>
 #include <sal/types.h>
 
 #include <com/sun/star/task/XInteractionRequest.hpp>
diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx
index 6851b564f3aa..3bce61ff95af 100644
--- a/include/toolkit/awt/vclxcontainer.hxx
+++ b/include/toolkit/awt/vclxcontainer.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/awt/XVclContainerPeer.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
 
 #include <toolkit/awt/vclxwindow.hxx>
 
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index 60f5ca019ffc..94f4715460ad 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/vclptr.hxx>
 
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
index 059e774042fb..3818977d4ba0 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
 
 #include <vcl/font.hxx>
 #include <tools/color.hxx>
diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx
index 826104df32e5..5478e9daf75e 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
 
 #include <toolkit/helper/mutexandbroadcasthelper.hxx>
 #include <cppuhelper/propshlp.hxx>
diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
index 64bbe35ddb86..d92cb6b65d6c 100644
--- a/include/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
 
 #include <toolkit/awt/vclxwindow.hxx>
 
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index cd1ed4b42734..c56269b4bab5 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/awt/XTopWindow2.hpp>
 #include <com/sun/star/awt/XMenuBar.hpp>
 #include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
 
 #include <cppuhelper/implbase1.hxx>
 
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index 8d9e99105411..aa5edc5cb65e 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/weakagg.hxx>
-#include <osl/mutex.hxx>
 
 #include <toolkit/helper/mutexandbroadcasthelper.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx
index 1e65d8b18743..39bd83045bc2 100644
--- a/include/toolkit/helper/listenermultiplexer.hxx
+++ b/include/toolkit/helper/listenermultiplexer.hxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/util/VetoException.hpp>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/interfacecontainer2.hxx>
-#include <osl/mutex.hxx>
 #include <toolkit/helper/mutexhelper.hxx>
 #include <toolkit/helper/macros.hxx>
 #include <com/sun/star/awt/grid/XGridSelectionListener.hpp>
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index 2eb9c7209b6a..7d773b33259f 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <cppuhelper/weak.hxx>
 
-#include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include <ucbhelper/macros.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx
index da0aec5ac1e6..4b098160721d 100644
--- a/include/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_UCBHELPER_FD_INPUTSTREAM_HXX
 
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
 #include <osl/file.h>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 6be773977867..b218f94269b8 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -27,7 +27,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 
-#include <osl/mutex.hxx>
 #include <ucbhelper/getcomponentcontext.hxx>
 
 
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 287eca580a52..894d6177b41b 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <cppuhelper/weak.hxx>
 
-#include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include <ucbhelper/macros.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 2d2994da7994..ca9ae2828142 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -23,7 +23,6 @@
 #include <boost/optional.hpp>
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
-#include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <rtl/ustring.hxx>
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index 425b21119893..eefb89e2ec62 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <rtl/ustring.hxx>
 #include <unotools/configitem.hxx>
-#include <osl/mutex.hxx>
 #include <unotools/options.hxx>
 #include <i18nlangtag/lang.h>
 #include <vector>
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 283344c271ee..a085bf6d7d5b 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -35,7 +35,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <osl/conditn.hxx>
-#include <osl/mutex.hxx>
 
 #include <string.h>
 
diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx
index 8892e7338330..fbfc2008214f 100644
--- a/io/test/stm/marktest.cxx
+++ b/io/test/stm/marktest.cxx
@@ -29,7 +29,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <osl/conditn.hxx>
-#include <osl/mutex.hxx>
 
 using namespace ::osl;
 using namespace ::cppu;
diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx
index f817cd2acff2..6744ad1037a1 100644
--- a/io/test/stm/pipetest.cxx
+++ b/io/test/stm/pipetest.cxx
@@ -31,7 +31,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <osl/conditn.hxx>
-#include <osl/mutex.hxx>
 #include <osl/thread.hxx>
 
 #include <string.h>
diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx
index b328048dc88f..8077760a351f 100644
--- a/io/test/stm/pumptest.cxx
+++ b/io/test/stm/pumptest.cxx
@@ -35,7 +35,6 @@
 #include <uno/mapping.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/factory.hxx>
-#include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <list>
 
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index dac76e58ea9e..159ac52019b1 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -30,7 +30,6 @@
 
 #include <string>
 #include <string.h>
-#include "osl/mutex.hxx"
 #include "osl/module.hxx"
 #include "osl/thread.hxx"
 #include "rtl/ustring.hxx"
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index e2761ace545a..4ba87411e8b5 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -28,7 +28,6 @@
 #include "xmlparse.hxx"
 #include <fstream>
 #include <iostream>
-#include <osl/mutex.hxx>
 #include <osl/thread.hxx>
 #include <osl/process.h>
 #include <rtl/strbuf.hxx>
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index c25dc9686d8f..438b455afde3 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -20,7 +20,6 @@
 #include <tools/debug.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/stream.hxx>
-#include <osl/mutex.hxx>
 #include <ucbhelper/content.hxx>
 
 #include <cppuhelper/factory.hxx>
@@ -46,7 +45,6 @@
 
 using namespace std;
 using namespace utl;
-using namespace osl;
 using namespace com::sun::star;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index 236bf960a078..cf00a7897f3f 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -35,8 +35,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
-#include <osl/mutex.hxx>
-
 #include <map>
 #include <memory>
 
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index 1a1ba382c927..5e212f4b619c 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -31,10 +31,8 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include "cppuhelper/unourl.hxx"
-#include <osl/mutex.hxx>
 
 using namespace cppu;
-using namespace osl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::connection;
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 528eeb0a8172..08edfe1cdc60 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -41,7 +41,6 @@
 #include <vcl/svapp.hxx>
 #include <dbaccess/dbsubcomponentcontroller.hxx>
 #include <svx/unoshape.hxx>
-#include <osl/mutex.hxx>
 
 namespace rptui
 {
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index fcc3f6b83723..abed5392dddf 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -53,7 +53,6 @@
 #include <com/sun/star/report/XFixedLine.hpp>
 #include "RptDef.hxx"
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <sal/macros.h>
 
 #include <iterator>
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 2017a2ae8466..c6f4d69b501c 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -54,7 +54,6 @@
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlmetai.hxx>
 #include <com/sun/star/util/XModifiable.hpp>
-#include <osl/mutex.hxx>
 #include <svtools/sfxecode.hxx>
 #include "xmlEnums.hxx"
 #include "xmlStyleImport.hxx"
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 2d4336873112..2fa020e036a8 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -29,8 +29,6 @@
 #include <osl/test/uniquepipename.hxx>
 #include <osl/thread.hxx>
 
-#include <osl/mutex.hxx>
-
 #include <osl/pipe.hxx>
 #include <osl/time.h>
 
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 00b60a543531..c13325c91bdb 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -47,7 +47,6 @@
 #include <svl/itempool.hxx>
 #include <svl/urlbmk.hxx>
 #include <tools/urlobj.hxx>
-#include <osl/mutex.hxx>
 
 #include "drwtrans.hxx"
 #include "docsh.hxx"
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index ce3033114b3b..30fc5a1ed204 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -31,7 +31,6 @@
 #include <sot/storage.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
-#include <osl/mutex.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index f1f204b2df65..10970150bf91 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
 #include <svl/lstner.hxx>
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index ff666edecd67..9f335889ccea 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -20,7 +20,6 @@
 #include "scitems.hxx"
 #include <svl/srchitem.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx
index c56f4e5deccb..72e42a9bd70b 100644
--- a/sc/source/ui/unoobj/unodoc.cxx
+++ b/sc/source/ui/unoobj/unodoc.cxx
@@ -24,7 +24,6 @@
 
 #include "appluno.hxx"
 #include "scmod.hxx"
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include "docsh.hxx"
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx
index 16b4ded791a8..0ace13a90dc9 100644
--- a/scripting/source/basprov/baslibnode.cxx
+++ b/scripting/source/basprov/baslibnode.cxx
@@ -21,7 +21,6 @@
 #include "basmodnode.hxx"
 #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #include <comphelper/sequence.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbstar.hxx>
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index e9da25e5cfe3..2b1de0bff3fe 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sbmeth.hxx>
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index 145dda2b6e54..b44416a479a2 100644
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -20,7 +20,6 @@
 #include "basmodnode.hxx"
 #include "basmethnode.hxx"
 #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbstar.hxx>
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 9f18f44d63e3..565f54d89be2 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "basscript.hxx"
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbstar.hxx>
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 115d78a81112..f6a0366b1494 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -19,8 +19,6 @@
 
 #include "scripthandler.hxx"
 
-#include <osl/mutex.hxx>
-
 #include <com/sun/star/frame/DispatchResultEvent.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <com/sun/star/frame/XController.hpp>
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index b1b21b3c7145..7291f88c619b 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -42,7 +42,6 @@
 #include <rtl/uri.hxx>
 #include <rtl/strbuf.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <CustomAnimationPreset.hxx>
 
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 938cfaa41c43..6c0746a69e37 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/util/theMacroExpander.hpp>
 #include <com/sun/star/animations/AnimationNodeType.hpp>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/getexpandeduri.hxx>
diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx
index 1972c725f06f..c5a3bc043cee 100644
--- a/sd/source/core/sdpage_animations.cxx
+++ b/sd/source/core/sdpage_animations.cxx
@@ -21,7 +21,6 @@
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 #include <com/sun/star/presentation/ParagraphTarget.hpp>
 #include <comphelper/processfactory.hxx>
-#include <osl/mutex.hxx>
 #include <editeng/outliner.hxx>
 #include "CustomAnimationCloner.hxx"
 #include "drawdoc.hxx"
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index d2cadd3876ab..3f06b27627d7 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <svl/style.hxx>
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 30030f7e33c7..22b7d7752cdd 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -46,7 +46,6 @@
 #include <drawdoc.hxx>
 #include "accessibility.hrc"
 #include "sdresid.hxx"
-#include <osl/mutex.hxx>
 
 #include <memory>
 
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 03e32c708577..a1409fac1854 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -21,7 +21,6 @@
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <osl/mutex.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/tempfile.hxx>
 #include <editeng/eeitem.hxx>
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index e23690f2f339..a65db66226ac 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -23,8 +23,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/DrawViewMode.hpp>
 
-#include <osl/mutex.hxx>
-
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index b7641aa2ea34..502cdee563c8 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -23,7 +23,6 @@
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/string.hxx>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <sfx2/doctempl.hxx>
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index c983e5f585b0..a8a41aab2be3 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -33,7 +33,6 @@
 #include <vcl/idle.hxx>
 #include <sal/types.h>
 #include <osl/thread.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <avmedia/mediawindow.hxx>
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index 52e333e346ef..d14db761a568 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
index 28c5215d8a7e..fa5cabcb58e4 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
 #include <com/sun/star/drawing/framework/XResourceId.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index ac83c8c01f1c..119485791374 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/compbase.hxx>
-#include <osl/mutex.hxx>
 
 #include <vcl/vclptr.hxx>
 #include <memory>
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
index 931247ae9ecc..1511d0232db6 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
 #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
index 0922f69890ca..933f064bd65e 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
 #include <com/sun/star/drawing/framework/XTabBar.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <memory>
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx
index 7dc0ebf30b28..beb85d89968d 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.hxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
 #include <com/sun/star/drawing/framework/XTabBar.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
 namespace sd { namespace framework {
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 213f86273ebb..f041daba9fda 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -22,7 +22,6 @@
 
 #include "MutexOwner.hxx"
 
-#include <osl/mutex.hxx>
 #include <com/sun/star/drawing/framework/XModuleController.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index aa81f38ff111..87afcb5f0a32 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
 #include <memory>
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index 8d96a20e9e04..7cd7ad56dc3e 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index a5ca061a4a1d..f174db6809a5 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -22,7 +22,6 @@
 #include "sdpage.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <cppcanvas/vclfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx
index ffc56773e309..54407e15d886 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -22,7 +22,6 @@
 
 #include "MasterPageContainerProviders.hxx"
 
-#include <osl/mutex.hxx>
 #include <vcl/image.hxx>
 #include "PreviewRenderer.hxx"
 #include <vcl/timer.hxx>
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index c37f8090c1bd..28bb0c181f8a 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SD_SOURCE_UI_SIDEBAR_RECENTLYUSEDMASTERPAGES_HXX
 
 #include "tools/SdGlobalResourceContainer.hxx"
-#include <osl/mutex.hxx>
 #include <tools/link.hxx>
 #include <vcl/image.hxx>
 #include <vector>
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 51e2c0bfb094..59e583147f9a 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -25,8 +25,6 @@
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <osl/mutex.hxx>
-
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svx/svdpool.hxx>
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index 269df8a8fb44..48755ba33a48 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "SlsCacheConfiguration.hxx"
-#include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 1043ee7a1af0..6a28fa1dbfbe 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -71,7 +71,6 @@
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 namespace sd { namespace slidesorter { namespace controller {
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index a1e00135e4bf..3c9f80deb2e3 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -30,7 +30,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index cc2e3e427021..4feccd46cae4 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -43,7 +43,6 @@
 #include "slideshow.hxx"
 
 #include <svx/fmshell.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/EnumContext.hxx>
 #include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index 3ad8b504486f..be14a720ffa1 100644
--- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -26,7 +26,6 @@
 
 #include <cppuhelper/supportsservice.hxx>
 #include <svx/unopage.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::cppu;
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 3e0fcb8a7141..4016191e8b3f 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -36,7 +36,6 @@
 #include <o3tl/make_unique.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/xtable.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include "drawdoc.hxx"
@@ -55,7 +54,6 @@
 #include <svx/unoapi.hxx>
 
 using namespace ::comphelper;
-using namespace ::osl;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index 0590871f7ffb..dfb7902dc7f2 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/svdpage.hxx>
 #include <comphelper/extract.hxx>
diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx
index c918d378bcd5..1b4beb742f18 100644
--- a/sd/source/ui/unoidl/unodoc.cxx
+++ b/sd/source/ui/unoidl/unodoc.cxx
@@ -26,7 +26,6 @@
 #include "facreg.hxx"
 #include "DrawDocShell.hxx"
 #include "GraphicDocShell.hxx"
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 59cb9c588bd8..1fc88d296255 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -21,7 +21,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include "unolayer.hxx"
-#include <osl/mutex.hxx>
 
 #include <comphelper/extract.hxx>
 #include <svx/svdpagv.hxx>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 17c8d271402d..6b9e55097f54 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -32,7 +32,6 @@
 
 #include <com/sun/star/embed/Aspects.hpp>
 
-#include <osl/mutex.hxx>
 #include <comphelper/lok.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
@@ -121,7 +120,6 @@
 
 #include <drawinglayer/primitive2d/structuretagprimitive2d.hxx>
 
-using namespace ::osl;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::sd;
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index efc80fb58ef0..a3d54ecf51fa 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -28,7 +28,6 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index ba0b4d42bf9d..b3401f14b1d2 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <rtl/ustrbuf.hxx>
-#include <osl/mutex.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/style.hxx>
 #include <svx/svdpool.hxx>
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 490b061ca422..587014a25042 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -49,7 +49,6 @@
 #include <svx/unoshape.hxx>
 #include <com/sun/star/style/XStyle.hpp>
 #include <svx/svdorect.hxx>
-#include <osl/mutex.hxx>
 #include <svl/style.hxx>
 #include <comphelper/serviceinfohelper.hxx>
 #include <comphelper/extract.hxx>
@@ -76,7 +75,6 @@
 using ::com::sun::star::animations::XAnimationNode;
 using ::com::sun::star::animations::XAnimationNodeSupplier;
 
-using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index c31bd58cd661..41e973cf8246 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -19,7 +19,6 @@
 
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <o3tl/make_unique.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/itemset.hxx>
 #include <svx/svdpool.hxx>
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index b672b87aad88..47115b107ee8 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 #include <svx/unoshape.hxx>
 #include <svx/svdpool.hxx>
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index 380ffc4aad03..a48d30d9a72d 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -32,7 +32,6 @@
 #include "strings.hxx"
 
 #include <svx/svdpagv.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index e09f36fc0a64..8de2540aa347 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -35,7 +35,6 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/settings.hxx>
 
-#include <osl/mutex.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <com/sun/star/drawing/framework/ResourceId.hpp>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index ac4bf0203db4..44ab9f02ce5a 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -39,7 +39,6 @@
 #include "Window.hxx"
 #include "drawview.hxx"
 #include "zoomlist.hxx"
-#include <osl/mutex.hxx>
 #include <tools/helpers.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index becff3ddc2d2..4ad3a8592191 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
 #include <pppoptimizerdialog.hxx>
diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx
index 14036c8f3617..d51b397cb41f 100644
--- a/sdext/source/presenter/PresenterPane.cxx
+++ b/sdext/source/presenter/PresenterPane.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/drawing/CanvasFeature.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
-#include <osl/mutex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 295e76c94284..10abe27ce812 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/drawing/CanvasFeature.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
 #include <com/sun/star/rendering/TexturingMode.hpp>
-#include <osl/mutex.hxx>
 
 using namespace css;
 using namespace css::uno;
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
index f951258cd053..85da44dd29f9 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -21,7 +21,6 @@
 #include "PresenterGeometryHelper.hxx"
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
-#include <osl/mutex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 410701bcf825..a2ad89c5834a 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -22,8 +22,6 @@
 #include <tools/config.hxx>
 #include <svl/stritem.hxx>
 
-#include <osl/mutex.hxx>
-
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 280319e3cddb..6fda9dd336c3 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <tools/rcid.h>
-#include <osl/mutex.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <framework/menuconfiguration.hxx>
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 021aefcb0e6c..d4717a16d733 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -66,9 +66,6 @@
 #include <comphelper/docpasswordhelper.hxx>
 #include <vcl/svapp.hxx>
 
-#include <osl/mutex.hxx>
-
-
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index 473343dd2628..43aa910d801c 100644
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <framework/sfxhelperfunctions.hxx>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include "fwkhelper.hxx"
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 6100931224f1..6b7fff2c60a6 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -25,7 +25,6 @@
 #include <tools/urlobj.hxx>
 #include <osl/file.h>
 #include <comphelper/sequenceashashmap.hxx>
-#include <osl/mutex.hxx>
 #include <sfx2/app.hxx>
 #include <sal/macros.h>
 #include "app.hrc"
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index fd5aa1d069f2..66ed890a9843 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <glib.h>
-#include <osl/mutex.hxx>
 #include <osl/module.hxx>
 #include <tools/resmgr.hxx>
 #include <sfx2/app.hxx>
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index 0ac727c52187..938ee61c8b2c 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -27,7 +27,6 @@
 #include <sfx2/docfac.hxx>
 
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
 
 
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 918e70c8f04f..5073851ab655 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -27,7 +27,6 @@
 #include <svl/visitem.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 9bbc97ffa0f2..be7a8d9ce4e6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -45,7 +45,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <osl/mutex.hxx>
 #include <uno/current_context.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/uitest/logger.hxx>
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index cce0acf5cb81..d5174d3b8d76 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -54,7 +54,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <osl/file.hxx>
-#include <osl/mutex.hxx>
 #include <osl/security.hxx>
 #include <osl/thread.hxx>
 #include <vcl/cvtgrf.hxx>
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 4e23a6bfeedf..0b409959622e 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -21,7 +21,6 @@
 #include <sfx2/Metadatable.hxx>
 #include <sfx2/XmlIdRegistry.hxx>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <comphelper/random.hxx>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 74a419b93c7f..7ff7253dfe3b 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -26,7 +26,6 @@
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #include <svtools/svparser.hxx>
-#include <osl/mutex.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 
 #include <com/sun/star/container/XChild.hpp>
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 7b605d2684c0..846233bd4da9 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 #include <osl/file.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index cf257d9b4ccf..2ff52d1c44b3 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SFX2_SOURCE_INC_SFXPICKLIST_HXX
 #define INCLUDED_SFX2_SOURCE_INC_SFXPICKLIST_HXX
 
-#include <osl/mutex.hxx>
 #include <vcl/menu.hxx>
 #include <svl/lstner.hxx>
 #include <com/sun/star/util/XStringWidth.hpp>
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 40719fcc5a11..4d56a5625887 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -27,8 +27,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 
-#include <osl/mutex.hxx>
-
 #ifndef DELETEZ
 #define DELETEZ(pPtr) ( delete pPtr, pPtr = 0 )
 #endif
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index ff3834b3c611..906425d4474f 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -29,7 +29,6 @@
 #include <cppuhelper/propshlp.hxx>
 
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 #include <sfx2/sfx.hrc>
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 8cf40304c086..c44509fe207d 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -30,7 +30,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
 #include <svl/itemset.hxx>
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index ff2b3eb77f2c..93283f639f88 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -69,7 +69,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <ucbhelper/simpleinteractionrequest.hxx>
-#include <osl/mutex.hxx>
 
 using namespace com::sun::star;
 using ::com::sun::star::beans::PropertyValue;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 8fc744e5c033..205c73eb4f5f 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -40,7 +40,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <osl/file.hxx>
-#include <osl/mutex.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx
index 13b4d319ac51..abbcb6736208 100644
--- a/shell/source/cmdmail/cmdmailsuppl.hxx
+++ b/shell/source/cmdmail/cmdmailsuppl.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILSUPPL_HXX
 
 #include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx
index d00c8d0a88c5..38ebf8ea94c0 100644
--- a/shell/source/unix/exec/shellexec.hxx
+++ b/shell/source/unix/exec/shellexec.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SHELL_SOURCE_UNIX_EXEC_SHELLEXEC_HXX
 
 #include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx
index 9d8cd5170ecc..5a38521545ad 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.hxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_SHAPEMANAGERIMPL_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_SHAPEMANAGERIMPL_HXX
 
-#include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/presentation/XShapeEventListener.hpp>
 
diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx
index 13e699f8cc48..6e8a97de21e2 100644
--- a/slideshow/source/engine/transitions/slidechangebase.hxx
+++ b/slideshow/source/engine/transitions/slidechangebase.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SLIDECHANGEBASE_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SLIDECHANGEBASE_HXX
 
-#include <osl/mutex.hxx>
-
 #include "unoview.hxx"
 #include "vieweventhandler.hxx"
 #include "numberanimation.hxx"
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 1e7fb910482d..c335be846891 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -45,7 +45,6 @@
 #include <vcl/settings.hxx>
 
 #include <tools/gen.hxx>
-#include <osl/mutex.hxx>
 #include <svl/itemset.hxx>
 
 #include <editeng/editobj.hxx>
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 72734cdd5a40..624b7a391f96 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/implbase.hxx>
 #include <svl/SfxBroadcaster.hxx>
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 60d7114b94d0..8aafc348ecb7 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -58,7 +58,6 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/xmlmetai.hxx>
-#include <osl/mutex.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/servicehelper.hxx>
 
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 4e7ac3e87c7b..c79d91295c98 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -61,7 +61,6 @@ one go*/
 #include <xmloff/attrlist.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlmetai.hxx>
-#include <osl/mutex.hxx>
 
 #include <memory>
 
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index 7988beef365a..bb26c724d4b9 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -24,7 +24,6 @@
 #include "register.hxx"
 #include "smdll.hxx"
 #include "document.hxx"
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 53423f4160fc..304f3cf431bd 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -23,7 +23,6 @@
 
 #include <o3tl/any.hxx>
 #include <o3tl/make_unique.hxx>
-#include <osl/mutex.hxx>
 #include <sfx2/printer.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/ctrltool.hxx>
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 4f9cc2c6a1b4..2553dc171c54 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <osl/file.h>
 #include <vector>
-#include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 #include <osl/module.h>
 #include <rtl/ref.hxx>
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index ee06fd3dd8c9..5707b0c40878 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -26,7 +26,6 @@
 
 #include <osl/thread.h>
 #include <comphelper/solarmutex.hxx>
-#include <osl/mutex.hxx>
 
 namespace {
 
diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx
index 0b9c0e89cec2..c0df89ef68e1 100644
--- a/svtools/source/config/test/test.cxx
+++ b/svtools/source/config/test/test.cxx
@@ -39,7 +39,6 @@
 #include <rtl/ustring>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
-#include <osl/mutex.hxx>
 
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index ed47c6e3822b..39f5dad4b92a 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -19,7 +19,6 @@
 
 #include "descriptor.hxx"
 
-#include <osl/mutex.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <svl/itemprop.hxx>
diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index b156d6123384..4c39a09f2203 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/svtools/source/graphic/graphic.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/graphic/GraphicType.hpp>
 #include <com/sun/star/graphic/XGraphicTransformer.hpp>
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 7355e6268f9a..0ebde979793a 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/image.hxx>
 #include <vcl/metaact.hxx>
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 262d97387717..047f91061388 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/graphic/XGraphicRenderer.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <osl/mutex.hxx>
 #include <tools/gen.hxx>
 #include <vcl/svapp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index 8b934dace7a5..c56a8e73015f 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/image.hxx>
 #include <vcl/metaact.hxx>
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index 41e61413c0af..74f78dc4bdc4 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -30,7 +30,6 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <tools/rcid.h>
 #include <jvmfwk/framework.hxx>
 
diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx
index 190048eba6e8..c2d21d4a47c1 100644
--- a/svtools/source/misc/cliplistener.cxx
+++ b/svtools/source/misc/cliplistener.cxx
@@ -22,7 +22,6 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
-#include <osl/mutex.hxx>
 
 #include <svtools/cliplistener.hxx>
 #include <svtools/transfer.hxx>
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 216cf7aba132..57b75f475875 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <tools/rcid.h>
 #include <tools/resary.hxx>
 #include <tools/wintypes.hxx>
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index ec7eb7a87146..ae6bdf0c30c0 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -51,7 +51,6 @@
 #include <com/sun/star/chart2/XDefaultSizeTransmitter.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <memory>
 
 using namespace com::sun::star;
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index c41b8d25ecdd..85050af4f01c 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -38,7 +38,6 @@
 #include <unotools/configmgr.hxx>
 #include <svtools/svtools.hrc>
 #include <svtools/svtresid.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/lazydelete.hxx>
 #include "imagemgr.hrc"
 #include "bitmaps.hlst"
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 518ae332575c..4f135b946f87 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -21,7 +21,6 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx
index 482f88b9783a..d74953b163b2 100644
--- a/svtools/source/uno/generictoolboxcontroller.cxx
+++ b/svtools/source/uno/generictoolboxcontroller.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 
 #include <comphelper/processfactory.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace css::awt;
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index f615c7a0fe80..fecabd21ad2a 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <cppuhelper/queryinterface.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 4d802f1d7763..857bc90cddc3 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/imgdef.hxx>
 #include <svtools/miscopt.hxx>
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index e10d3d30e802..50ac24a8f427 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -32,7 +32,6 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 
 namespace svt { namespace table
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index d3c3f2acde5c..f970e60143d7 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -31,7 +31,6 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
 
 
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index a99ca91662d7..096a141cc658 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -35,7 +35,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <algorithm>
 #include <list>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/unoevent.hxx>
 #include <svtools/unoimap.hxx>
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 91e97317d03b..b4f7d9652f55 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -29,7 +29,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svx/frmsel.hxx>
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index a15adafd7357..896bf00ae4fc 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -25,7 +25,6 @@
 #include <svx/AccessibleShapeTreeInfo.hxx>
 #include <editeng/AccessibleContextBase.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <osl/mutex.hxx>
 #include <tools/gen.hxx>
 #include <vector>
 #include <com/sun/star/drawing/XShape.hpp>
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index d4dcb985ab95..efbb48c58980 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <comphelper/processfactory.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/uno/Exception.hpp>
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 68937f67c18b..a0cd0ce5c73f 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -22,7 +22,6 @@
 #include <svx/SvxShapeTypes.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
 #include <com/sun/star/drawing/XShapeDescriptor.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/dialmgr.hxx>
 
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index b65d75b0992a..e11691242284 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -27,7 +27,6 @@
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 #include <svx/graphctl.hxx>
 #include "GraphCtlAccessibleContext.hxx"
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index ffe40a7b828e..a4315cd23e7b 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -61,7 +61,6 @@
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
 #include <vcl/outdev.hxx>
-#include <osl/mutex.hxx>
 
 #include <memory>
 
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 5403bcc1b6ec..3ca840e48802 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -82,7 +82,6 @@
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
 #include <vcl/stdtext.hxx>
-#include <osl/mutex.hxx>
 #include <connectivity/dbtools.hxx>
 
 #include <algorithm>
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 3b5e142caaf9..3520d1cd5e0a 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <svl/lstner.hxx>
 
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 6783b5504752..4375f9351090 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_CHARMAPACC_HXX
 #define INCLUDED_SVX_SOURCE_INC_CHARMAPACC_HXX
 
-#include <osl/mutex.hxx>
 #include <vcl/image.hxx>
 #include <comphelper/accessibleselectionhelper.hxx>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 8b56a1569ae5..d060de4bc2ac 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -45,7 +45,6 @@
 #include <com/sun/star/container/XContainer.hpp>
 
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 7513536e73e3..410a26fa6eff 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -21,7 +21,6 @@
 
 #include <svx/SmartTagMgr.hxx>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp>
 #include <com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.hpp>
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 85a0117df26f..38eef36b2483 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -33,7 +33,6 @@
 #include <svx/sdrpaintwindow.hxx>
 #include <sdr/contact/objectcontactofpageview.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
-#include <osl/mutex.hxx>
 #include <svx/fmview.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <sfx2/lokhelper.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index c7d5e354fbfd..480cba941e5f 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -64,7 +64,6 @@
 
 #include <svl/solar.hrc>
 #include <svl/urihelper.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <svx/charthelper.hxx>
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 3a344da23712..dd1e04bf3bb3 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
 #include <comphelper/accessiblewrapper.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <AccessibleTableShape.hxx>
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index c2d539cc25d4..bd3f6aa62f4d 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -33,7 +33,6 @@
 #include <svl/style.hxx>
 #include <svl/itemset.hxx>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <libxml/xmlwriter.h>
 
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 59282aae85da..aa2c71aa31d4 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -20,8 +20,6 @@
 
 #include <string>
 
-#include <osl/mutex.hxx>
-
 #include <svtools/toolbarmenu.hxx>
 #include <svx/colorwindow.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 2d5e6596beda..acdf84fbd6f5 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -31,7 +31,6 @@
 #include <svtools/ctrltool.hxx>
 #include <svtools/ctrlbox.hxx>
 #include <svtools/toolboxcontroller.hxx>
-#include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index d2c8a32fb285..c50add3bfed1 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -51,7 +51,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/instance.hxx>
 #include <svx/srchdlg.hxx>
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 3704e35447f0..d244ce769cec 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -20,7 +20,6 @@
 
 #include "chinese_translation_unodialog.hxx"
 #include "chinese_translationdialog.hxx"
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 5b5fbdab097b..c0bf4332cbbe 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <vector>
-#include <osl/mutex.hxx>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -71,7 +70,6 @@
 #define MAX_EXT_PIX         2048
 
 using namespace ::comphelper;
-using namespace ::osl;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 422e4c1e769b..93b1a51988c5 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -31,7 +31,6 @@
 
 #include <svx/svdmodel.hxx>
 #include "UnoNameItemTable.hxx"
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include "svx/unoapi.hxx"
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index f38dcf8a0d9a..14b274a1f9de 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -27,12 +27,10 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <osl/mutex.hxx>
 #include <svl/itempool.hxx>
 #include "svx/unoapi.hxx"
 #include "editeng/xmlcnitm.hxx"
 
-using namespace ::osl;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index f26b850debe8..8a21c0c6e06b 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <o3tl/any.hxx>
 #include <o3tl/make_unique.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <cppuhelper/implbase.hxx>
diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx
index bae372d48c73..733404e5f075 100644
--- a/svx/source/unodraw/unomlstr.cxx
+++ b/svx/source/unodraw/unomlstr.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/svdobj.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include "unomlstr.hxx"
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index e68ab9f25dc8..f53b8c93ef8f 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemprop.hxx>
@@ -59,7 +58,6 @@
 
 //-
 
-using namespace ::osl;
 using namespace ::com::sun::star;
 
 //-
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 17a54744e6a2..316fd6f771bb 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -40,7 +40,6 @@
 #include <svx/xflhtit.hxx>
 
 #include <vector>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 2bcab15bb261..3216d30ed14d 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -23,7 +23,6 @@
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include "svx/unopool.hxx"
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 0329d9018254..afae4101d256 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <tools/fldunit.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 434c261c09f4..74e59b8acc3e 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -34,7 +34,6 @@
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/file.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/fltcall.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/wmf.hxx>
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 880e99d08042..d39c80995a59 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/drawing/CameraGeometry.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/serviceinfohelper.hxx>
 
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 541b340dc26d..f28b85a819f4 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -32,7 +32,6 @@
 #include <comphelper/propertysequence.hxx>
 #include <sfx2/frmdescr.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <sfx2/objsh.hxx>
@@ -56,7 +55,6 @@
 #include <svtools/embedhlp.hxx>
 
 
-using namespace ::osl;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 2c8d5c31ea90..c93dc7d34c05 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -27,7 +27,6 @@
 #include <editeng/unoedhlp.hxx>
 #include <svl/lstner.hxx>
 #include <rtl/ref.hxx>
-#include <osl/mutex.hxx>
 #include <svl/hint.hxx>
 #include <svl/style.hxx>
 #include <svx/svdmodel.hxx>
@@ -51,9 +50,6 @@
 #include "../table/cell.hxx"
 #include <svx/sdrpaintwindow.hxx>
 
-using namespace ::osl;
-
-
 
 // SvxTextEditSourceImpl
 
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 8377690808eb..38d752220b87 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -23,7 +23,6 @@
 #include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include <svx/fmmodel.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
 #include <svl/itemprop.hxx>
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 2eb0894430e7..29d658e00065 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -28,7 +28,6 @@
 #include <svx/svdpage.hxx>
 #include <svx/unopage.hxx>
 #include <svl/itempool.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/pathoptions.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index 0bab17f58139..f11dcb279331 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -21,7 +21,6 @@
 
 #include "unogaltheme.hxx"
 #include "svx/gallery1.hxx"
-#include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index d03a5dd37ca5..7a6365e9aefc 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -26,7 +26,6 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <sal/log.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 class SfxPoolItem;
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index c8698c198928..2f0ec4f42d16 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <sfx2/viewsh.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 9f402a787c05..0d6e4bb02414 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 4960bd10b1b3..714045be234c 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 1b46c16f6d22..7dc0d1acb866 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/document/XLinkTargetSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <swurl.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <ndtxt.hxx>
 #include <txtinet.hxx>
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 906c68c81ce8..c4e761e20c67 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 342d8c9615b1..8b9f6e7886b9 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <algorithm>
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index c485a813e195..267587eb2f05 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -20,7 +20,6 @@
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleRelation.hpp>
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index 5cab3c578a20..19e1a1662b04 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -20,7 +20,6 @@
 #include "SwSmartTagMgr.hxx"
 
 #include <docsh.hxx>
-#include <osl/mutex.hxx>
 #include <swmodule.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 5c1e6c603167..3d43e5a41a2a 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -37,7 +37,6 @@
 #include <swtblfmt.hxx>
 #include <tblsel.hxx>
 #include <cellatr.hxx>
-#include <osl/mutex.hxx>
 
 #include <unochart.hxx>
 
diff --git a/sw/source/core/inc/swthreadmanager.hxx b/sw/source/core/inc/swthreadmanager.hxx
index 3d29867866b4..178f1411b464 100644
--- a/sw/source/core/inc/swthreadmanager.hxx
+++ b/sw/source/core/inc/swthreadmanager.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_SWTHREADMANAGER_HXX
 
 #include <osl/interlck.h>
-#include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 
 #include <memory>
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index e709ffdf8356..c90e1212a8f7 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -19,7 +19,6 @@
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <SwXTextDefaults.hxx>
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index c3064351a618..cb4205c97883 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -40,7 +40,6 @@
 #include <txtftn.hxx>
 #include <fmtpdsc.hxx>
 #include <pagedesc.hxx>
-#include <osl/mutex.hxx>
 #include <com/sun/star/text/XTextTableCursor.hpp>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
 #include <com/sun/star/text/TableColumnSeparator.hpp>
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index 39a0d616d5e9..d77a8f7b8547 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -23,7 +23,6 @@
 #include <unocrsrhelper.hxx>
 #include <unoflatpara.hxx>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/text/TextMarkupType.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 0fd4dca72244..b6ecfa6c8300 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -91,7 +91,6 @@
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <unoframe.hxx>
 #include <fmthdft.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/syslocale.hxx>
 #include <fmtflcnt.hxx>
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 493470b5cd5d..4fda0ca5e8d2 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -96,7 +96,6 @@
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <unoframe.hxx>
 #include <fmthdft.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <fmtflcnt.hxx>
 #include <editeng/brushitem.hxx>
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index be26a3b937c5..060cb75cdf33 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -21,7 +21,6 @@
 
 #include <cmdid.h>
 #include <o3tl/make_unique.hxx>
-#include <osl/mutex.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index dc214b0e3938..3e8828c51319 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -55,7 +55,6 @@
 #include <redline.hxx>
 #include <calbck.hxx>
 #include <docufld.hxx>
-#include <osl/mutex.hxx>
 #include <txtfld.hxx>
 #include <txtannotationfld.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index 10791acf54b2..aec2f023c4a2 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/servicehelper.hxx>
 
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index 9a9d1f71efe7..c2ef94108d06 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -21,7 +21,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <unoredlines.hxx>
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 80268724eb62..0de40a487554 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -58,7 +58,6 @@
 #include <editeng/flstitem.hxx>
 #include <vcl/metric.hxx>
 #include <svtools/ctrltool.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <editeng/unofdesc.hxx>
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 59dea4f2e075..bf70fc5894e6 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -26,7 +26,6 @@
 
 #include <i18nutil/searchopt.hxx>
 #include <o3tl/any.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <editeng/unolingu.hxx>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 165466e80fce..826806bea226 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -19,7 +19,6 @@
 
 #include <svx/svxids.hrc>
 #include <hintids.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/hint.hxx>
 #include <svtools/ctrltool.hxx>
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 51536228f60a..830575f7d37b 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/profilezone.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index 86b46af7d51b..ee0799ba5e98 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -19,7 +19,6 @@
 
 #include <unotextmarkup.hxx>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <SwSmartTagMgr.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index cd26c4debb67..07e6390daa64 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -35,7 +35,6 @@
 #include <o3tl/any.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 10332ef1db08..dba62895d3f7 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -65,7 +65,6 @@
 #include <tools/diagnose_ex.h>
 
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <unotxdoc.hxx>
 
 #include <xmloff/xmlmetai.hxx>
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index acdeb1ddf622..e2ae8609105f 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -56,7 +56,6 @@
 #include "xmlimp.hxx"
 #include "xmltbli.hxx"
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include "ndtxt.hxx"
 
 #include <vector>
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 27ac77c0143b..99052561e3db 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -55,7 +55,6 @@
 #include <sfx2/docfile.hxx>
 #include <calbck.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/embedhlp.hxx>
 #include <svl/urihelper.hxx>
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index f1d27c661786..366a42be3e78 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -60,7 +60,6 @@
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <dbmgr.hxx>
 #include <swunohelper.hxx>
-#include <osl/mutex.hxx>
 #include <shellio.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <sfx2/event.hxx>
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 217aafee44ae..7b7ce0362c0b 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -36,7 +36,6 @@
 #include <view.hxx>
 #include <wrtsh.hxx>
 #include <dbtree.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/treelistentry.hxx>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 501d6fcd456d..94d9bb8296d2 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -119,7 +119,6 @@
 #include <SwRewriter.hxx>
 #include <globals.hrc>
 #include <app.hrc>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <swserv.hxx>
 #include <calbck.hxx>
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 84daa3597987..225ddc2f7943 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -134,7 +134,6 @@
 #include <pagedesc.hxx>
 #include <svtools/ruler.hxx>
 #include "formatclipboard.hxx"
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <docstat.hxx>
 #include <wordcountdialog.hxx>
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 2455df3c9c0e..e0a3b73aaccb 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -76,7 +76,6 @@
 
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
-#include <osl/mutex.hxx>
 
 #include <memory>
 
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 01a123e02f97..6569ec483a8e 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/scanner/XScannerManager2.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <comphelper/processfactory.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 7c314d82fc08..b96ca0dd8355 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -23,7 +23,6 @@
 
 #include <o3tl/any.hxx>
 #include <o3tl/make_unique.hxx>
-#include <osl/mutex.hxx>
 #include <sfx2/sfxbasecontroller.hxx>
 #include <SwXDocumentSettings.hxx>
 #include <comphelper/MasterPropertySetInfo.hxx>
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx
index c90eb671f852..8c79f32f0957 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -21,7 +21,6 @@
 #include <shellio.hxx>
 #include <swdll.hxx>
 #include <unoprnms.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/sw/source/uibase/uno/dlelstnr.cxx b/sw/source/uibase/uno/dlelstnr.cxx
index 279a9eedf7f9..9f7c5dbcd2ce 100644
--- a/sw/source/uibase/uno/dlelstnr.cxx
+++ b/sw/source/uibase/uno/dlelstnr.cxx
@@ -26,7 +26,6 @@
 
 #include <com/sun/star/uno/Reference.h>
 #include <comphelper/processfactory.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include "dlelstnr.hxx"
 #include <proofreadingiterator.hxx>
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index ae63084d28ff..ed520f0bec9d 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <svtools/unoevent.hxx>
diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx
index 0beff83088fd..0e14d14dc9c1 100644
--- a/sw/source/uibase/uno/unodoc.cxx
+++ b/sw/source/uibase/uno/unodoc.cxx
@@ -24,7 +24,6 @@
 #include "docsh.hxx"
 #include "globdoc.hxx"
 #include "wdocsh.hxx"
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index a83faf7ec865..81f72fa9b37c 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -30,7 +30,6 @@
 #include <docsh.hxx>
 #include <wrtsh.hxx>
 #include <viewopt.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <doc.hxx>
 #include <IDocumentDeviceAccess.hxx>
diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx
index 900e54b17ae3..208dd0e291f4 100644
--- a/sw/source/uibase/uno/unomodule.cxx
+++ b/sw/source/uibase/uno/unomodule.cxx
@@ -28,7 +28,6 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace css;
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index aaeb9e6ae5e1..aa30b63e9f14 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -52,7 +52,6 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 #include <frmatr.hxx>
-#include <osl/mutex.hxx>
 #include <IMark.hxx>
 #include <unotxdoc.hxx>
 #include <unodraw.hxx>
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index 17004ede61a4..cfac81dfcaad 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <vcl/svapp.hxx>
-#include "osl/mutex.hxx"
 #include "cppuhelper/factory.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include <cppuhelper/implbase.hxx>
diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx
index a64f8094b07b..3cc2aa802773 100644
--- a/toolkit/source/controls/eventcontainer.cxx
+++ b/toolkit/source/controls/eventcontainer.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/factory.hxx>
@@ -33,7 +32,6 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::registry;
 using namespace com::sun::star::script;
 using namespace cppu;
-using namespace osl;
 using namespace std;
 
 
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index e92437b395dd..160ceea2c189 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
-
 #include <uno/mapping.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/factory.hxx>
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index 46db49efd062..8aa6e7dfcaea 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENTPROVIDER_HXX
 
 #include <vector>
-#include <osl/mutex.hxx>
 #include <ucbhelper/proxydecider.hxx>
 #include <ucbhelper/providerhelper.hxx>
 #include <com/sun/star/ucb/XContentProviderManager.hpp>
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index cb56f7042e5c..a4babdc5dea5 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
 #include <osl/file.h>
 #include <vector>
 
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 39bfda75fb60..51d678b3ed69 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -28,7 +28,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <osl/file.hxx>
-#include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 
 #include <rtl/bootstrap.hxx>
diff --git a/unoxml/source/service/services.cxx b/unoxml/source/service/services.cxx
index 87ad21acd5ab..190827e7d18f 100644
--- a/unoxml/source/service/services.cxx
+++ b/unoxml/source/service/services.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 84cec1b166a6..0b49946563cd 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -27,7 +27,6 @@
 
 #include <vcl/button.hxx>
 #include <osl/file.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 namespace uui
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 4cd4ad3fee0e..1a8fe8686289 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -34,7 +34,6 @@
 
 #include <osl/diagnose.h>
 #include <rtl/digest.h>
-#include <osl/mutex.hxx>
 #include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 31893d8ad028..5c0c389607f1 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 7110fddafb18..630197ee64bb 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/task/XInteractionRequest.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 
-#include <osl/mutex.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index 6a1631462031..d5ca16f95a96 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index aa31496e1bdb..c3b48ed0d19d 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 
 #include <comphelper/sequence.hxx>
-#include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <svl/zforlist.hxx>
 #include <vcl/svapp.hxx>
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 5d0d55a909c2..2fa698b14ea7 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -63,7 +63,6 @@
 #include <osl/conditn.hxx>
 #include <tools/rcid.h>
 #include <vcl/errinf.hxx>
-#include <osl/mutex.hxx>
 #include <osl/thread.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/documentconstants.hxx>
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 877c216596dc..87c662766ea1 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_UUI_SOURCE_IAHNDL_HXX
 #define INCLUDED_UUI_SOURCE_IAHNDL_HXX
 
-#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index 486cc06d7b53..b1c43e08d1e4 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -34,7 +34,6 @@
 
 #include <basic/sberrors.hxx>
 #include <comphelper/processfactory.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/unopage.hxx>
 #include <svx/unoshape.hxx>
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index 8e209014e262..bcb97f7714af 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
 
 #include <unx/gensys.h>
-#include <osl/mutex.hxx>
 #include <osl/thread.hxx>
 #include <vclpluginapi.h>
 
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index da410cb44c46..b564b4a5b179 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -26,7 +26,6 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/range/b2drectangle.hxx>
 #include <osl/file.hxx>
-#include <osl/mutex.hxx>
 #include <osl/process.h>
 #include <rtl/bootstrap.h>
 #include <rtl/strbuf.hxx>
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 00727e26ed13..6ea821411e36 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -21,7 +21,6 @@
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/process.h>
 #include <tools/resary.hxx>
 #include <tools/gen.hxx>
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index c6096b46bb0b..4d7fa497ef35 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <uno/dispatcher.h>
 #include <uno/mapping.hxx>
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index b1cad70899be..7b30affd8732 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -33,8 +33,6 @@
 #include <svids.hrc>
 #include <controldata.hxx>
 
-#include <osl/mutex.hxx>
-
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 544a44ad09f6..217ccfb1e321 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -57,8 +57,6 @@
 
 #include <sot/exchange.hxx>
 
-#include <osl/mutex.hxx>
-
 #include <algorithm>
 #include <cstddef>
 
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 05d99ecb1238..1ca2aa7e569b 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/rendering/RenderingIntent.hpp>
 
 #include <rtl/instance.hxx>
-#include <osl/mutex.hxx>
 
 #include <tools/diagnose_ex.h>
 #include <canvasbitmap.hxx>
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 4a5e7e1a76de..43b6bfbe9284 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -40,7 +40,6 @@
 #endif
 
 #include <osl/process.h>
-#include <osl/mutex.hxx>
 
 #include "unx/saldisp.hxx"
 #include "unx/saldata.hxx"
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 5ac47e30ad2e..a57051f4c577 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 
 #include <vcl/svapp.hxx>
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 18973376d7a1..e14af356bdb8 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <comphelper/string.hxx>
-#include <osl/mutex.hxx>
 #include "unx/gtk/gtkinst.hxx"
 
 #include <vcl/svapp.hxx>
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 767916cfbe09..98d109f50878 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include "unx/gtk/gtkinst.hxx"
 #include "gtk/fpicker/SalGtkFolderPicker.hxx"
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 060cf23abab1..65a1a4c7e5a7 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -30,7 +30,6 @@
 #include <comphelper/processfactory.hxx>
 #include <rtl/process.h>
 #include <osl/diagnose.h>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 00a5a5475b91..9d719bebe032 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -30,8 +30,6 @@
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
-#include <osl/mutex.hxx>
-
 #include <vcl/fpicker.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/sysdata.hxx>
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
index fc8f8f85c02d..9c5515529440 100644
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -25,8 +25,6 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include <osl/mutex.hxx>
-
 class AccObjectManagerAgent;
 
 /**
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index ba04f217b436..c28083cf6f18 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <map>
 #include <windows.h>
-#include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include "ResIDGenerator.hxx"
 
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 3d28d2eafa4c..58d9b3d4aeb5 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <rtl/instance.hxx>
-#include <osl/mutex.hxx>
 #include <sax/fastattribs.hxx>
 #include "OOXMLFactory.hxx"
 #include "OOXMLFastHelper.hxx"
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index e4296fb9fb4f..6e43ecf5c293 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -22,7 +22,6 @@
 
 #include <memory>
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
 #include <ucbhelper/providerhelper.hxx>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XContainer.hpp>
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index 4cd94a6d768b..dd12c784f747 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -20,7 +20,6 @@
 
 #include <string.h>
 #include <vector>
-#include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 #include <xmloff/xmltoken.hxx>
 #include <comphelper/servicehelper.hxx>
@@ -29,7 +28,6 @@
 #include <xmloff/attrlist.hxx>
 
 
-using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 65fb8ef35fd3..efaa9bb3e5a8 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -23,7 +23,6 @@
 #include <tools/diagnose_ex.h>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <tools/urlobj.hxx>
-#include <osl/mutex.hxx>
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
@@ -66,7 +65,6 @@
 
 using ::com::sun::star::beans::XPropertySetInfo;
 
-using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 704ab904b17b..6393d3e1acce 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -61,7 +61,6 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlprhdl.hxx>
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx
index 0355adb66497..b17e86b021de 100644
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ b/xmloff/source/forms/attriblistmerge.hxx
@@ -25,7 +25,6 @@
 #include <vector>
 
 #include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 
 namespace xmloff
diff --git a/xmloff/source/style/StyleMap.cxx b/xmloff/source/style/StyleMap.cxx
index b500390daa35..08a9e612a6dc 100644
--- a/xmloff/source/style/StyleMap.cxx
+++ b/xmloff/source/style/StyleMap.cxx
@@ -19,12 +19,10 @@
 
 #include <string.h>
 
-#include <osl/mutex.hxx>
 #include <comphelper/servicehelper.hxx>
 
 #include "StyleMap.hxx"
 
-using namespace osl;
 using namespace css::uno;
 using namespace css::lang;
 
diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index c831e6f27d21..ae06de27d3c0 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -19,14 +19,12 @@
 
 #include <string.h>
 
-#include <osl/mutex.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/attrlist.hxx>
 #include <comphelper/servicehelper.hxx>
 #include "MutableAttrList.hxx"
 
 
-using namespace ::osl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
diff --git a/xmlscript/source/inc/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx
index 21f3bc7b612c..23f40fefba88 100644
--- a/xmlscript/source/inc/xml_import.hxx
+++ b/xmlscript/source/inc/xml_import.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_XMLSCRIPT_SOURCE_INC_XML_IMPORT_HXX
 #define INCLUDED_XMLSCRIPT_SOURCE_INC_XML_IMPORT_HXX
 
-#include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/xmlsecurity/source/gpg/GpgComponentFactory.cxx b/xmlsecurity/source/gpg/GpgComponentFactory.cxx
index 2f3048a68a8c..4bb0b90ad211 100644
--- a/xmlsecurity/source/gpg/GpgComponentFactory.cxx
+++ b/xmlsecurity/source/gpg/GpgComponentFactory.cxx
@@ -9,7 +9,6 @@
 
 #include <sal/config.h>
 
-#include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
index 3b682e147f7a..369a73a43ac3 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
@@ -20,7 +20,6 @@
 
 #include <sal/config.h>
 
-#include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
index 7bee0f072471..fb0f87c54ab3 100644
--- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
@@ -20,7 +20,6 @@
 
 #include <sal/config.h>
 
-#include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-- 
cgit