4 files changed, 2 insertions, 50 deletions
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index 95476cafd51e..c8f0a402218f 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -22,7 +22,6 @@
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <comphelper/namedvaluecollection.hxx>
-#include <vcl/window.hxx>
 
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 23bb34cc3a43..4c296ed820b7 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/form/runtime/FeatureState.hpp>
 #include <tools/diagnose_ex.h>
 #include <vcl/timer.hxx>
-#include <vcl/window.hxx>
 #include <sfx2/shell.hxx>
 #include <svx/svdmark.hxx>
 #include <svx/fmsearch.hxx>
@@ -55,6 +54,8 @@
 #include <vector>
 #include <memory>
 
+struct ImplSVEvent;
+
 typedef std::vector< css::uno::Reference< css::form::XForm > > FmFormArray;
 
 // catch database exceptions if they occur
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 95c1891057f6..5605d23ca75d 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1656,53 +1656,6 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=fa
     }
 }
 
-//Merge with DoInvalidateShapeSelection
-/*
-void SwAccessibleMap::DoInvalidateShapeFocus()
-{
-    const SwViewShell *pVSh = GetShell();
-    const SwFEShell *pFESh = dynamic_cast<const SwFEShell*>( pVSh) !=  nullptr ?
-                            static_cast< const SwFEShell * >( pVSh ) : nullptr;
-    const size_t nSelShapes = pFESh ? pFESh->IsObjSelected() : 0;
-
-    if( nSelShapes != 1 )
-        return;
-
-    SwAccessibleObjShape_Impl *pShapes = nullptr;
-    SwAccessibleObjShape_Impl *pSelShape = nullptr;
-    size_t nShapes = 0;
-
-    {
-        osl::MutexGuard aGuard( maMutex );
-        if( mpShapeMap )
-            pShapes = mpShapeMap->Copy( nShapes, pFESh, &pSelShape );
-    }
-
-    if( pShapes )
-    {
-        vcl::Window *pWin = GetShell()->GetWin();
-        bool bFocused = pWin && pWin->HasFocus();
-        SwAccessibleObjShape_Impl  *pShape = pShapes;
-        while( nShapes )
-        {
-            if( pShape->second.is() )
-            {
-                if( bFocused && pShape >= pSelShape )
-                    pShape->second->SetState( AccessibleStateType::FOCUSED );
-                else
-                    pShape->second->ResetState( AccessibleStateType::FOCUSED );
-            }
-
-            --nShapes;
-            ++pShape;
-        }
-
-        delete[] pShapes;
-    }
-}
-
-*/
-
 SwAccessibleMap::SwAccessibleMap( SwViewShell *pSh ) :
     mpVSh( pSh ),
     mbShapeSelected( false ),
diff --git a/sw/source/uibase/utlui/shdwcrsr.cxx b/sw/source/uibase/utlui/shdwcrsr.cxx
index 72b313fb7d0d..2a9b2a9f3d99 100644
--- a/sw/source/uibase/utlui/shdwcrsr.cxx
+++ b/sw/source/uibase/utlui/shdwcrsr.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/text/HoriOrientation.hpp>
-#include <vcl/window.hxx>
 #include <shdwcrsr.hxx>
 
 using namespace ::com::sun::star;