diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index a71231b2ae..bf6ecc3dc9 100644
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -47,7 +47,7 @@ WX_DEFINE_LIST(wxSimpleDataObjectList);
 // ----------------------------------------------------------------------------
 
 static wxDataFormat dataFormatInvalid;
-const wxDataFormat& wxFormatInvalid = dataFormatInvalid;
+WXDLLEXPORT const wxDataFormat& wxFormatInvalid = dataFormatInvalid;
 
 // ============================================================================
 // implementation
diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 1090d6b3a2..a50768c912 100644
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -32,7 +32,7 @@
 // If we are building with configure (defines __WX_SETUP_H__), 
 // we trust the zlib path is given as a -I option.
 #if defined(__WXMSW__) && !defined(__WX_SETUP_H__)
-   #include "..\zlib\zlib.h"
+   #include "../zlib/zlib.h"
 #else
    #include "zlib.h"
 #endif
diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index e0d39f7153..b125b4d288 100644
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -48,7 +48,7 @@
 #include "wx/spinctrl.h"
 
 // this is where wxGetNumberFromUser() is declared
-#include "wx/generic/textdlgg.h"
+#include "wx/textdlgg.h"
 
 #if !wxUSE_SPINCTRL
     // wxTextCtrl will do instead of wxSpinCtrl if we don't have it
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index f1aad3735e..eb56bcfa05 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -1270,6 +1270,6 @@ wxApp::GetStdIcon(int which) const
 
 // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
 // if in a separate file. So include it here to ensure it's linked.
-#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))
+#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL))
 #include "main.cpp"
 #endif