diff --git a/docs/changes.txt b/docs/changes.txt
index 6cb5597260..333d321e5a 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -277,6 +277,7 @@ wxMSW:
 - Set wxUSE_TASKBARBUTTON correctly when building using configure (#22900).
 - Queue wxWebViewEdge events to avoid hangs (Tobias Taschner, #23025).
 - Fix getting printer information in the print dialog (Stefan Ziegler, #23068).
+- Fix building samples with clang under MSYS (Maarten Bent, #23057).
 
 wxOSX:
 
diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 7a6b203f13..cae328fd31 100644
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -106,22 +106,11 @@ wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
 #endif
 
 #if !defined(wxUSE_DPI_AWARE_MANIFEST) || wxUSE_DPI_AWARE_MANIFEST == 0
-    #define wxMANIFEST_DPI .manifest
+    #define wxMANIFEST_FILE "wx/msw/wx.manifest"
 #elif wxUSE_DPI_AWARE_MANIFEST == 1
-    #define wxMANIFEST_DPI _dpi_aware.manifest
+    #define wxMANIFEST_FILE "wx/msw/wx_dpi_aware.manifest"
 #elif wxUSE_DPI_AWARE_MANIFEST == 2
-    #define wxMANIFEST_DPI _dpi_aware_pmv2.manifest
-#endif
-
-#define wxRC_STR(text) wxRC_STR2(text)
-#define wxRC_STR2(text) #text
-#define wxRC_CONCAT(a, b) wxRC_CONCAT2(a, b)
-#define wxRC_CONCAT2(a, b) a ## b
-
-#ifdef __GNUC__
-    #define wxMANIFEST_FILE "wx/msw/wx" wxRC_STR(wxMANIFEST_DPI)
-#else
-    #define wxMANIFEST_FILE wxRC_CONCAT(wx/msw/wx, wxMANIFEST_DPI)
+    #define wxMANIFEST_FILE "wx/msw/wx_dpi_aware_pmv2.manifest"
 #endif
 wxMANIFEST_ID RT_MANIFEST wxMANIFEST_FILE