diff --git a/src/video/os2/SDL_os2mouse.c b/src/video/os2/SDL_os2mouse.c
index 67d3f1cb3..957912c6e 100644
--- a/src/video/os2/SDL_os2mouse.c
+++ b/src/video/os2/SDL_os2mouse.c
@@ -185,8 +185,6 @@ void OS2_InitMouse(_THIS, ULONG hab)
   SDL_SetDefaultCursor( OS2_CreateSystemCursor( SDL_SYSTEM_CURSOR_ARROW ) );
   if ( hptrCursor == NULLHANDLE )
     hptrCursor = WinQuerySysPointer( HWND_DESKTOP, SPTR_ARROW, TRUE );
-
-  SDL_SetDoubleClickTime( WinQuerySysValue( HWND_DESKTOP, SV_DBLCLKTIME ) );
 }
 
 void OS2_QuitMouse(_THIS)
diff --git a/src/video/os2/SDL_os2video.c b/src/video/os2/SDL_os2video.c
index ad5d6554d..926615291 100644
--- a/src/video/os2/SDL_os2video.c
+++ b/src/video/os2/SDL_os2video.c
@@ -1717,8 +1717,8 @@ static SDL_VideoDevice *OS2_CreateDevice(int devindex)
   device->GetDisplayModes = OS2_GetDisplayModes;
   device->SetDisplayMode = OS2_SetDisplayMode;
   device->PumpEvents = OS2_PumpEvents;
-  device->CreateWindow = OS2_CreateWindow;
-  device->CreateWindowFrom = OS2_CreateWindowFrom;
+  device->CreateSDLWindow = OS2_CreateWindow;
+  device->CreateSDLWindowFrom = OS2_CreateWindowFrom;
   device->DestroyWindow = OS2_DestroyWindow;
   device->SetWindowTitle = OS2_SetWindowTitle;
   device->SetWindowIcon = OS2_SetWindowIcon;