1.1 --- a/HidEvent.cs	Sun Feb 15 13:30:54 2015 +0100
     1.2 +++ b/HidEvent.cs	Sun Feb 15 18:15:41 2015 +0100
     1.3 @@ -106,7 +106,7 @@
     1.4              {
     1.5                  //Fetch raw input
     1.6                  RAWINPUT rawInput = new RAWINPUT();
     1.7 -                if (!Win32.Utils.RawInput.GetRawInputData(aMessage.LParam, ref rawInput, ref rawInputBuffer))
     1.8 +                if (!Win32.RawInput.GetRawInputData(aMessage.LParam, ref rawInput, ref rawInputBuffer))
     1.9                  {
    1.10                      return;
    1.11                  }
    1.12 @@ -115,7 +115,7 @@
    1.13                  //Get various information about this HID device
    1.14                  Device = new Hid.HidDevice(rawInput.header.hDevice);
    1.15  
    1.16 -                if (rawInput.header.dwType == Const.RIM_TYPEHID)  //Check that our raw input is HID                        
    1.17 +                if (rawInput.header.dwType == Win32.RawInputDeviceType.RIM_TYPEHID)  //Check that our raw input is HID                        
    1.18                  {
    1.19                      IsGeneric = true;
    1.20  
    1.21 @@ -191,14 +191,14 @@
    1.22                          }
    1.23                      }
    1.24                  }
    1.25 -                else if (rawInput.header.dwType == Const.RIM_TYPEMOUSE)
    1.26 +                else if (rawInput.header.dwType == RawInputDeviceType.RIM_TYPEMOUSE)
    1.27                  {
    1.28                      IsMouse = true;
    1.29  
    1.30                      Debug.WriteLine("WM_INPUT source device is Mouse.");
    1.31                      // do mouse handling...
    1.32                  }
    1.33 -                else if (rawInput.header.dwType == Const.RIM_TYPEKEYBOARD)
    1.34 +                else if (rawInput.header.dwType == RawInputDeviceType.RIM_TYPEKEYBOARD)
    1.35                  {
    1.36                      IsKeyboard = true;
    1.37