diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 5723a87d05..419870ccdf 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -592,18 +592,21 @@ int wxApp::GetComCtl32Version()
         // if so, then we can check for the version
         if ( dllComCtl32.IsLoaded() )
         {
+            // check is struct used by DllGetVersion() is available in the
+            // headers and define it ourselves if it isn't
 #ifndef DLLVER_PLATFORM_WINDOWS
-			typedef struct _DllVersionInfo
+			struct DLLVERSIONINFO
 			{
 				DWORD cbSize;
 				DWORD dwMajorVersion;                   // Major version
 				DWORD dwMinorVersion;                   // Minor version
 				DWORD dwBuildNumber;                    // Build number
 				DWORD dwPlatformID;                     // DLLVER_PLATFORM_*
-			} DLLVERSIONINFO;
+			};
 			typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
-#endif
-            // try to use DllGetVersion() if available in _headers_
+#endif // defined(DLLVERSIONINFO)
+
+            // now check if it's available during run-time
             wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
             if ( pfnDllGetVersion )
             {