diff --git a/src/AdornedRulerPanel.cpp b/src/AdornedRulerPanel.cpp
index ea8a8ed2e..33c91bb56 100644
--- a/src/AdornedRulerPanel.cpp
+++ b/src/AdornedRulerPanel.cpp
@@ -21,8 +21,7 @@
 
 #include "AdornedRulerPanel.h"
 
-
-
+#include <wx/app.h>
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/tooltip.h>
 
diff --git a/src/AudacityException.cpp b/src/AudacityException.cpp
index fbf5e8381..3b7cc8f9c 100644
--- a/src/AudacityException.cpp
+++ b/src/AudacityException.cpp
@@ -12,6 +12,7 @@
 
 #include "AudacityException.h"
 
+#include <wx/app.h>
 #include <wx/atomic.h>
 
 #include "BasicUI.h"
diff --git a/src/AudacityException.h b/src/AudacityException.h
index cf908c589..9721c672f 100644
--- a/src/AudacityException.h
+++ b/src/AudacityException.h
@@ -12,7 +12,6 @@
  **********************************************************************/
 
 #include "MemoryX.h"
-#include <wx/app.h> // used in inline function template
 #include <exception>
 #include <functional>
 
diff --git a/src/BatchCommands.cpp b/src/BatchCommands.cpp
index 141f84c75..24601400c 100644
--- a/src/BatchCommands.cpp
+++ b/src/BatchCommands.cpp
@@ -23,6 +23,7 @@ processing.  See also MacrosWindow and ApplyMacroDialog.
 #include <wx/defs.h>
 #include <wx/datetime.h>
 #include <wx/dir.h>
+#include <wx/log.h>
 #include <wx/textfile.h>
 #include <wx/time.h>
 
diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp
index f2c4f4b0b..148f22b03 100644
--- a/src/BatchProcessDialog.cpp
+++ b/src/BatchProcessDialog.cpp
@@ -27,6 +27,7 @@
 #include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/intl.h>
+#include <wx/log.h>
 #include <wx/sizer.h>
 #include <wx/statbox.h>
 #include <wx/stattext.h>
diff --git a/src/DeviceManager.cpp b/src/DeviceManager.cpp
index 07f4f370d..a47843047 100644
--- a/src/DeviceManager.cpp
+++ b/src/DeviceManager.cpp
@@ -24,9 +24,11 @@
 #endif
 
 #ifndef WX_PRECOMP
+#include <wx/app.h>
 #include <wx/choice.h>
 #include <wx/event.h>
 #include <wx/intl.h>
+#include <wx/log.h>
 #include <wx/settings.h>
 #include <wx/sizer.h>
 #include <wx/statbmp.h>
diff --git a/src/Envelope.cpp b/src/Envelope.cpp
index b35f2d021..63c7f5672 100644
--- a/src/Envelope.cpp
+++ b/src/Envelope.cpp
@@ -38,6 +38,7 @@ a draggable point type.
 #include <wx/pen.h>
 #include <wx/textfile.h>
 #include <wx/log.h>
+#include <wx/utils.h>
 
 static const double VALUE_TOLERANCE = 0.001;
 
diff --git a/src/InconsistencyException.cpp b/src/InconsistencyException.cpp
index acce74e79..d8b9bfd9d 100644
--- a/src/InconsistencyException.cpp
+++ b/src/InconsistencyException.cpp
@@ -9,6 +9,7 @@
 
 
 #include "InconsistencyException.h"
+#include <wx/filename.h>
 
 InconsistencyException::~InconsistencyException()
 {
diff --git a/src/KeyboardCapture.cpp b/src/KeyboardCapture.cpp
index f6ea95c13..c56787a30 100644
--- a/src/KeyboardCapture.cpp
+++ b/src/KeyboardCapture.cpp
@@ -19,6 +19,7 @@
 #include <gtk/gtk.h>
 #endif
 
+#include <wx/app.h>
 #include <wx/button.h>
 #include <wx/eventfilter.h>
 #include <wx/toplevel.h>
diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp
index 1d6e7b08a..ecaedd1fb 100644
--- a/src/LabelTrack.cpp
+++ b/src/LabelTrack.cpp
@@ -41,6 +41,7 @@ for drawing different aspects of the label and its text box.
 #include <limits.h>
 #include <float.h>
 
+#include <wx/log.h>
 #include <wx/tokenzr.h>
 
 #include "Prefs.h"
diff --git a/src/Lyrics.cpp b/src/Lyrics.cpp
index 8bb3ae97b..590badc07 100644
--- a/src/Lyrics.cpp
+++ b/src/Lyrics.cpp
@@ -13,6 +13,7 @@
 
 #include <math.h>
 
+#include <wx/app.h>
 #include <wx/dcclient.h>
 #include <wx/defs.h>
 #include <wx/dcmemory.h>
diff --git a/src/LyricsWindow.cpp b/src/LyricsWindow.cpp
index 68143da09..d81a48cf3 100644
--- a/src/LyricsWindow.cpp
+++ b/src/LyricsWindow.cpp
@@ -19,6 +19,7 @@
 #include "ProjectFileIO.h"
 #include "ViewInfo.h"
 
+#include <wx/app.h>
 #include <wx/radiobut.h>
 #include <wx/toolbar.h>
 #include <wx/settings.h>
diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
index 995242a39..1477a5b1e 100644
--- a/src/MixerBoard.cpp
+++ b/src/MixerBoard.cpp
@@ -19,6 +19,7 @@
 
 #include <wx/setup.h> // for wxUSE_* macros
 
+#include <wx/app.h>
 #include <wx/bmpbuttn.h>
 #include <wx/dcclient.h>
 #include <wx/icon.h>
diff --git a/src/Project.cpp b/src/Project.cpp
index 280d488a1..c6ac93947 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -17,6 +17,7 @@
 #include "TempDirectory.h"
 #include "widgets/wxWidgetsBasicUI.h"
 
+#include <wx/app.h>
 #include <wx/display.h>
 #include <wx/filename.h>
 #include <wx/frame.h>
diff --git a/src/ProjectAudioManager.cpp b/src/ProjectAudioManager.cpp
index 58313c4b3..439288a21 100644
--- a/src/ProjectAudioManager.cpp
+++ b/src/ProjectAudioManager.cpp
@@ -11,8 +11,7 @@ Paul Licameli split from ProjectManager.cpp
 
 #include "ProjectAudioManager.h"
 
-
-
+#include <wx/app.h>
 #include <wx/frame.h>
 #include <wx/statusbr.h>
 
diff --git a/src/ProjectAudioManager.h b/src/ProjectAudioManager.h
index fac46f571..a1cefc282 100644
--- a/src/ProjectAudioManager.h
+++ b/src/ProjectAudioManager.h
@@ -16,6 +16,7 @@ Paul Licameli split from ProjectManager.h
 
 #include "AudioIOListener.h" // to inherit
 #include "ClientData.h" // to inherit
+#include <wx/event.h> // to declare custom event type
 
 constexpr int RATE_NOT_SELECTED{ -1 };
 
diff --git a/src/ProjectFileIO.cpp b/src/ProjectFileIO.cpp
index 185f110ba..829fac85b 100644
--- a/src/ProjectFileIO.cpp
+++ b/src/ProjectFileIO.cpp
@@ -12,6 +12,7 @@ Paul Licameli split from AudacityProject.cpp
 
 #include <atomic>
 #include <sqlite3.h>
+#include <wx/app.h>
 #include <wx/crt.h>
 #include <wx/frame.h>
 #include <wx/sstream.h>
diff --git a/src/ProjectFileManager.cpp b/src/ProjectFileManager.cpp
index 5c610d306..3006715ea 100644
--- a/src/ProjectFileManager.cpp
+++ b/src/ProjectFileManager.cpp
@@ -17,6 +17,7 @@ Paul Licameli split from AudacityProject.cpp
 #endif
 
 #include <wx/frame.h>
+#include <wx/log.h>
 #include "BasicUI.h"
 #include "CodeConversions.h"
 #include "Legacy.h"
diff --git a/src/ProjectManager.cpp b/src/ProjectManager.cpp
index 9723e1c68..fdbe0d9c7 100644
--- a/src/ProjectManager.cpp
+++ b/src/ProjectManager.cpp
@@ -46,6 +46,7 @@ Paul Licameli split from AudacityProject.cpp
 #include "widgets/FileHistory.h"
 #include "widgets/WindowAccessible.h"
 
+#include <wx/app.h>
 #include <wx/dataobj.h>
 #include <wx/dnd.h>
 #include <wx/scrolbar.h>
diff --git a/src/ProjectWindow.cpp b/src/ProjectWindow.cpp
index 99b7cf91a..836c23f3b 100644
--- a/src/ProjectWindow.cpp
+++ b/src/ProjectWindow.cpp
@@ -33,6 +33,7 @@ Paul Licameli split from AudacityProject.cpp
 #include "widgets/wxPanelWrapper.h"
 #include "widgets/WindowAccessible.h"
 
+#include <wx/app.h>
 #include <wx/display.h>
 #include <wx/scrolbar.h>
 #include <wx/sizer.h>
diff --git a/src/Screenshot.cpp b/src/Screenshot.cpp
index 26948a8d0..dfae0e9ad 100644
--- a/src/Screenshot.cpp
+++ b/src/Screenshot.cpp
@@ -20,6 +20,7 @@ It forwards the actual work of doing the commands to the ScreenshotCommand.
 #include "commands/ScreenshotCommand.h"
 #include "commands/CommandTargets.h"
 #include "commands/CommandContext.h"
+#include <wx/app.h>
 #include <wx/defs.h>
 #include <wx/event.h>
 #include <wx/frame.h>
diff --git a/src/SqliteSampleBlock.cpp b/src/SqliteSampleBlock.cpp
index 6819cbea7..5343b771e 100644
--- a/src/SqliteSampleBlock.cpp
+++ b/src/SqliteSampleBlock.cpp
@@ -19,6 +19,7 @@ Paul Licameli -- split from SampleBlock.cpp and SampleBlock.h
 #include "SampleBlock.h" // to inherit
 
 #include "SentryHelper.h"
+#include <wx/log.h>
 
 class SqliteSampleBlockFactory;
 
@@ -1029,4 +1030,4 @@ static struct Injector
       );
    }
 } injector;
- 
\ No newline at end of file
+ 
diff --git a/src/Tags.cpp b/src/Tags.cpp
index 9c96095e2..f45feb211 100644
--- a/src/Tags.cpp
+++ b/src/Tags.cpp
@@ -40,6 +40,7 @@
 
 #ifndef WX_PRECOMP
 // Include your minimal set of headers here, or wx.h
+#include <wx/log.h>
 #include <wx/window.h>
 #endif
 
diff --git a/src/Track.h b/src/Track.h
index a8d963044..63039b18a 100644
--- a/src/Track.h
+++ b/src/Track.h
@@ -19,6 +19,7 @@
 #include <vector>
 #include <list>
 #include <functional>
+#include <wx/event.h> // to inherit wxCommandEvent
 #include <wx/longlong.h>
 
 #include "ClientData.h"
diff --git a/src/TrackInfo.cpp b/src/TrackInfo.cpp
index 972de730a..ed220a510 100644
--- a/src/TrackInfo.cpp
+++ b/src/TrackInfo.cpp
@@ -28,8 +28,7 @@ Paul Licameli split from TrackPanel.cpp
 
 #include "TrackInfo.h"
 
-
-
+#include <wx/app.h>
 #include <wx/dc.h>
 #include <wx/frame.h>
 
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 4761c735a..bd72ec95e 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -46,8 +46,7 @@ is time to refresh some aspect of the screen.
 
 #include "TrackPanel.h"
 
-
-
+#include <wx/app.h>
 #include <wx/setup.h> // for wxUSE_* macros
 
 #include "AdornedRulerPanel.h"
diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp
index 726d1920a..ea6bf6cfd 100644
--- a/src/commands/CommandManager.cpp
+++ b/src/commands/CommandManager.cpp
@@ -82,6 +82,7 @@ CommandManager.  It holds the callback for one command.
 #include "CommandContext.h"
 #include "CommandManagerWindowClasses.h"
 
+#include <wx/app.h>
 #include <wx/defs.h>
 #include <wx/evtloop.h>
 #include <wx/frame.h>
diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp
index 289e12042..fdee3bd34 100644
--- a/src/commands/GetInfoCommand.cpp
+++ b/src/commands/GetInfoCommand.cpp
@@ -48,6 +48,7 @@ This class now lists
 #include "../ShuttleGui.h"
 
 #include <wx/frame.h>
+#include <wx/log.h>
 #include <wx/menu.h>
 
 const ComponentInterfaceSymbol GetInfoCommand::Symbol
diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp
index 4e2a5e942..2deb00521 100644
--- a/src/commands/ScreenshotCommand.cpp
+++ b/src/commands/ScreenshotCommand.cpp
@@ -24,6 +24,7 @@ small calculations of rectangles.
 
 #include "LoadCommands.h"
 #include "../Project.h"
+#include <wx/app.h>
 #include <wx/toplevel.h>
 #include <wx/dcscreen.h>
 #include <wx/dcmemory.h>
diff --git a/src/effects/EffectUI.cpp b/src/effects/EffectUI.cpp
index 6f380f15b..aef2f0cfe 100644
--- a/src/effects/EffectUI.cpp
+++ b/src/effects/EffectUI.cpp
@@ -660,6 +660,7 @@ private:
 #include "../widgets/AudacityMessageBox.h"
 #include "../widgets/HelpSystem.h"
 
+#include <wx/app.h>
 #include <wx/bmpbuttn.h>
 #include <wx/checkbox.h>
 #include <wx/dcclient.h>
diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp
index 5f0a9cc92..54fac712a 100644
--- a/src/effects/Equalization.cpp
+++ b/src/effects/Equalization.cpp
@@ -69,6 +69,7 @@
 #include <wx/dcmemory.h>
 #include <wx/event.h>
 #include <wx/listctrl.h>
+#include <wx/log.h>
 #include <wx/image.h>
 #include <wx/intl.h>
 #include <wx/choice.h>
diff --git a/src/export/ExportFFmpeg.cpp b/src/export/ExportFFmpeg.cpp
index f921653b0..d955bfd71 100644
--- a/src/export/ExportFFmpeg.cpp
+++ b/src/export/ExportFFmpeg.cpp
@@ -24,6 +24,7 @@ function.
 #include "../FFmpeg.h"
 
 #include <wx/choice.h>
+#include <wx/log.h>
 #include <wx/intl.h>
 #include <wx/timer.h>
 #include <wx/string.h>
diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp
index a7b9cbe92..bfbbeb232 100644
--- a/src/export/ExportFFmpegDialogs.cpp
+++ b/src/export/ExportFFmpegDialogs.cpp
@@ -46,6 +46,7 @@
 
 #include "../FFmpeg.h"
 
+#include <wx/app.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/intl.h>
diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp
index c8fd30c61..69f186a16 100644
--- a/src/export/ExportMultiple.cpp
+++ b/src/export/ExportMultiple.cpp
@@ -29,6 +29,7 @@
 #include <wx/filefn.h>
 #include <wx/filename.h>
 #include <wx/intl.h>
+#include <wx/log.h>
 #include <wx/radiobut.h>
 #include <wx/simplebook.h>
 #include <wx/sizer.h>
diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp
index 7dfa93b37..e40a40799 100644
--- a/src/export/ExportPCM.cpp
+++ b/src/export/ExportPCM.cpp
@@ -12,6 +12,7 @@
 
 #include <wx/defs.h>
 
+#include <wx/app.h>
 #include <wx/choice.h>
 #include <wx/dynlib.h>
 #include <wx/filename.h>
diff --git a/src/import/ImportAUP.cpp b/src/import/ImportAUP.cpp
index 71915fc66..063936c37 100644
--- a/src/import/ImportAUP.cpp
+++ b/src/import/ImportAUP.cpp
@@ -59,6 +59,7 @@ static const auto exts = {wxT("aup")};
 #include <wx/ffile.h>
 #include <wx/file.h>
 #include <wx/frame.h>
+#include <wx/log.h>
 #include <wx/string.h>
 #include <wx/utils.h>
 
diff --git a/src/import/ImportFFmpeg.cpp b/src/import/ImportFFmpeg.cpp
index 8f68f12fe..c5561e3d8 100644
--- a/src/import/ImportFFmpeg.cpp
+++ b/src/import/ImportFFmpeg.cpp
@@ -28,6 +28,7 @@ Licensed under the GNU General Public License v2 or later
 #include "../FFmpeg.h"      // which brings in avcodec.h, avformat.h
 #ifndef WX_PRECOMP
 // Include your minimal set of headers here, or wx.h
+#include <wx/log.h>
 #include <wx/window.h>
 #endif
 
diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp
index 24460e84f..3f8c73180 100644
--- a/src/menus/FileMenus.cpp
+++ b/src/menus/FileMenus.cpp
@@ -32,6 +32,7 @@
 #include "../import/ImportMIDI.h"
 #endif // USE_MIDI
 
+#include <wx/app.h>
 #include <wx/menu.h>
 
 // private helper classes and functions
diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp
index c4680c4a7..ddfd3252f 100644
--- a/src/menus/HelpMenus.cpp
+++ b/src/menus/HelpMenus.cpp
@@ -1,5 +1,5 @@
 
-
+#include <wx/app.h>
 #include <wx/bmpbuttn.h>
 #include <wx/textctrl.h>
 #include <wx/frame.h>
diff --git a/src/menus/PluginMenus.cpp b/src/menus/PluginMenus.cpp
index e33ec5840..7dd2b99a1 100644
--- a/src/menus/PluginMenus.cpp
+++ b/src/menus/PluginMenus.cpp
@@ -25,6 +25,8 @@
 #include "../prefs/EffectsPrefs.h"
 #include "../prefs/PrefsDialog.h"
 
+#include <wx/log.h>
+
 // private helper classes and functions
 namespace {
 
diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp
index 0dde2b316..d9adcf937 100644
--- a/src/menus/TransportMenus.cpp
+++ b/src/menus/TransportMenus.cpp
@@ -34,6 +34,7 @@
 #include "../widgets/ProgressDialog.h"
 
 #include <float.h>
+#include <wx/app.h>
 
 // private helper classes and functions
 namespace {
diff --git a/src/menus/ViewMenus.cpp b/src/menus/ViewMenus.cpp
index 0740fc253..12d8acc84 100644
--- a/src/menus/ViewMenus.cpp
+++ b/src/menus/ViewMenus.cpp
@@ -20,6 +20,7 @@
 #include "../effects/EffectUI.h"
 #endif
 
+#include <wx/app.h>
 #include <wx/scrolbar.h>
 
 // private helper classes and functions
diff --git a/src/toolbars/DeviceToolBar.cpp b/src/toolbars/DeviceToolBar.cpp
index 5ec590ec4..288d2c0a2 100644
--- a/src/toolbars/DeviceToolBar.cpp
+++ b/src/toolbars/DeviceToolBar.cpp
@@ -24,6 +24,7 @@
 #include <wx/setup.h> // for wxUSE_* macros
 
 #ifndef WX_PRECOMP
+#include <wx/app.h>
 #include <wx/choice.h>
 #include <wx/event.h>
 #include <wx/intl.h>
diff --git a/src/toolbars/EditToolBar.cpp b/src/toolbars/EditToolBar.cpp
index 08f158c24..4143a5b33 100644
--- a/src/toolbars/EditToolBar.cpp
+++ b/src/toolbars/EditToolBar.cpp
@@ -39,6 +39,7 @@
 #include <wx/setup.h> // for wxUSE_* macros
 
 #ifndef WX_PRECOMP
+#include <wx/app.h>
 #include <wx/event.h>
 #include <wx/image.h>
 #include <wx/intl.h>
diff --git a/src/toolbars/MixerToolBar.cpp b/src/toolbars/MixerToolBar.cpp
index 8f9c234a4..de0c4fff0 100644
--- a/src/toolbars/MixerToolBar.cpp
+++ b/src/toolbars/MixerToolBar.cpp
@@ -23,6 +23,7 @@
 #include <wx/wxprec.h>
 
 #ifndef WX_PRECOMP
+#include <wx/app.h>
 #include <wx/choice.h>
 #include <wx/event.h>
 #include <wx/intl.h>
diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
index 675ef97a6..622b6de8f 100644
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
@@ -29,6 +29,7 @@ Paul Licameli split from TrackPanel.cpp
 #include "../../../../prefs/ThemePrefs.h"
 
 #include <mutex>
+#include <wx/app.h>
 #include <wx/frame.h>
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
index 9dbd2e02f..bfc21532b 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
@@ -36,6 +36,7 @@ Paul Licameli split from TrackPanel.cpp
 #include "UserException.h"
 #include "Identifier.h"
 
+#include <wx/app.h>
 #include <wx/combobox.h>
 #include <wx/frame.h>
 #include <wx/sizer.h>
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h
index e0dafcd3e..b880e85e3 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h
@@ -23,6 +23,8 @@ class WaveTrack;
 class WaveTrackView;
 class WaveClip;
 
+class wxDC;
+
 class AUDACITY_DLL_API WaveTrackSubView : public CommonTrackView
 {
 public:
diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp
index 08772f5dd..3f05c41b3 100644
--- a/src/tracks/ui/Scrubbing.cpp
+++ b/src/tracks/ui/Scrubbing.cpp
@@ -33,6 +33,7 @@ Paul Licameli split from TrackPanel.cpp
 
 #include <algorithm>
 
+#include <wx/app.h>
 #include <wx/menu.h>
 
 // Yet another experimental scrub would drag the track under a
diff --git a/src/tracks/ui/TimeShiftHandle.h b/src/tracks/ui/TimeShiftHandle.h
index a36c2368d..59af27fbc 100644
--- a/src/tracks/ui/TimeShiftHandle.h
+++ b/src/tracks/ui/TimeShiftHandle.h
@@ -27,6 +27,7 @@ class Track;
 class TrackInterval;
 
 class ViewInfo;
+class wxMouseState;
 
 //! Abstract base class for policies to manipulate a track type with the Time Shift tool
 class AUDACITY_DLL_API TrackShifter {
diff --git a/src/update/UpdateDataParser.cpp b/src/update/UpdateDataParser.cpp
index 58e4698a1..9fc18b4dc 100644
--- a/src/update/UpdateDataParser.cpp
+++ b/src/update/UpdateDataParser.cpp
@@ -11,6 +11,7 @@
 
 #include "xml/XMLFileReader.h"
 #include "MemoryX.h"
+#include <wx/platinfo.h>
 
 UpdateDataParser::UpdateDataParser()
 {}
diff --git a/src/update/UpdateManager.cpp b/src/update/UpdateManager.cpp
index 90a5ba651..c8a9b1dec 100644
--- a/src/update/UpdateManager.cpp
+++ b/src/update/UpdateManager.cpp
@@ -18,9 +18,9 @@
 #include "IResponse.h"
 #include "Request.h"
 
-#include <wx/platinfo.h>
 #include <wx/utils.h>
 #include <wx/frame.h>
+#include <wx/app.h>
 
 #include <mutex>
 #include <cstdint>
diff --git a/src/xml/XMLFileReader.cpp b/src/xml/XMLFileReader.cpp
index db46db53e..484d2fabe 100644
--- a/src/xml/XMLFileReader.cpp
+++ b/src/xml/XMLFileReader.cpp
@@ -18,6 +18,7 @@
 #include <wx/defs.h>
 #include <wx/ffile.h>
 #include <wx/intl.h>
+#include <wx/log.h>
 
 #include <string.h>