diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index b05ad2b35c..5e34e7089c 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -20,7 +20,7 @@
          defined(__DIGITALMARS__) || \
          defined(__WATCOMC__) ) ) || \
       defined(__VISAGECPP__) || \
-      defined(__MWERKS__) 
+      defined(__MWERKS__)
 
     #if !defined(NOPCH)
         #define WX_PRECOMP
@@ -39,7 +39,7 @@
 #include "wx/wxchar.h"
 
 // include standard Windows headers
-#if defined(__WXMSW__) && !wxUSE_MFC
+#if defined(__WXMSW__)
     #include "wx/msw/wrapwin.h"
 #endif
 
diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 7568e9878f..12feee5bdf 100644
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -34,11 +34,6 @@
 
 #include "wx/msw/private.h"
 
-// Don't implement WinMain if we're building an MFC/wxWidgets hybrid app.
-#if wxUSE_MFC && !defined(NOMAIN)
-    #define NOMAIN 1
-#endif
-
 #ifdef __BORLANDC__
     // BC++ has to be special: its run-time expects the DLL entry point to be
     // named DllEntryPoint instead of the (more) standard DllMain