diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 5a2f6e2434..cd7f2ca0d7 100644
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -127,15 +127,15 @@
     #endif
 #endif // wxTOOLKIT_PREFIX
 
+#ifdef wxSUFFIX
+    #define wxTOOLKIT_FULL wxCONCAT(wxTOOLKIT_PREFIX, wxSUFFIX)
+#else // suffix is empty
+    #define wxTOOLKIT_FULL wxTOOLKIT_PREFIX
+#endif
+
 // the real setup.h header file we need is in the build-specific directory,
 // construct the path to it
-#ifdef wxSUFFIX
-    #define wxSETUPH_PATH \
-        wxCONCAT6(../../../lib/, wxLIB_SUBDIR, /, wxTOOLKIT_PREFIX, wxSUFFIX, /wx/setup.h)
-#else // suffix is empty
-    #define wxSETUPH_PATH \
-        wxCONCAT5(../../../lib/, wxLIB_SUBDIR, /, wxTOOLKIT_PREFIX, /wx/setup.h)
-#endif
+#define wxSETUPH_PATH ../../../lib/wxLIB_SUBDIR/wxTOOLKIT_FULL/wx/setup.h
 
 #define wxSETUPH_PATH_STR wxSTRINGIZE(wxSETUPH_PATH)