--- a/Mouse.h	Wed Oct 09 08:06:26 2013 +0200
+++ b/Mouse.h	Wed Oct 09 08:09:48 2013 +0200
@@ -1,5 +1,5 @@
 #pragma once
-#include "OSAPI.h"
+#include "OSWindow.h"
 
 #include "VectorTypes.h"
 
@@ -46,11 +46,11 @@
 {
 public:
   //----- (00467E4E) --------------------------------------------------------
-  inline Mouse(void/*ThreadWard*/ *pWard)
+  inline Mouse():
+    window(nullptr)
   {
     uCursorTextureID = 0;
     uCursorTextureID_2 = 0;
-    hWnd = 0;
     pCursorBitmap_sysmem = 0;
     field_34 = 0;
     pCursorBitmap2_sysmem = 0;
@@ -69,7 +69,7 @@
   void AllocCursorSystemMem();
   void *DoAllocCursorMem();
   POINT *GetCursorPos(POINT *p);
-  void Initialize(HWND hWnd);
+  void Initialize(OSWindow *window);
   void SetActive(bool active);
   void Deactivate();
   void DrawCursor();
@@ -92,7 +92,8 @@
   int field_20;
   unsigned int uCursorTextureID;
   unsigned int uCursorTextureID_2;
-  HWND hWnd;
+  //HWND hWnd;
+  OSWindow *window;
   unsigned __int16 *pCursorBitmap_sysmem;
   int field_34;
   unsigned __int8 *pCursorBitmap2_sysmem;