Merge branch 'save_ext' into jgrpp

# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp

src/core/container_func.hpp

@@ -9,6 +9,11 @@
 
 /** @file container_func.hpp Functions related to use of containers. */
 
+#ifndef CONTAINER_FUNC_HPP
+#define CONTAINER_FUNC_HPP
+
+#include <iterator>
+
 template <typename C, typename UP> unsigned int container_unordered_remove_if (C &container, UP predicate) {
 	unsigned int removecount = 0;
 	for (auto it = container.begin(); it != container.end();) {
@@ -33,3 +38,5 @@ template <typename C, typename V> unsigned int container_unordered_remove(C &con
 		return v == value;
 	});
 }
+
+#endif /* CONTAINER_FUNC_HPP */

src/core/dyn_arena_alloc.hpp

@@ -9,6 +9,9 @@
 
 /** @file dyn_arena_alloc.hpp Dynamic chunk-size arena allocator. */
 
+#ifndef DYN_ARENA_ALLOC_HPP
+#define DYN_ARENA_ALLOC_HPP
+
 #include <vector>
 
 /**
@@ -95,3 +98,5 @@ class DynUniformArenaAllocator {
 		this->items_per_chunk = items_per_chunk;
 	}
 };
+
+#endif /* DYN_ARENA_ALLOC_HPP */