diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 798c3d5457..daaf5e0b9c 100644
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -305,7 +305,13 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
     return wxEntry(wxArgs.argc, wxArgs.argv);
 }
 
-#else // !wxUSE_GUI
+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// global HINSTANCE
+// ----------------------------------------------------------------------------
+
+#if wxUSE_BASE
 
 int wxEntry()
 {
@@ -314,14 +320,6 @@ int wxEntry()
     return wxEntry(wxArgs.argc, wxArgs.argv);
 }
 
-#endif // wxUSE_GUI/!wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// global HINSTANCE
-// ----------------------------------------------------------------------------
-
-#if wxUSE_BASE
-
 HINSTANCE wxhInstance = 0;
 
 extern "C" HINSTANCE wxGetInstance()