diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index f0bcd7141d..e04de2965d 100644
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -6,7 +6,7 @@
     The formats below are disabled because wxWidgets doesn't support these
     compilers any longer (although bakefile still does).
     -->
-    <disable-formats>dmars,dmars_smake,msevc4prj,msvc6prj,watcom</disable-formats>
+    <disable-formats>dmars,dmars_smake,msvc6prj,watcom</disable-formats>
 
 
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->
@@ -27,7 +27,7 @@
 
     <!-- List of output formats to generate: -->
     <add-formats>
-        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
+        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
     </add-formats>
 
     <!-- MSVC projects for the library itself (but not the samples etc) are now
@@ -37,29 +37,29 @@
     </del-formats>
 
     <del-formats files="../../samples/*.bkl">
-        autoconf,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        autoconf,msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../demos/*.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../utils/*.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
 
     <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
     <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
-        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
+        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
     </del-formats>
 
     <!-- Some samples use MSVC-specific stuff -->
     <del-formats files="../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl">
-        autoconf,borland,dmars_smake,dmars,mingw,msevc4prj,watcom
+        autoconf,borland,dmars_smake,dmars,mingw,watcom
     </del-formats>
 
     <!-- Default flags (for all formats and bakefiles): -->
@@ -100,9 +100,6 @@
     <add-flags files="wx.bkl" formats="msvs2008prj">
         -o../msw/wx_vc9.sln
     </add-flags>
-    <add-flags files="wx.bkl" formats="msevc4prj">
-        -o../wince/wx.vcw
-    </add-flags>
 
 
 
diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index 3ae116bc29..754adfd8fa 100644
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -7,7 +7,7 @@
     the library.
     -->
 
-    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']">
+    <if cond="FORMAT not in ['autoconf','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
 
         <set var="BUILD_CFG_FILE" make_var="1">
             $(SETUPHDIR)$(DIRSEP)build.cfg
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index c1f2af844d..c53f572e04 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -33,7 +33,6 @@
     <include file="version.bkl"/>
 
     <set var="ARCH_SUFFIX">
-        <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
         <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORM=='win64'">_x64</if>
         <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORM=='win64'">_x64</if>
         <if cond="TARGET_CPU=='amd64'">_x64</if>
@@ -393,14 +392,14 @@
     </define-tag>
 
     <set var="msvc_copy_setup_h_script">
-        <if cond="IS_MSVC_PRJ=='1' and FORMAT not in ['msvc6prj','msevc4prj']">
+        <if cond="IS_MSVC_PRJ=='1' and FORMAT!='msvc6prj'">
 Creating $(SETUPHDIR)\wx\setup.h
 InputPath=..\..\include\wx\%s
 
 "$(SETUPHDIR)\wx\setup.h" : 
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         </if>
-        <if cond="IS_MSVC_PRJ=='1' and FORMAT in ['msvc6prj','msevc4prj']">
+        <if cond="IS_MSVC_PRJ=='1' and FORMAT=='msvc6prj'">
 Creating $(SETUPHDIR)\wx\setup.h
 InputPath=..\..\include\wx\%s
 
@@ -449,17 +448,12 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             <msvc-headers-setup-h>
                 msw/genrcdefs.h
             </msvc-headers-setup-h>
-            <!-- FIXME: we need another way to get the compiler name -->
-            <set var="VC_COMPILER">
-                <if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if>
-                <if cond="FORMAT!='msevc4prj'">cl</if>
-            </set>
             <set var="_custom_build_include_wx_msw_genrcdefs_h">
 Creating $(SETUPHDIR)\wx\msw\rcdefs.h
 InputPath=..\..\include\wx\msw\genrcdefs.h
 
 "$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
-$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
+$(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </set>
         </if>
     </define-tag>
@@ -551,15 +545,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
             <if cond="FORMAT=='borland'">
                 <sys-lib>ole2w32</sys-lib>
             </if>
-            <if cond="FORMAT=='msevc4prj'">
-                <sys-lib>ole32</sys-lib>
-                <sys-lib>oleaut32</sys-lib>
-                <sys-lib>uuid</sys-lib>
-                <sys-lib>commctrl</sys-lib>
-                <sys-lib>winsock</sys-lib>
-                <sys-lib>wininet</sys-lib>
-            </if>
-            <if cond="FORMAT!='borland' and FORMAT!='msevc4prj'">
+            <if cond="FORMAT!='borland'">
                 <sys-lib>kernel32</sys-lib>
                 <sys-lib>user32</sys-lib>
                 <sys-lib>gdi32</sys-lib>
@@ -793,7 +779,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <sys-lib>$(wxwin.libToLink(value))</sys-lib>
         <ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
         <!-- msvs200?prj formats don't support external dependencies yet: -->
-        <if cond="FORMAT in ['msvc6prj','msevc4prj'] and MONOLITHIC=='0'">
+        <if cond="FORMAT=='msvc6prj' and MONOLITHIC=='0'">
             <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
         </if>
     </define-tag>
diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index c3e239d96b..1ea0da7869 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -3,7 +3,7 @@
 <makefile>
 
     <set var="IS_MSVC_PRJ">
-        $(FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'])
+        $(FORMAT in ['msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj'])
     </set>
     <set var="IS_MSVC">
         $(IS_MSVC_PRJ=='1' or FORMAT=='msvc')
@@ -54,7 +54,7 @@
             </description>
         </option>
 
-        <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']">
+        <if cond="FORMAT not in ['autoconf','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
             <option name="TOOLKIT_VERSION">
                 <values>,2</values>
                 <values-description>,2</values-description>
@@ -462,12 +462,12 @@ it if SHARED=1 unless you know what you are doing.
         <set var="TOOLKIT" overwrite="0">
             <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT)</if>
             <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT)</if>
-            <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT)</if>
+            <if cond="FORMAT not in ['msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT)</if>
         </set>
         <set var="TOOLKIT_LOWERCASE">
             <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT_LOWERCASE)</if>
             <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT_LOWERCASE)</if>
-            <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT_LOWERCASE)</if>
+            <if cond="FORMAT not in ['msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT_LOWERCASE)</if>
         </set>
         <if cond="FORMAT in ['msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
             <set var="TOOLKIT_VERSION">
diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index 5d93b0f4a2..b99dfcc15e 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -98,7 +98,6 @@
     </set>
 
     <set var="WXCPU">
-        <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
         <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='AMD64'">_x64</if>
         <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='IA64'">_ia64</if>
     </set>
@@ -264,14 +263,14 @@
          after __wx-libs-point: -->
     <define-tag name="__wx-syslibs" rules="exe,dll,module">
         <!-- wx 3rd party libs, always use them: -->
-        <sys-lib cond="FORMAT!='msevc4prj'">wxtiff$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
+        <sys-lib>wxtiff$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
         <sys-lib>wxjpeg$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
         <sys-lib>wxpng$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
         <sys-lib>wxzlib$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
         <!-- For regex we won't use the WX3RDPARTYLIBPOSTIX postfix:
              unliked tiff, jpeg, png, zlib, expat, when building
              in Unicode mode, the "u" suffix is appended to regex -->
-        <sys-lib cond="FORMAT!='msevc4prj'">wxregex$(WXLIBPOSTFIX)</sys-lib>
+        <sys-lib>wxregex$(WXLIBPOSTFIX)</sys-lib>
         <sys-lib>wxexpat$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
 
         <!-- link-in system libs that wx depends on: -->
@@ -281,7 +280,7 @@
         </if>
 
         <!-- Non-borland, on the other hand...                  -->
-        <if cond="FORMAT not in ['borland','msevc4prj']">
+        <if cond="FORMAT!='borland'">
             <sys-lib>kernel32</sys-lib>
             <sys-lib>user32</sys-lib>
             <sys-lib>gdi32</sys-lib>
diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl
index dfd56a2900..0f90e7b99f 100644
--- a/build/bakefiles/zlib.bkl
+++ b/build/bakefiles/zlib.bkl
@@ -27,9 +27,6 @@
         <cflags-borland>
             -w-8004 -w-8008 -w-8012 -w-8057 -w-8066
         </cflags-borland> 
-        <if cond="FORMAT=='msevc4prj'">
-            <define>NO_ERRNO_H</define>
-        </if>
         <if cond="IS_MSVC">
             <!--
                 Define this to get rid of many warnings about using open(),