diff --git a/src/win32_monitor.c b/src/win32_monitor.c
index f434a9f9..fe7cff1c 100644
--- a/src/win32_monitor.c
+++ b/src/win32_monitor.c
@@ -32,16 +32,13 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
 
-// The MinGW package for Debian lacks this
+// These constants are missing on MinGW
 #ifndef EDS_ROTATEDMODE
-#define EDS_ROTATEDMODE 0x00000004
+ #define EDS_ROTATEDMODE 0x00000004
 #endif
-
-// The MinGW upstream lacks this
 #ifndef DISPLAY_DEVICE_ACTIVE
-#define DISPLAY_DEVICE_ACTIVE 0x00000001
+ #define DISPLAY_DEVICE_ACTIVE 0x00000001
 #endif
 
 
@@ -91,6 +88,8 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
             if (!EnumDisplayDevices(adapter.DeviceName, monitorIndex, &monitor, 0))
                 break;
 
+            monitorIndex++;
+
             ZeroMemory(&settings, sizeof(DEVMODE));
             settings.dmSize = sizeof(DEVMODE);
 
@@ -138,9 +137,7 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
             }
 
             monitors[found]->Win32.name = wcsdup(monitor.DeviceName);
-
             found++;
-            monitorIndex++;
         }
     }
 
diff --git a/src/win32_platform.h b/src/win32_platform.h
index 4f8642c7..5f9c158e 100644
--- a/src/win32_platform.h
+++ b/src/win32_platform.h
@@ -214,6 +214,7 @@ typedef struct _GLFWlibraryWin32
 
 } _GLFWlibraryWin32;
 
+
 //------------------------------------------------------------------------
 // Platform-specific monitor structure
 //------------------------------------------------------------------------
@@ -223,6 +224,7 @@ typedef struct _GLFWmonitorWin32
 
 } _GLFWmonitorWin32;
 
+
 //------------------------------------------------------------------------
 // Platform-specific library global data for WGL
 //------------------------------------------------------------------------
diff --git a/src/x11_monitor.c b/src/x11_monitor.c
index bab34445..fafe971f 100644
--- a/src/x11_monitor.c
+++ b/src/x11_monitor.c
@@ -92,7 +92,6 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
 
             // This is retained until the monitor object is destroyed
             monitors[found]->X11.output = oi;
-
             found++;
         }
 #endif /*_GLFW_HAS_XRANDR*/