diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp
index 85eb8d75d8..d524d15d0c 100644
--- a/src/common/accelcmn.cpp
+++ b/src/common/accelcmn.cpp
@@ -30,6 +30,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/accel.h"
+    #include "wx/crt.h"
 #endif //WX_PRECOMP
 
 // ============================================================================
diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 765e316419..47459efede 100644
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -70,6 +70,7 @@
     #include "wx/intl.h"
     #include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()
     #include "wx/module.h"
+    #include "wx/crt.h"
 #endif // WX_PRECOMP
 
 #include "wx/thread.h"
diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 6f867a1bdb..ac9981425e 100644
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -25,6 +25,7 @@
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/log.h"
+    #include "wx/crt.h"
 #endif
 
 #ifdef DBDEBUG_CONSOLE
diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 05c29faa6d..4ea59377b9 100644
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -29,6 +29,7 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/crt.h"
 #endif
 
 #ifdef __WINDOWS__
diff --git a/src/common/file.cpp b/src/common/file.cpp
index 45ab8ade8c..23e0450283 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -116,6 +116,7 @@
     #include  "wx/string.h"
     #include  "wx/intl.h"
     #include  "wx/log.h"
+    #include "wx/crt.h"
 #endif // !WX_PRECOMP
 
 #include  "wx/filename.h"
diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index ee5913ccc9..e4d3f4d5dd 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -30,6 +30,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/crt.h"
 #endif
 
 #include "wx/file.h"
diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 6334696a34..ac911cb0a9 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -75,6 +75,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/crt.h"
 #endif
 
 #include "wx/filename.h"
diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index b24cc65838..21eb8f5c0f 100644
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -35,6 +35,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/module.h"
+    #include "wx/crt.h"
 #endif //WX_PRECOMP
 
 #include "wx/file.h"
diff --git a/src/common/object.cpp b/src/common/object.cpp
index 301b632556..247c365f66 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -21,6 +21,7 @@
     #include "wx/object.h"
     #include "wx/hash.h"
     #include "wx/memory.h"
+    #include "wx/crt.h"
 #endif
 
 #include <string.h>
diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index ccf9ffd727..bc0faa554e 100644
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -32,6 +32,7 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/crt.h"
 #endif //WX_PRECOMP
 
 // FreeBSD, Watcom and DMars require this, CW doesn't have nor need it.
diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index 5bdae9d7fb..34ba2b0523 100644
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -28,6 +28,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/arrstr.h"
+    #include "wx/crt.h"
 #endif
 
 // Required for wxIs... functions
diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 524402d54f..c933c4b4da 100644
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -18,6 +18,10 @@
 
 #if wxUSE_STREAMS
 
+#ifndef WX_PRECOMP
+    #include "wx/crt.h"
+#endif
+
 #include "wx/txtstrm.h"
 #include <ctype.h>
 
diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index 5ddfbc3cbc..bcdd7eae66 100644
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -23,6 +23,10 @@
     #pragma hdrstop
 #endif
 
+#ifndef WX_PRECOMP
+    #include "wx/crt.h"
+#endif
+
 #include "wx/uri.h"
 
 // ---------------------------------------------------------------------------
diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 0be25d1047..6892784807 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/math.h"
+    #include "wx/crt.h"
     #if wxUSE_STREAMS
         #include "wx/stream.h"
     #endif
diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index 4720084cba..be3b448067 100644
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -25,6 +25,7 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/crt.h"
     #if wxUSE_GUI
         #include "wx/icon.h"
         #include "wx/msgdlg.h"
diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index 224927aa1b..fb496d100f 100644
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -24,6 +24,7 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/crt.h"
 #endif
 
 #include "wx/file.h"