diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index 1cc18062fe..cbba253924 100755
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -72,14 +72,14 @@ FUNC_FOR_CMD = 1
 GENERATE_PROVISIONAL_ITEMS = 0
 
 # No wxSTC value will be generated for the following Scintilla values.
-notMappedSciValues = {
+notMappedSciValues = set([
     'SC_TECHNOLOGY_DIRECTWRITERETAIN',
     'SC_TECHNOLOGY_DIRECTWRITEDC',
     'INDIC0_MASK',
     'INDIC1_MASK',
     'INDIC2_MASK',
     'INDICS_MASK'
-}
+])
 
 # Map some generic typenames to wx types, using return value syntax
 retTypeMap = {
diff --git a/src/stc/scintilla/lexers/LexProgress.cxx b/src/stc/scintilla/lexers/LexProgress.cxx
index cede44ebea..1a7c52503b 100644
--- a/src/stc/scintilla/lexers/LexProgress.cxx
+++ b/src/stc/scintilla/lexers/LexProgress.cxx
@@ -25,6 +25,7 @@ Differentiate between labels and variables
 #include <string>
 #include <vector>
 #include <map>
+#include <algorithm>
 
 #include "ILexer.h"
 #include "Scintilla.h"