diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index e39edd2132..3c52658d4f 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -16,8 +16,8 @@
  * at the top of the source tree.
  */
 
-/*! \file
- *
+/*!
+ * \file
  * \brief Adaptive ODBC CDR backend
  *
  * \author Tilghman Lesher <cdr_adaptive_odbc__v1@the-tilghman.com>
@@ -50,7 +50,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #define	CONFIG	"cdr_adaptive_odbc.conf"
 
-static char *name = "Adaptive ODBC";
+static const char name[] = "Adaptive ODBC";
 /* Optimization to reduce number of memory allocations */
 static int maxsize = 512, maxsize2 = 512;
 
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index ecf84d7685..10c4eebbdb 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -18,8 +18,8 @@
  * at the top of the source tree.
  */
 
-/*! \file
- *
+/*!
+ * \file
  * \brief Comma Separated Value CDR records.
  *
  * \author Mark Spencer <markster@digium.com>
@@ -49,7 +49,7 @@ static int usegmtime = 0;
 static int loguniqueid = 0;
 static int loguserfield = 0;
 static int loaded = 0;
-static char *config = "cdr.conf";
+static const char config[] = "cdr.conf";
 
 /* #define CSV_LOGUNIQUEID 1 */
 /* #define CSV_LOGUSERFIELD 1 */
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index 0a88f3d658..684c12b462 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -18,8 +18,8 @@
  * at the top of the source tree.
  */
 
-/*! \file
- *
+/*!
+ * \file
  * \brief Custom Comma Separated Value CDR records.
  *
  * \author Mark Spencer <markster@digium.com>
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index 49e99796a8..e9f728476d 100644
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -14,8 +14,8 @@
  * at the top of the source tree.
  */
 
-/*! \file
- *
+/*!
+ * \file
  * \brief Asterisk Call Manager CDR records.
  *
  * See also
@@ -43,7 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #define CONF_FILE	"cdr_manager.conf"
 #define CUSTOM_FIELDS_BUF_SIZE 1024
 
-static char *name = "cdr_manager";
+static const char name[] = "cdr_manager";
 
 static int enablecdr = 0;
 
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index 8af2edc20f..e0f830c2a9 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -16,8 +16,8 @@
  * at the top of the source tree.
  */
 
-/*! \file
- *
+/*!
+ * \file
  * \brief ODBC CDR Backend
  *
  * \author Brian K. West <brian@bkw.org>
@@ -37,8 +37,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <time.h>
-
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
@@ -47,8 +45,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #define DATE_FORMAT "%Y-%m-%d %T"
 
-static char *name = "ODBC";
-static char *config_file = "cdr_odbc.conf";
+static const char name[] = "ODBC";
+static const char config_file[] = "cdr_odbc.conf";
 static char *dsn = NULL, *table = NULL;
 
 enum {
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 0a684ddb0e..c3f17d40a9 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -20,8 +20,8 @@
  * at the top of the source tree.
  */
 
-/*! \file
- *
+/*!
+ * \file
  * \brief PostgreSQL CDR logger
  *
  * \author Matthew D. Hardeman <mhardemn@papersoft.com>
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index ed4d87b456..8b611c93f5 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -16,9 +16,10 @@
  * at the top of the source tree.
  */
 
-/*! \file
- *
+/*!
+ * \file
  * \brief RADIUS CDR Support
+ *
  * \author Philippe Sultan
  * \extref The Radius Client Library - http://developer.berlios.de/projects/radiusclient-ng/
  *
@@ -34,7 +35,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <time.h>
 #include <radiusclient-ng.h>
 
 #include "asterisk/channel.h"
@@ -77,9 +77,9 @@ enum {
 	RADIUS_FLAG_LOGUSERFIELD = (1 << 2)
 };
 
-static char *desc = "RADIUS CDR Backend";
-static char *name = "radius";
-static char *cdr_config = "cdr.conf";
+static const char desc[] = "RADIUS CDR Backend";
+static const char name[] = "radius";
+static const char cdr_config[] = "cdr.conf";
 
 static char radiuscfg[PATH_MAX] = "/etc/radiusclient-ng/radiusclient.conf";
 
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index 66b1d0a061..5a3a4b2ba4 100644
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -55,7 +55,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 /* When you change the DATE_FORMAT, be sure to change the CHAR(19) below to something else */
 #define DATE_FORMAT "%Y-%m-%d %T"
 
-static char *name = "sqlite";
+static const char name[] = "sqlite";
 static sqlite* db = NULL;
 
 AST_MUTEX_DEFINE_STATIC(sqlite_lock);
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index 3071cb98a1..495890ffc5 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -16,8 +16,8 @@
  * at the top of the source tree.
  */
 
-/*! \file
- *
+/*!
+ * \file
  * \brief Custom SQLite3 CDR records.
  *
  * \author Adapted by Alejandro Rios <alejandro.rios@avatar.com.co> and
diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c
index 9455c7b240..cc132cbf6c 100644
--- a/cdr/cdr_syslog.c
+++ b/cdr/cdr_syslog.c
@@ -16,9 +16,10 @@
  * at the top of the source tree.
  */
 
-/*! \file cdr_syslog.c
- *
+/*!
+ * \file
  * \brief syslog CDR logger
+ *
  * \author Sean Bright <sean@malleable.com>
  *
  * See also
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index ca19940d8c..4fcccae62c 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -24,7 +24,8 @@
  * \ingroup cdr_drivers
  */
 
-/*! \verbatim
+/*!
+ * \verbatim
  *
  * Table Structure for `cdr`
  *
@@ -74,8 +75,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #define DATE_FORMAT "%Y/%m/%d %T"
 
-static char *name = "FreeTDS (MSSQL)";
-static char *config = "cdr_tds.conf";
+static const char name[] = "FreeTDS (MSSQL)";
+static const char config[] = "cdr_tds.conf";
 
 struct cdr_tds_config {
 	AST_DECLARE_STRING_FIELDS(