diff --git a/src/DocIterator.h b/src/DocIterator.h
index 69930fcc7d..a3786c4401 100644
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -15,7 +15,6 @@
 #include "CursorSlice.h"
 
 #include <vector>
-#include <algorithm>
 
 namespace lyx {
 
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 9cd9b8b385..d69fa55bb5 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -66,6 +66,7 @@
 #include "support/textutils.h"
 #include "output_docbook.h"
 
+#include <algorithm>
 #include <atomic>
 #include <sstream>
 #include <vector>
diff --git a/src/frontends/qt/FindAndReplace.cpp b/src/frontends/qt/FindAndReplace.cpp
index af2bbbbea3..4d14bcfccb 100644
--- a/src/frontends/qt/FindAndReplace.cpp
+++ b/src/frontends/qt/FindAndReplace.cpp
@@ -44,6 +44,8 @@
 #include <QLineEdit>
 #include <QMenu>
 
+#include <algorithm>
+
 using namespace std;
 using namespace lyx::support;
 
diff --git a/src/frontends/qt/GuiBox.cpp b/src/frontends/qt/GuiBox.cpp
index 298009da1b..a722ed3d61 100644
--- a/src/frontends/qt/GuiBox.cpp
+++ b/src/frontends/qt/GuiBox.cpp
@@ -32,6 +32,8 @@
 #include <QLineEdit>
 #include <QPushButton>
 
+#include <algorithm>
+
 #ifdef IN
 #undef IN
 #endif
diff --git a/src/frontends/qt/GuiCharacter.cpp b/src/frontends/qt/GuiCharacter.cpp
index d1d4336fc2..3de8338231 100644
--- a/src/frontends/qt/GuiCharacter.cpp
+++ b/src/frontends/qt/GuiCharacter.cpp
@@ -41,6 +41,8 @@
 #include <QSettings>
 #include <QVariant>
 
+#include <algorithm>
+
 using namespace std;
 
 namespace lyx {
diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index d776ad5e3b..9d3643de7e 100644
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -83,6 +83,7 @@
 #include <QTextBoundaryFinder>
 #include <QTextCursor>
 
+#include <algorithm>
 #include <sstream>
 #include <vector>
 
diff --git a/src/frontends/qt/GuiRef.cpp b/src/frontends/qt/GuiRef.cpp
index 8583d0cd26..83946c24d3 100644
--- a/src/frontends/qt/GuiRef.cpp
+++ b/src/frontends/qt/GuiRef.cpp
@@ -39,6 +39,8 @@
 #include <QCloseEvent>
 #include <QHeaderView>
 
+#include <algorithm>
+
 using namespace std;
 using namespace lyx::support;
 
diff --git a/src/xml.cpp b/src/xml.cpp
index dda39a4f3f..e50e55972b 100644
--- a/src/xml.cpp
+++ b/src/xml.cpp
@@ -28,6 +28,7 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
+#include <algorithm>
 #include <atomic>
 #include <map>
 #include <functional>