diff -ruN src_org/CurrentQuest.cpp src/CurrentQuest.cpp
--- src_org/CurrentQuest.cpp	2015-10-16 12:12:37.896368368 +0200
+++ src/CurrentQuest.cpp	2015-10-16 12:12:46.896438536 +0200
@@ -132,7 +132,7 @@
         dialog.set_property(pkvp.first, pkvp.second);
       }
 
-      dialogs.emplace(id, dialog);
+      dialogs.insert(std::make_pair(id, dialog));
     }
   }
 }
diff -ruN src_org/DialogResources.cpp src/DialogResources.cpp
--- src_org/DialogResources.cpp	2015-10-16 12:12:37.826367823 +0200
+++ src/DialogResources.cpp	2015-10-16 12:12:46.896438536 +0200
@@ -171,7 +171,7 @@
 bool DialogResources::add_dialog(
     const std::string& dialog_id, const DialogData& dialog) {
 
-  const auto& result = dialogs.emplace(dialog_id, dialog);
+  const auto& result = dialogs.insert(std::make_pair(dialog_id, dialog));
   if (!result.second) {
     // Insertion failed: the id already exists.
     return false;
diff -ruN src_org/entities/Tileset.cpp src/entities/Tileset.cpp
--- src_org/entities/Tileset.cpp	2015-10-16 12:12:38.846375775 +0200
+++ src/entities/Tileset.cpp	2015-10-16 12:12:46.896438536 +0200
@@ -118,7 +118,7 @@
     );
   }
 
-  tile_patterns.emplace(id, std::unique_ptr<TilePattern>(tile_pattern));
+  tile_patterns.insert(std::make_pair(id, std::unique_ptr<TilePattern>(tile_pattern)));
 }
 
 /**
diff -ruN src_org/entities/TilesetData.cpp src/entities/TilesetData.cpp
--- src_org/entities/TilesetData.cpp	2015-10-16 12:12:39.111377841 +0200
+++ src/entities/TilesetData.cpp	2015-10-16 12:12:46.901438575 +0200
@@ -303,7 +303,7 @@
 bool TilesetData::add_pattern(
     const std::string& pattern_id, const TilePatternData& pattern) {
 
-  const auto& result = patterns.emplace(pattern_id, pattern);
+  const auto& result = patterns.insert(std::make_pair(pattern_id, pattern));
   if (!result.second) {
     // Insertion failed: the id already exists.
     return false;
diff -ruN src_org/EntityData.cpp src/EntityData.cpp
--- src_org/EntityData.cpp	2015-10-16 12:12:37.851368017 +0200
+++ src/EntityData.cpp	2015-10-16 12:12:46.901438575 +0200
@@ -503,7 +503,7 @@
   fields.clear();
   const EntityTypeDescription& type_description = entity_type_descriptions.at(type);
   for (const EntityFieldDescription& field_description : type_description) {
-    fields.emplace(field_description.key, field_description.default_value);
+    fields.insert(std::make_pair(field_description.key, field_description.default_value));
   }
 }
 
diff -ruN src_org/lowlevel/FontResource.cpp src/lowlevel/FontResource.cpp
--- src_org/lowlevel/FontResource.cpp	2015-10-16 12:12:38.656374294 +0200
+++ src/lowlevel/FontResource.cpp	2015-10-16 12:12:46.901438575 +0200
@@ -107,7 +107,7 @@
       font.bitmap_font = nullptr;
     }
 
-    fonts.emplace(font_id, std::move(font));
+    fonts.insert(std::make_pair(font_id, std::move(font)));
   }
 
   fonts_loaded = true;
@@ -214,7 +214,7 @@
       + "': " + TTF_GetError()
   );
   OutlineFontReader reader = { std::move(rw), std::move(outline_font) };
-  outline_fonts.emplace(size, std::move(reader));
+  outline_fonts.insert(std::make_pair(size, std::move(reader)));
   return *outline_fonts.at(size).outline_font;
 }
 
diff -ruN src_org/lowlevel/Random.cpp src/lowlevel/Random.cpp
--- src_org/lowlevel/Random.cpp	2015-10-16 12:12:38.646374216 +0200
+++ src/lowlevel/Random.cpp	2015-10-16 12:12:46.901438575 +0200
@@ -75,8 +75,8 @@
   // thread, initialized once, like a static variable) rather
   // than maintaining them in the body of a class.
   //
-  thread_local std::mt19937 engine(std::time(nullptr));
-  thread_local std::uniform_int_distribution<int> dist{};
+  std::mt19937 engine(std::time(nullptr));
+  std::uniform_int_distribution<int> dist{};
 
   // Type of the parameters of the distribution
   using param_type = std::uniform_int_distribution<int>::param_type;
diff -ruN src_org/lua/EntityApi.cpp src/lua/EntityApi.cpp
--- src_org/lua/EntityApi.cpp	2015-10-16 12:12:38.526373280 +0200
+++ src/lua/EntityApi.cpp	2015-10-16 12:12:46.906438614 +0200
@@ -65,7 +65,7 @@
   if (result.empty()) {
     for (const auto& kvp : EntityTypeInfo::get_entity_type_names()) {
       std::string internal_type_name = std::string("sol.") + kvp.second;
-      result.emplace(kvp.first, internal_type_name);
+      result.insert(std::make_pair(kvp.first, internal_type_name));
     }
   }
 
diff -ruN src_org/MapData.cpp src/MapData.cpp
--- src_org/MapData.cpp	2015-10-16 12:12:38.146370317 +0200
+++ src/MapData.cpp	2015-10-16 12:12:46.906438614 +0200
@@ -614,7 +614,7 @@
       return false;
     }
 
-    named_entities.emplace(entity.get_name(), index);
+    named_entities.insert(std::make_pair(entity.get_name(), index));
   }
 
   if (!dynamic) {
diff -ruN src_org/QuestResources.cpp src/QuestResources.cpp
--- src_org/QuestResources.cpp	2015-10-16 12:12:37.941368719 +0200
+++ src/QuestResources.cpp	2015-10-16 12:12:46.906438614 +0200
@@ -77,7 +77,7 @@
 QuestResources::QuestResources() {
 
   for (size_t i = 0 ; i < resource_type_names.size(); ++i) {
-    resource_maps.emplace(static_cast<ResourceType>(i), ResourceMap());
+    resource_maps.insert(std::make_pair(static_cast<ResourceType>(i), ResourceMap()));
   }
 }
 
@@ -140,7 +140,7 @@
     const std::string& description
 ) {
   ResourceMap& resource = get_elements(resource_type);
-  auto result = resource.emplace(id, description);
+  auto result = resource.insert(std::make_pair(id, description));
   return result.second;
 }
 
diff -ruN src_org/SpriteAnimationSet.cpp src/SpriteAnimationSet.cpp
--- src_org/SpriteAnimationSet.cpp	2015-10-16 12:12:38.186370629 +0200
+++ src/SpriteAnimationSet.cpp	2015-10-16 12:12:46.911438653 +0200
@@ -88,9 +88,9 @@
     directions.emplace_back(direction.get_all_frames(), direction.get_origin());
   }
 
-  animations.emplace(
+  animations.insert(std::make_pair(
     animation_name,
-    SpriteAnimation(src_image, directions, frame_delay, frame_to_loop_on)
+    SpriteAnimation(src_image, directions, frame_delay, frame_to_loop_on))
   );
 }
 
diff -ruN src_org/SpriteData.cpp src/SpriteData.cpp
--- src_org/SpriteData.cpp	2015-10-16 12:12:37.816367745 +0200
+++ src/SpriteData.cpp	2015-10-16 12:12:46.911438653 +0200
@@ -485,7 +485,7 @@
 bool SpriteData::add_animation(
     const std::string& animation_name, const SpriteAnimationData& animation)  {
 
-  const auto& result = animations.emplace(animation_name, animation);
+  const auto& result = animations.insert(std::make_pair(animation_name, animation));
   if (!result.second) {
     // Insertion failed: the name already exists.
     return false;
@@ -655,8 +655,8 @@
       LuaTools::error(l, std::string("Duplicate animation '") + animation_name);
     }
 
-    sprite->animations.emplace(animation_name,
-      SpriteAnimationData(src_image, directions, frame_delay, frame_to_loop_on)
+    sprite->animations.insert(std::make_pair(animation_name,
+      SpriteAnimationData(src_image, directions, frame_delay, frame_to_loop_on))
     );
 
     // Set the first animation as the default one.
diff -ruN src_org/StringResources.cpp src/StringResources.cpp
--- src_org/StringResources.cpp	2015-10-16 12:12:37.951368797 +0200
+++ src/StringResources.cpp	2015-10-16 12:12:46.911438653 +0200
@@ -93,7 +93,7 @@
 bool StringResources::add_string(
     const std::string& key, const std::string& string) {
 
-  const auto& result = strings.emplace(key, string);
+  const auto& result = strings.insert(std::make_pair(key, string));
   if (!result.second) {
     // Insertion failed: the id already exists.
     return false;