--- a/src/driver.h	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/driver.h	Wed Jan 09 18:11:12 2008 +0000
@@ -6,8 +6,8 @@
 #define DRIVER_H
 
 #include "debug.h"
-#include "helpers.hpp"
-#include "string.h"
+#include "core/enum_type.hpp"
+#include "string_func.h"
 #include <string>
 #include <map>
 
@@ -79,7 +79,7 @@
 		strecpy(buf, GetDriverTypeName(type), lastof(buf));
 		strecpy(buf + 5, name, lastof(buf));
 
-#if !defined(NDEBUG)
+#if !defined(NDEBUG) || defined(WITH_ASSERT)
 		/* NDEBUG disables asserts and gives a warning: unused variable 'P' */
 		std::pair<Drivers::iterator, bool> P =
 #endif /* !NDEBUG */