diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 756148cbe9..16beffe621 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -30,7 +30,6 @@
     <!-- wxWidgets version numbers logic: -->
     <include file="version.bkl"/>
 
-
     <!-- ================================================================== -->
     <!--                     Names of libraries and DLLs:                   -->
     <!-- ================================================================== -->
@@ -169,7 +168,7 @@
     <!--             Where to store built libraries and objects:         -->
     <!-- =============================================================== -->
 
-    <set var="DIR_SUFFIX_CPU">
+    <set var="ARCH_SUFFIX">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
         <if cond="TARGET_CPU=='amd64'">_amd64</if>
         <if cond="TARGET_CPU=='AMD64'">_amd64</if>
@@ -190,7 +189,7 @@
         <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
 
         <set var="OBJS" make_var="1">
-            $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
+            $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(ARCH_SUFFIX)
         </set>
 
         <set var="BUILDDIR">$(OBJS)</set>
@@ -206,7 +205,7 @@
     <set var="LIBDIRNAME" make_var="1">
         <if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
         <if cond="FORMAT!='autoconf'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
         </if>
     </set>
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 9dcb750aeb..f9fa1df131 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -32,9 +32,9 @@ WX_RELEASE_NODOT = 29
 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
 LIBDIRNAME = \
-	..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+	..\..\lib\$(COMPILER_PREFIX)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
@@ -1747,16 +1747,16 @@ WXUNICODEFLAG = u
 WXUNIVNAME = univ
 !endif
 !if "$(TARGET_CPU)" == "AMD64"
-DIR_SUFFIX_CPU = _amd64
+ARCH_SUFFIX = _amd64
 !endif
 !if "$(TARGET_CPU)" == "IA64"
-DIR_SUFFIX_CPU = _ia64
+ARCH_SUFFIX = _ia64
 !endif
 !if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
+ARCH_SUFFIX = _amd64
 !endif
 !if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
+ARCH_SUFFIX = _ia64
 !endif
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index ea371852c7..7cd0c7a244 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -5240,10 +5240,10 @@ SOURCE=..\..\include\wx\msw\iniconf.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\init.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\msw\init.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\joystick.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index f77793111e..6a2a2a04a7 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -4502,9 +4502,9 @@
 				RelativePath="..\..\include\wx\msw\iniconf.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\init.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\init.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\joystick.h">
 			</File>
 			<File
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 3ff06c8b01..79923e2ed3 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -6024,10 +6024,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\init.h"
-				>
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\init.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\joystick.h"
 				>
 			</File>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index eae3a09ac4..9a54b88268 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -6020,10 +6020,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\init.h"
-				>
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\init.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\joystick.h"
 				>
 			</File>