diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index d9f4fe337..09399c2c7 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -29,6 +29,7 @@ It handles initialization and termination by subclassing wxApp.
 #include "TranslatableStringArray.h"
 
 #include <wx/setup.h> // for wxUSE_* macros
+#include <wx/wxcrtvararg.h>
 #include <wx/defs.h>
 #include <wx/app.h>
 #include <wx/bitmap.h>
diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
index df03d75e8..e5017fbe4 100644
--- a/src/AudioIO.cpp
+++ b/src/AudioIO.cpp
@@ -438,6 +438,7 @@ TimeTrack and AudioIOListener and whether the playback is looped.
 #include "portmixer.h"
 #endif
 
+#include <wx/wxcrtvararg.h>
 #include <wx/log.h>
 #include <wx/textctrl.h>
 #include <wx/timer.h>
diff --git a/src/DirManager.cpp b/src/DirManager.cpp
index e0e0399e8..7cae057a1 100644
--- a/src/DirManager.cpp
+++ b/src/DirManager.cpp
@@ -68,6 +68,7 @@
 
 #include <time.h> // to use time() for srand()
 
+#include <wx/wxcrtvararg.h>
 #include <wx/defs.h>
 #include <wx/app.h>
 #include <wx/dir.h>
diff --git a/src/Envelope.cpp b/src/Envelope.cpp
index 0854054d9..5f1aa6cd3 100644
--- a/src/Envelope.cpp
+++ b/src/Envelope.cpp
@@ -34,6 +34,7 @@ a draggable point type.
 
 #include <math.h>
 
+#include <wx/wxcrtvararg.h>
 #include <wx/dc.h>
 #include <wx/brush.h>
 #include <wx/event.h>
diff --git a/src/FFT.cpp b/src/FFT.cpp
index 217b241ff..ddd19c89b 100644
--- a/src/FFT.cpp
+++ b/src/FFT.cpp
@@ -47,6 +47,7 @@
 #include "MemoryX.h"
 #include "SampleFormat.h"
 
+#include <wx/wxcrtvararg.h>
 #include <wx/intl.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp
index cf4bbdcd7..78a155bde 100644
--- a/src/NoteTrack.cpp
+++ b/src/NoteTrack.cpp
@@ -19,6 +19,7 @@
 
 #include "Experimental.h"
 
+#include <wx/wxcrtvararg.h>
 #include <wx/dc.h>
 #include <wx/brush.h>
 #include <wx/pen.h>
diff --git a/src/Project.cpp b/src/Project.cpp
index 11e8732f0..9e50a1358 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -59,6 +59,7 @@ scroll information.  It also has some status flags.
 
 #include <wx/setup.h> // for wxUSE_* macros
 
+#include <wx/wxcrtvararg.h>
 #include <wx/apptrait.h>
 
 #include <wx/defs.h>
diff --git a/src/SelectedRegion.h b/src/SelectedRegion.h
index 78f38f63a..020313c30 100644
--- a/src/SelectedRegion.h
+++ b/src/SelectedRegion.h
@@ -30,7 +30,7 @@
 #include "Experimental.h"
 
 #include <wx/defs.h>
-#include <wx/wxchar.h>
+#include <wx/chartype.h> // for wxChar, a typedef
 #include <math.h>
 
 class XMLWriter;
diff --git a/src/TimeTrack.cpp b/src/TimeTrack.cpp
index aa49555b8..61fa5aa0b 100644
--- a/src/TimeTrack.cpp
+++ b/src/TimeTrack.cpp
@@ -19,6 +19,7 @@
 #include "Experimental.h"
 
 #include <cfloat>
+#include <wx/wxcrtvararg.h>
 #include <wx/intl.h>
 #include "AColor.h"
 #include "widgets/Ruler.h"
diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp
index 6f02d0114..ec41ebfae 100644
--- a/src/TimerRecordDialog.cpp
+++ b/src/TimerRecordDialog.cpp
@@ -25,6 +25,7 @@
 
 #include <wx/setup.h> // for wxUSE_* macros
 
+#include <wx/wxcrtvararg.h>
 #include <wx/button.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
diff --git a/src/blockfile/LegacyAliasBlockFile.cpp b/src/blockfile/LegacyAliasBlockFile.cpp
index ff049ea84..af5cd45dc 100644
--- a/src/blockfile/LegacyAliasBlockFile.cpp
+++ b/src/blockfile/LegacyAliasBlockFile.cpp
@@ -12,7 +12,7 @@
 #include "LegacyAliasBlockFile.h"
 
 #include <wx/utils.h>
-#include <wx/wxchar.h>
+#include <wx/wxcrtvararg.h>
 
 #include <sndfile.h>
 
diff --git a/src/blockfile/ODDecodeBlockFile.cpp b/src/blockfile/ODDecodeBlockFile.cpp
index a02a9764d..e1d1de75e 100644
--- a/src/blockfile/ODDecodeBlockFile.cpp
+++ b/src/blockfile/ODDecodeBlockFile.cpp
@@ -22,7 +22,7 @@ The summary is eventually computed and written to a file in a background thread.
 #include <float.h>
 
 #include <wx/utils.h>
-#include <wx/wxchar.h>
+#include <wx/wxcrtvararg.h>
 #include <wx/log.h>
 #include <wx/thread.h>
 #include <sndfile.h>
diff --git a/src/blockfile/ODPCMAliasBlockFile.cpp b/src/blockfile/ODPCMAliasBlockFile.cpp
index b3ffc19b8..795b3577f 100644
--- a/src/blockfile/ODPCMAliasBlockFile.cpp
+++ b/src/blockfile/ODPCMAliasBlockFile.cpp
@@ -23,7 +23,7 @@ The summary is eventually computed and written to a file in a background thread.
 
 #include <wx/file.h>
 #include <wx/utils.h>
-#include <wx/wxchar.h>
+#include <wx/wxcrtvararg.h>
 #include <wx/log.h>
 #include <wx/thread.h>
 #include <sndfile.h>
diff --git a/src/blockfile/PCMAliasBlockFile.cpp b/src/blockfile/PCMAliasBlockFile.cpp
index e3b485dd3..3fe0937e9 100644
--- a/src/blockfile/PCMAliasBlockFile.cpp
+++ b/src/blockfile/PCMAliasBlockFile.cpp
@@ -13,7 +13,7 @@
 
 #include <wx/file.h>
 #include <wx/utils.h>
-#include <wx/wxchar.h>
+#include <wx/wxcrtvararg.h>
 #include <wx/log.h>
 
 #include <sndfile.h>
diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp
index b89666460..9829dde59 100644
--- a/src/widgets/Meter.cpp
+++ b/src/widgets/Meter.cpp
@@ -45,6 +45,7 @@
 
 #include <algorithm>
 #include <wx/setup.h> // for wxUSE_* macros
+#include <wx/wxcrtvararg.h>
 #include <wx/app.h>
 #include <wx/defs.h>
 #include <wx/dialog.h>