diff --git a/source/glest_game/ai/cartographer.h b/source/glest_game/ai/cartographer.h
index a0833392..392e1a22 100644
--- a/source/glest_game/ai/cartographer.h
+++ b/source/glest_game/ai/cartographer.h
@@ -16,6 +16,7 @@
 #include "influence_map.h"
 #include "annotated_map.h"
 #include "node_map.h"
+#include "cluster_map.h"
 
 #include "world.h"
 #include "config.h"
diff --git a/source/glest_game/facilities/pos_iterator.h b/source/glest_game/facilities/pos_iterator.h
index 45c6a490..975c0ef4 100644
--- a/source/glest_game/facilities/pos_iterator.h
+++ b/source/glest_game/facilities/pos_iterator.h
@@ -13,7 +13,7 @@
 #define _GLEST_GAME_UTIL_POSITERATOR_H_
 
 #include <cassert>
-
+#include <stdexcept>
 #include "math_util.h"
 
 namespace Glest { namespace Util {
diff --git a/source/glest_game/type_instances/unit.h b/source/glest_game/type_instances/unit.h
index 75c26875..4d1d9228 100644
--- a/source/glest_game/type_instances/unit.h
+++ b/source/glest_game/type_instances/unit.h
@@ -128,7 +128,7 @@ public:
 #endif
 	int getBlockCount() const { return blockCount; }
 
-	std::string UnitPath::toString() const;
+	std::string toString() const;
 };
 
 class WaypointPath : public list<Vec2i> {