diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h
index 9533822ea307..4011584890cf 100644
--- a/vcl/inc/vcl/window.h
+++ b/vcl/inc/vcl/window.h
@@ -216,7 +216,7 @@ struct ImplFrameData
 
 struct ImplAccessibleInfos
 {
-    USHORT  nAccessibleRole;
+    sal_uInt16 nAccessibleRole;
     String* pAccessibleName;
     String* pAccessibleDescription;
     Window* pLabeledByWindow;
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 7d77e83796d4..32fc4755a62d 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -1263,7 +1263,7 @@ Window* Window::GetAccessibleRelationMemberOf() const
         // which are labeled only if the fixed line or group box
         // is directly before the control
         // get form start and form end and index of this control
-        USHORT nIndex, nFormStart, nFormEnd;
+        sal_uInt16 nIndex, nFormStart, nFormEnd;
         Window* pSWindow = ::ImplFindDlgCtrlWindow( pFrameWindow,
             const_cast<Window*>(this),
             nIndex,
@@ -1278,13 +1278,13 @@ Window* Window::GetAccessibleRelationMemberOf() const
             {
                 nFormStart = nIndex-1;
             }
-            for( USHORT nSearchIndex = nIndex-1; nSearchIndex >= nFormStart; nSearchIndex-- )
+            for( sal_uInt16 nSearchIndex = nIndex-1; nSearchIndex >= nFormStart; nSearchIndex-- )
             {
-                USHORT nFoundIndex = 0;
+                sal_uInt16 nFoundIndex = 0;
                 pSWindow = ::ImplGetChildWindow( pFrameWindow,
                     nSearchIndex,
                     nFoundIndex,
-                    FALSE );
+                    sal_False );
                 if( pSWindow && pSWindow->IsVisible() &&
                     ( pSWindow->GetType() == WINDOW_FIXEDLINE   ||
                     pSWindow->GetType() == WINDOW_GROUPBOX ) )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index b8859c7b94f2..f1bac57825a1 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9297,7 +9297,8 @@ sal_Bool Window::IsAccessibilityEventsSuppressed( sal_Bool bTraverseParentPath )
         return sal_False;
     }
 }
-void Window::SetAccessibilityEventsSuppressed(BOOL bSuppressed)
+
+void Window::SetAccessibilityEventsSuppressed(sal_Bool bSuppressed)
 {
     mpWindowImpl->mbSuppressAccessibilityEvents = bSuppressed;
 }