--- cdr/cdr_sqlite3.c	(svn)
+++ cdr/cdr_sqlite3.c	(working copy)
@@ -31,6 +31,10 @@
  * \ingroup cdr_drivers
  */
 
+/*** MODULEINFO
+	<depend>sqlite3</depend>
+ ***/
+
 #include <sys/types.h>
 
 #include <unistd.h>
@@ -164,12 +168,12 @@
 	return result;
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return desc;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	if (sqlite3_db)
 		sqlite3_close(sqlite3_db);
@@ -177,7 +181,7 @@
 	return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	char database_file[PATH_MAX];
 	int result;
@@ -219,17 +223,10 @@
 	return 0;
 }
 
-int reload(void)
+static const char *key(void)
 {
-	return 0;
+	return ASTERISK_GPL_KEY;
 }
 
-int usecount(void)
-{
-	return 0;
-}
+STD_MOD(MOD_0, NULL, NULL, NULL);
 
-const char *key()
-{
-	return ASTERISK_GPL_KEY;
-}
--- cdr/Makefile	(svn)
+++ cdr/Makefile	(working copy)
@@ -84,6 +84,9 @@
 	$(CC) $(SOLINK) -o $@ $< $(SQLITE_LIB)
 
 cdr_sqlite3.so: cdr_sqlite3.o
+	$(CC) $(SOLINK) -o $@ $< $(SQLITE3_LIB)
+
+cdr_sqlite3.so: cdr_sqlite3.o
 	$(CC) $(SOLINK) -o $@ ${CFLAGS} $<  -lsqlite3 $(MLFLAGS)
 
 cdr_radius.so: cdr_radius.o
@@ -92,6 +95,9 @@
 cdr_sqlite.o: cdr_sqlite.c
 	$(CC) -c -o $@ $(CFLAGS) $(SQLITE_INCLUDE) $<
 
+cdr_sqlite3.o: cdr_sqlite3.c
+	$(CC) -c -o $@ $(CFLAGS) $(SQLITE3_INCLUDE) $<
+
 cdr_radius.so: cdr_radius.o
 	$(CC) $(SOLINK) -o $@ $< $(RADIUSCLIENT_LIB)
 
--- makeopts.in	(svn)
+++ makeopts.in	(working copy)
@@ -77,6 +77,9 @@
 SQLITE_LIB=@SQLITE_LIB@
 SQLITE_INCLUDE=@SQLITE_INCLUDE@
 
+SQLITE3_LIB=@SQLITE3_LIB@
+SQLITE3_INCLUDE=@SQLITE3_INCLUDE@
+
 TDS_LIB=@FREETDS_LIB@
 TDS_INCLUDE=@FREETDS_INCLUDE@
 
--- configure.ac	(svn)
+++ configure.ac	(working copy)
@@ -207,6 +207,7 @@
 AST_EXT_LIB([radiusclient-ng], [rc_read_config], [radiusclient-ng.h], [RADIUSCLIENT], [Radius Client])
 AST_EXT_LIB([speex], [speex_encode], [speex/speex.h], [SPEEX], [Speex], [-lm])
 AST_EXT_LIB([sqlite], [sqlite_exec], [sqlite.h], [SQLITE], [SQLite])
+AST_EXT_LIB([sqlite3], [sqlite3_exec], [sqlite3.h], [SQLITE3], [SQLite3])
 AST_EXT_LIB([ssl], [ssl2_connect], [openssl/ssl.h], [OPENSSL], [OpenSSL], [-lcrypto])
 AST_EXT_LIB([tds], [tds_version], [tds.h], [FREETDS], [FreeTDS])
 AST_EXT_LIB([termcap], [tgetent], [], [TERMCAP], [Termcap])