diff --git a/CMakeLists.txt b/CMakeLists.txt
index 520d78ab..752652d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,7 +138,6 @@ endif()
 
 if (MINGW)
     # Enable link-time exploit mitigation features enabled by default on MSVC
-
     include(CheckCCompilerFlag)
 
     # Compatibility with data execution prevention (DEP)
@@ -161,6 +160,12 @@ if (MINGW)
     if (_GLFW_HAS_64ASLR)
         set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--high-entropy-va ${CMAKE_SHARED_LINKER_FLAGS}")
     endif()
+
+    # HACK: When building on MinGW, WINVER and UNICODE need to be defined before
+    # the inclusion of stddef.h (by glfw3.h), which is itself included before
+    # win32_platform.h.  We define them here until a saner solution can be found
+    # NOTE: MinGW-w64 and Visual C++ do /not/ need this hack.
+    add_definitions(-DUNICODE -DWINVER=0x0501)
 endif()
 
 #--------------------------------------------------------------------
@@ -218,14 +223,6 @@ if (_GLFW_WIN32)
     if (GLFW_USE_OPTIMUS_HPG)
         set(_GLFW_USE_OPTIMUS_HPG 1)
     endif()
-
-    # HACK: When building on MinGW, WINVER and UNICODE need to be defined before
-    # the inclusion of stddef.h (by glfw3.h), which is itself included before
-    # win32_platform.h.  We define them here until a saner solution can be found
-    # NOTE: MinGW-w64 and Visual C++ do /not/ need this hack.
-    if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
-        add_definitions(-DUNICODE -DWINVER=0x0501)
-    endif()
 endif()
 
 #--------------------------------------------------------------------