diff --git a/taglib/matroska/ebml/ebmlmksegment.cpp b/taglib/matroska/ebml/ebmlmksegment.cpp
index f570315c..0fe72263 100644
--- a/taglib/matroska/ebml/ebmlmksegment.cpp
+++ b/taglib/matroska/ebml/ebmlmksegment.cpp
@@ -19,6 +19,9 @@
  ***************************************************************************/
 
 #include "ebmlmksegment.h"
+
+#include <algorithm>
+
 #include "ebmlutils.h"
 #include "matroskafile.h"
 #include "matroskatag.h"
diff --git a/taglib/matroska/ebml/ebmlutils.cpp b/taglib/matroska/ebml/ebmlutils.cpp
index 60f05155..7c37f00d 100644
--- a/taglib/matroska/ebml/ebmlutils.cpp
+++ b/taglib/matroska/ebml/ebmlutils.cpp
@@ -19,7 +19,10 @@
  ***************************************************************************/
 
 #include "ebmlutils.h"
+
+#include <algorithm>
 #include <random>
+
 #include "tbytevector.h"
 #include "matroskafile.h"
 #include "tutils.h"
diff --git a/taglib/matroska/ebml/ebmlvoidelement.cpp b/taglib/matroska/ebml/ebmlvoidelement.cpp
index 3a841c2e..1bc34d04 100644
--- a/taglib/matroska/ebml/ebmlvoidelement.cpp
+++ b/taglib/matroska/ebml/ebmlvoidelement.cpp
@@ -19,7 +19,9 @@
  ***************************************************************************/
 
 #include "ebmlvoidelement.h"
+
 #include <algorithm>
+
 #include "ebmlutils.h"
 #include "tbytevector.h"
 
diff --git a/taglib/matroska/matroskafile.cpp b/taglib/matroska/matroskafile.cpp
index 0a726c34..920a50cd 100644
--- a/taglib/matroska/matroskafile.cpp
+++ b/taglib/matroska/matroskafile.cpp
@@ -19,7 +19,10 @@
  ***************************************************************************/
 
 #include "matroskafile.h"
+
+#include <algorithm>
 #include <memory>
+
 #include "matroskatag.h"
 #include "matroskaattachments.h"
 #include "matroskaattachedfile.h"
diff --git a/taglib/mod/modfile.cpp b/taglib/mod/modfile.cpp
index 56ad8e54..a94d39f2 100644
--- a/taglib/mod/modfile.cpp
+++ b/taglib/mod/modfile.cpp
@@ -25,6 +25,8 @@
 
 #include "modfile.h"
 
+#include <algorithm>
+
 #include "tstringlist.h"
 #include "tdebug.h"
 #include "tpropertymap.h"
diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp
index 0128250d..be1c2421 100644
--- a/taglib/mpeg/mpegfile.cpp
+++ b/taglib/mpeg/mpegfile.cpp
@@ -25,6 +25,8 @@
 
 #include "mpegfile.h"
 
+#include <algorithm>
+
 #include "taglib_config.h"
 #include "id3v2framefactory.h"
 #include "tdebug.h"