diff --git a/src/driver.h b/src/driver.h
--- a/src/driver.h
+++ b/src/driver.h
@@ -67,20 +67,7 @@ public:
 		name(NULL)
 	{}
 
-	/** Frees memory used for this->name
-	 */
-	virtual ~DriverFactoryBase() {
-		if (this->name == NULL) return;
-
-		/* Prefix the name with driver type to make it unique */
-		char buf[32];
-		strecpy(buf, GetDriverTypeName(type), lastof(buf));
-		strecpy(buf + 5, this->name, lastof(buf));
-
-		GetDrivers().erase(buf);
-		if (GetDrivers().empty()) delete &GetDrivers();
-		free(this->name);
-	}
+	virtual ~DriverFactoryBase();
 
 	/** Shuts down all active drivers
 	 */