diff --git a/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h b/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h
index bd9cf89b..3780012c 100644
--- a/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h
+++ b/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h
@@ -31,8 +31,8 @@
 // ======================================================================
 
 // grab stlport configuration
-//#include "stl/config/features.h" // uncomment for newer stlport versions
-#include "stl/_config.h"
+#include "stl/config/features.h" // uncomment for newer stlport versions
+//#include "stl/_config.h"
 
 namespace std
 {
diff --git a/external/ours/library/archive/src/shared/AutoDeltaSet.h b/external/ours/library/archive/src/shared/AutoDeltaSet.h
index af61b672..95652240 100644
--- a/external/ours/library/archive/src/shared/AutoDeltaSet.h
+++ b/external/ours/library/archive/src/shared/AutoDeltaSet.h
@@ -183,7 +183,14 @@ inline typename AutoDeltaSet<ValueType, ObjectType>::const_iterator AutoDeltaSet
 		c.value = *i;
 		m_commands.push_back(c);
 		++m_baselineCommandCount;
+#ifdef WIN32
+        typename SetType::iterator tmp(m_set.begin());
+        std::advance(tmp, std::distance<const_iterator>(tmp, i));
+        i++;
+        m_set.erase(tmp);
+#else
 		m_set.erase(i++);
+#endif
 		touch();
 		onErase(c.value);
 		onChanged();