diff --git a/src/Snap.cpp b/src/Snap.cpp
index f4716a95b..06fc762ae 100644
--- a/src/Snap.cpp
+++ b/src/Snap.cpp
@@ -10,6 +10,7 @@
 
 #include "Snap.h"
 
+#include <algorithm>
 #include <cstdlib>
 
 #include "Project.h"
diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp
index 4ae76ba9a..7614edba4 100644
--- a/src/commands/CommandManager.cpp
+++ b/src/commands/CommandManager.cpp
@@ -76,6 +76,7 @@ CommandManager.  It holds the callback for one command.
 *//******************************************************************/
 
 #include "../Audacity.h"
+#include "CommandManager.h"
 
 #include <wx/defs.h>
 #include <wx/hash.h>
@@ -88,8 +89,6 @@ CommandManager.  It holds the callback for one command.
 #include "../Prefs.h"
 #include "../Project.h"
 
-#include "CommandManager.h"
-
 #include "Keyboard.h"
 #include "../PluginManager.h"
 #include "../effects/EffectManager.h"
diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h
index c964ece22..c17c44a0f 100644
--- a/src/commands/CommandManager.h
+++ b/src/commands/CommandManager.h
@@ -14,6 +14,7 @@
 
 #include "../Experimental.h"
 
+#include <vector>
 #include <wx/string.h>
 #include <wx/dynarray.h>
 #include <wx/menu.h>