3 files changed, 33 insertions, 10 deletions
diff --git a/src/blitter/factory.hpp b/src/blitter/factory.hpp
index 928b78547..b33c9e5a9 100644
--- a/src/blitter/factory.hpp
+++ b/src/blitter/factory.hpp
@@ -8,7 +8,6 @@
 #include "base.hpp"
 #include "../debug.h"
 #include "../string_func.h"
-#include <string>
 #include <map>
 
 /**
@@ -16,8 +15,16 @@
  */
 class BlitterFactoryBase {
 private:
-	char *name;
-	typedef std::map<std::string, BlitterFactoryBase *> Blitters;
+	const char *name;
+
+	struct StringCompare {
+		bool operator () (const char *a, const char *b) const
+		{
+			return strcmp(a, b) < 0;
+		}
+	};
+
+	typedef std::map<const char *, BlitterFactoryBase *, StringCompare> Blitters;
 
 	static Blitters &GetBlitters()
 	{
@@ -58,7 +65,7 @@ public:
 		if (this->name == NULL) return;
 		GetBlitters().erase(this->name);
 		if (GetBlitters().empty()) delete &GetBlitters();
-		free(this->name);
+		free((void *)this->name);
 	}
 
 	/**
diff --git a/src/driver.cpp b/src/driver.cpp
index 63e76cffa..b042ea620 100644
--- a/src/driver.cpp
+++ b/src/driver.cpp
@@ -156,7 +156,9 @@ void DriverFactoryBase::RegisterDriver(const char *name, Driver::Type type, int
 	strecpy(buf, GetDriverTypeName(type), lastof(buf));
 	strecpy(buf + 5, name, lastof(buf));
 
-	std::pair<Drivers::iterator, bool> P = GetDrivers().insert(Drivers::value_type(buf, this));
+	const char *longname = strdup(buf);
+
+	std::pair<Drivers::iterator, bool> P = GetDrivers().insert(Drivers::value_type(longname, this));
 	assert(P.second);
 }
 
@@ -194,7 +196,14 @@ DriverFactoryBase::~DriverFactoryBase() {
 	strecpy(buf, GetDriverTypeName(type), lastof(buf));
 	strecpy(buf + 5, this->name, lastof(buf));
 
-	GetDrivers().erase(buf);
+	Drivers::iterator it = GetDrivers().find(buf);
+	assert(it != GetDrivers().end());
+
+	const char *longname = (*it).first;
+
+	GetDrivers().erase(it);
+	free((void *)longname);
+
 	if (GetDrivers().empty()) delete &GetDrivers();
-	free(this->name);
+	free((void *)this->name);
 }
diff --git a/src/driver.h b/src/driver.h
index af98e0fa5..e4d9e4627 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -8,7 +8,6 @@
 #include "debug.h"
 #include "core/enum_type.hpp"
 #include "string_func.h"
-#include <string>
 #include <map>
 
 bool GetDriverParamBool(const char * const *parm, const char *name);
@@ -37,9 +36,17 @@ DECLARE_POSTFIX_INCREMENT(Driver::Type);
 class DriverFactoryBase {
 private:
 	Driver::Type type;
-	char *name;
+	const char *name;
 	int priority;
-	typedef std::map<std::string, DriverFactoryBase *> Drivers;
+
+	struct StringCompare {
+		bool operator () (const char *a, const char *b) const
+		{
+			return strcmp(a, b) < 0;
+		}
+	};
+
+	typedef std::map<const char *, DriverFactoryBase *, StringCompare> Drivers;
 
 	static Drivers &GetDrivers()
 	{