diff -u asterisk/apps/app_voicemail2.c myasterisk/apps/app_voicemail2.c
--- asterisk/apps/app_voicemail2.c	2003-10-22 05:12:17.000000000 +0200
+++ myasterisk/apps/app_voicemail2.c	2003-10-27 22:24:12.608455080 +0100
@@ -38,8 +38,7 @@
 
 /* we define USESQLVM when we have MySQL or POSTGRES */
 #ifdef USEMYSQLVM
-#include <mysql.h>
-#include "mysql-vm-routines.h"
+#include <mysql/mysql.h>
 #define USESQLVM 1
 #endif
 
@@ -199,6 +198,10 @@
 	
 }
 
+#ifdef USEMYSQLVM
+#include "mysql-vm-routines.h"
+#endif
+
 #ifdef USEPOSTGRESVM
 
 PGconn *dbhandler;
Common subdirectories: asterisk/apps/CVS and myasterisk/apps/CVS
diff -u asterisk/apps/Makefile myasterisk/apps/Makefile
--- asterisk/apps/Makefile	2003-10-26 19:50:49.000000000 +0100
+++ myasterisk/apps/Makefile	2003-10-27 22:25:00.228215776 +0100
@@ -42,6 +42,10 @@
 CFLAGS+=-DUSEPOSTGRESVM
 endif
 
+ifeq ($(USE_MYSQL_VM_INTERFACE),1)
+CFLAGS+=-DUSEMYSQLVM
+endif
+
 all: $(APPS)
 
 clean: