diff --git a/audio/dsound.c b/audio/dsound.c
index 03a539e4ae..3d80f58ef3 100644
--- a/audio/dsound.c
+++ b/audio/dsound.c
@@ -46,6 +46,11 @@ static DSMIXBINS dsmb;
 #include <stdint.h>
 #include <string.h>
 
+#ifndef _XBOX
+// Need these includes in MinGW-w64 4.9 it seems ...
+#include <mmreg.h>
+#include <mmsystem.h>
+#endif
 #include <dsound.h>
 #include "../fifo_buffer.h"
 #include "../general.h"
diff --git a/input/dinput.c b/input/dinput.c
index b86e90e32d..1e58a74a74 100644
--- a/input/dinput.c
+++ b/input/dinput.c
@@ -644,14 +644,14 @@ static bool guid_is_xinput_device(const GUID* product_guid)
    /* Go through RAWINPUT (WinXP and later) to find HID devices. */
    if (!raw_devs)
    {
-      if ((GetRawInputDeviceList(NULL, &num_raw_devs, sizeof (RAWINPUTDEVICELIST)) == -1) || (!num_raw_devs))
+      if ((GetRawInputDeviceList(NULL, &num_raw_devs, sizeof(RAWINPUTDEVICELIST)) == (UINT)-1) || (!num_raw_devs))
          return false;
 
-      raw_devs = (PRAWINPUTDEVICELIST) malloc(sizeof(RAWINPUTDEVICELIST) * num_raw_devs);
+      raw_devs = (PRAWINPUTDEVICELIST)malloc(sizeof(RAWINPUTDEVICELIST) * num_raw_devs);
       if (!raw_devs)
          return false;
 
-      if (GetRawInputDeviceList(raw_devs, &num_raw_devs, sizeof (RAWINPUTDEVICELIST)) == -1)
+      if (GetRawInputDeviceList(raw_devs, &num_raw_devs, sizeof (RAWINPUTDEVICELIST)) == (UINT)-1)
       {
          free(raw_devs);
          raw_devs = NULL;