diff --git a/include/wx/log.h b/include/wx/log.h
index c63271a868..c70ab1a09b 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -331,7 +331,7 @@ const char* WXDLLEXPORT wxSysErrorMsg(unsigned long nErrCode = 0);
   #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode())
 #else   //!debug
   inline void wxLogApiError(const char *, long) { }
-  inline void wxLogLastErrror(const char *) { }
+  inline void wxLogLastError(const char *) { }
 #endif  //debug/!debug
 
 #endif  //__LOGH__
diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index b438c2b386..430ffde227 100644
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -13,6 +13,17 @@
 #pragma implementation "stream.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/setup.h"
+#endif
+
 #include "wx/object.h"
 #include "wx/stream.h"
 
diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt
index e4a1cdba0e..1e2e750054 100644
--- a/src/msw/makefile.nt
+++ b/src/msw/makefile.nt
@@ -107,16 +107,13 @@ COMMONOBJS = \
   $(COMMDIR)\time.obj \
   $(COMMDIR)\wxexpr.obj \
   $(COMMDIR)\y_tab.obj \
-  $(COMMDIR)\stream.obj \
-  $(COMMDIR)\fstream.obj \
-  $(COMMDIR)\mstream.obj \
-  $(COMMDIR)\datstrm.obj \
   $(COMMDIR)\extended.obj \
   $(COMMDIR)\process.obj
 
-#  $(COMMDIR)\wxstrgnu\wxstrgnu.obj \
-#  $(COMMDIR)\wxstrgnu\wxregex.obj \
-#  $(COMMDIR)\matrix.obj \
+# $(COMMDIR)\fstream.obj \
+#  $(COMMDIR)\mstream.obj \
+#  $(COMMDIR)\datstrm.obj \
+#  $(COMMDIR)\stream.obj \
 
 MSWOBJS = \
   $(MSWDIR)\app.obj \
diff --git a/src/ntwxwin.mak b/src/ntwxwin.mak
index 83bc3116e6..ec854fd8b2 100644
--- a/src/ntwxwin.mak
+++ b/src/ntwxwin.mak
@@ -141,9 +141,9 @@ PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__ /DWXDEBUG=1
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__WXDEBUG__ /DWXDEBUG=1
 # If you don't include wxprec.h, use CPPFLAGS2
-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__ /DWXDEBUG=1
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__WXDEBUG__ /DWXDEBUG=1
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
 DUMMY=dummy