diff --git a/LICENSE b/LICENSE
index a52b16e4064dfee29faf4b9fdbb058237b418fce..aa2ebac66bc389d6e231d9f7b47097bc08a5452e 100755
--- a/LICENSE
+++ b/LICENSE
@@ -3,7 +3,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
diff --git a/Makefile b/Makefile
index adfabcfc4cfcaee511bfebd991901eff70f0d6b6..a0fe9b02045cde1ad8773a8bbdea6179d1598105 100755
--- a/Makefile
+++ b/Makefile
@@ -323,7 +323,7 @@ OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
 	cdr.o tdd.o acl.o rtp.o manager.o asterisk.o \
 	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
 	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
-	utils.o config_old.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
+	utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
 	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o
 
 ifeq (${OSARCH},Darwin)
diff --git a/config.c b/config.c
index 46234ce830595221be8d5a87dc38129180880913..bdd550825351a8e0abf303c99bfea34779ad19f5 100755
--- a/config.c
+++ b/config.c
@@ -394,7 +394,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
 				} else if (!strcasecmp(cur, "+")) {
 					*cat = category_get(cfg, catname, 1);
 					if (!*cat) {
-						ast_destroy(cfg);
+						ast_config_destroy(cfg);
 						if (newcat)
 							ast_category_destroy(newcat);
 						ast_log(LOG_WARNING, "Category addition requested, but category '%s' does not exist, line %d of %s\n", catname, lineno, configfile);
diff --git a/config_old.c b/config_old.c
deleted file mode 100755
index d4f366794f31f36dc25eae0d8f267704b4edbf6f..0000000000000000000000000000000000000000
--- a/config_old.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Asterisk -- A telephony toolkit for Linux.
- *
- * Configuration File Parser (Deprecated APIs)
- * 
- * Copyright (C) 2005, Digium, Inc.
- *
- * Mark Spencer <markster@digium.com>
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
-#include "asterisk/config.h"
-#include "asterisk/logger.h"
-
-struct ast_config *ast_load(char *configfile)
-{
-	static int warning = 0;
-
-	if (!warning) {
-		ast_log(LOG_WARNING, "ast_load is deprecated, use ast_config_load instead!\n");
-		warning = 1;
-	}
-
-	return ast_config_load(configfile);
-}
-
-void ast_destroy(struct ast_config *config)
-{
-	static int warning = 0;
-
-	if (!warning) {
-		ast_log(LOG_WARNING, "ast_destroy is deprecated, use ast_config_destroy instead!\n");
-		warning = 1;
-	}
-	ast_config_destroy(config);
-}
-
-void ast_destroy_realtime(struct ast_variable *var)
-{
-	static int warning = 0;
-
-	if (!warning) {
-		ast_log(LOG_WARNING, "ast_destroy_realtime is deprecated, use ast_variables_destroy instead!\n");
-		warning = 1;
-	}
-	ast_variables_destroy(var);
-}
-
-struct ast_config *ast_internal_load(const char *configfile, struct ast_config *cfg)
-{
-	static int warning = 0;
-
-	if (!warning) {
-		ast_log(LOG_WARNING, "ast_internal_load is deprecated, use ast_config_internal_load instead!\n");
-		warning = 1;
-	}
-
-	return ast_internal_load(configfile, cfg);
-}
-
diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h
index 45553d51d484e08c99922e00959efc0dff6c6881..5079b7dbb644e8ec3a9d32754cb2665be00346af 100755
--- a/include/asterisk/acl.h
+++ b/include/asterisk/acl.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Access Control of various sorts
- * 
- * Copyright (C) 1999-2005, Digium, Inc.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Access Control of various sorts
  */
 
 #ifndef _ASTERISK_ACL_H
@@ -44,4 +53,4 @@ extern int ast_str2tos(const char *value, int *tos);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_ACL_H */
diff --git a/include/asterisk/adsi.h b/include/asterisk/adsi.h
index b56b8db2f97fc15b5cbf33ba81cabbeba524961b..c0fb360199f2f5ce1c9649edded9a3f33762856e 100755
--- a/include/asterisk/adsi.h
+++ b/include/asterisk/adsi.h
@@ -1,21 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * ADSI Support (built upon Caller*ID) 
- * 
- * Copyright (C) 1999, Mark Spencer
- *
- * Mark Spencer <markster@linux-support.net>
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * Mark Spencer <markster@digium.com>
  *
- * Includes code and algorithms from the Zapata library.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * ADSI Support (built upon Caller*ID) 
  */
 
-#ifndef _ADSI_H
-#define _ADSI_H
+#ifndef _ASTERISK_ADSI_H
+#define _ASTERISK_ADSI_H
+
 #include "asterisk/callerid.h"
 
 /* ADSI Message types */
@@ -342,4 +349,5 @@ extern int adsi_input_control(unsigned char *buf, int page, int line, int displa
  *
  */
 extern int adsi_input_format(unsigned char *buf, int num, int dir, int wrap, unsigned char *format1, unsigned char *format2);
-#endif
+
+#endif /* _ASTERISK_ADSI_H */
diff --git a/include/asterisk/aes.h b/include/asterisk/aes.h
index 2e4c4b21949391aa4c015e655fd72096a12305aa..c77ea8f98e14b339d49f01cb40dbf35aa4724e4c 100755
--- a/include/asterisk/aes.h
+++ b/include/asterisk/aes.h
@@ -1,3 +1,13 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ */
+
 /*
  ---------------------------------------------------------------------------
  Copyright (c) 2003, Dr Brian Gladman <brg@gladman.me.uk>, Worcester, UK.
diff --git a/include/asterisk/agi.h b/include/asterisk/agi.h
index a488dfb261d139010180a5f9a89cf410e46b06e3..0d3fcc6595c4c3e0e8944910e347f379a7db3fbd 100755
--- a/include/asterisk/agi.h
+++ b/include/asterisk/agi.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * AGI Extension interfaces
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * AGI Extension interfaces
  */
 
 #ifndef _ASTERISK_AGI_H
@@ -44,6 +53,4 @@ void agi_unregister(agi_command *cmd);
 }
 #endif
 
-
-
-#endif
+#endif /* _ASTERISK_AGI_H */
diff --git a/include/asterisk/alaw.h b/include/asterisk/alaw.h
index 9a0664d0e91dad29971c0506e39fc602591a5349..b2e0fae19ebf64c7f4d161e421d0f6f059372052 100755
--- a/include/asterisk/alaw.h
+++ b/include/asterisk/alaw.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * A-Law to Signed linear conversion
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * A-Law to Signed linear conversion
  */
 
 #ifndef _ASTERISK_ALAW_H
@@ -31,4 +40,4 @@ extern short __ast_alaw[256];
 #define AST_LIN2A(a) (__ast_lin2a[((unsigned short)(a)) >> 3])
 #define AST_ALAW(a) (__ast_alaw[(int)(a)])
 
-#endif
+#endif /* _ASTERISK_ALAW_H */
diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index 79fee29059c03f2227e3682e7031fe592a503f5b..6f0f0d955d8cc6723e982ca5e0ecbc140cf39b5d 100755
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -1,15 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Application convenience functions, designed to give consistent
- * look and feel to asterisk apps.
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Application convenience functions, designed to give consistent
+ * look and feel to Asterisk apps.
  */
 
 #ifndef _ASTERISK_APP_H
@@ -197,4 +205,4 @@ int ast_record_review(struct ast_channel *chan, const char *playfile, const char
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_APP_H */
diff --git a/include/asterisk/ast_expr.h b/include/asterisk/ast_expr.h
index c5981a2044f9b5dc5d0781c07e2f84a44d6b48e2..bc03313095f464735474bae20f3255b5898a1094 100755
--- a/include/asterisk/ast_expr.h
+++ b/include/asterisk/ast_expr.h
@@ -1,12 +1,19 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
  */
 
 #ifndef _ASTERISK_EXPR_H
diff --git a/include/asterisk/astdb.h b/include/asterisk/astdb.h
index 547ffedea81ed6121d814472adeeb393ad73b930..c1012cda78dcab4048f6f2af178673ec0129110f 100755
--- a/include/asterisk/astdb.h
+++ b/include/asterisk/astdb.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Persistant data storage (akin to *doze registry)
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Persistant data storage (akin to *doze registry)
  */
 
 #ifndef _ASTERISK_ASTDB_H
@@ -40,4 +49,4 @@ void ast_db_freetree(struct ast_db_entry *entry);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_ASTDB_H */
diff --git a/include/asterisk/astmm.h b/include/asterisk/astmm.h
index 88dd5486b35d7dc0c16f6fc4cece326d077f6878..3c86b7b9bed9f5ac512448091ef828c3818285de 100755
--- a/include/asterisk/astmm.h
+++ b/include/asterisk/astmm.h
@@ -1,19 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Asterisk debugging
- * 
- * Copyright (C) 2002, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Asterisk memory usage debugging
  */
 
 #ifndef NO_AST_MM
-#ifndef _ASTMM_H
-#define _ASTMM_H
+#ifndef _ASTERISK_ASTMM_H
+#define _ASTERISK_ASTMM_H
 
 #define __AST_DEBUG_MALLOC
 
@@ -66,5 +75,5 @@ void __ast_mm_init(void);
 
 #else
 #error "NEVER INCLUDE astmm.h DIRECTLY!!"
-#endif
+#endif /* _ASTERISK_ASTMM_H */
 #endif
diff --git a/include/asterisk/astobj.h b/include/asterisk/astobj.h
index 96876ba1808a594cf2184ad9d0cd6b17303c44fc..8e373c6c5ccaab206f3ae6252a2e0201cd735fe2 100755
--- a/include/asterisk/astobj.h
+++ b/include/asterisk/astobj.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Object Model for Asterisk
- * 
- * Copyright (C) 2004 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Object Model for Asterisk
  */
 
 #ifndef _ASTERISK_ASTOBJ_H
@@ -740,4 +749,4 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_ASTOBJ_H */
diff --git a/include/asterisk/astosp.h b/include/asterisk/astosp.h
index 977933f4ea02c486b3fefbb30d8aef6613a7ed9a..9baf3f0b4da46a9781c85791a736cba72ac584ae 100755
--- a/include/asterisk/astosp.h
+++ b/include/asterisk/astosp.h
@@ -1,18 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * OSP support
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * OSP support
  */
 
 #ifndef _ASTERISK_OSP_H
 #define _ASTERISK_OSP_H
+
 #include "asterisk/channel.h"
 #include <netinet/in.h>
 #include <time.h>
@@ -35,4 +45,4 @@ int ast_osp_terminate(int handle, int cause, time_t start, time_t duration);
 
 int ast_osp_validate(char *provider, char *token, int *handle, unsigned int *timeout, char *callerid, struct in_addr addr, char *extension);
 
-#endif
+#endif /* _ASTERISK_OSP_H */
diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h
index ce3387915794b7a6bdb5203371cb1c6adb0cb0b6..ba84a54dd632deb7bdf8fc3beddd944edafd6e3f 100755
--- a/include/asterisk/callerid.h
+++ b/include/asterisk/callerid.h
@@ -1,21 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * CallerID (and other GR30) Generation support 
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * CallerID (and other GR30) Generation support 
  * Includes code and algorithms from the Zapata library.
- *
  */
 
-#ifndef _CALLERID_H
-#define _CALLERID_H
+#ifndef _ASTERISK_CALLERID_H
+#define _ASTERISK_CALLERID_H
 
 #define MAX_CALLERID_SIZE 32000
 
@@ -271,4 +278,4 @@ static inline float callerid_getcarrier(float *cr, float *ci, int bit)
 int ast_parse_caller_presentation(const char *data);
 const char *ast_describe_caller_presentation(int data);
 
-#endif
+#endif /* _ASTERISK_CALLERID_H */
diff --git a/include/asterisk/causes.h b/include/asterisk/causes.h
index 6d23ba31e741d815f799319c1e8c75fde2109a77..7311e89cfa1a80ee0a51b321051a02c804c29bda 100755
--- a/include/asterisk/causes.h
+++ b/include/asterisk/causes.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Internal Asterisk's hangup causes
- *
- * Copyright (C) 2003, Digium
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Martin Pycko <martinp@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Internal Asterisk hangup causes
  */
 
 #ifndef _ASTERISK_CAUSES_H
@@ -70,4 +79,4 @@
 #define AST_CAUSE_NOTDEFINED 				0
 #define AST_CAUSE_NOSUCHDRIVER				AST_CAUSE_CHAN_NOT_IMPLEMENTED
 
-#endif
+#endif /* _ASTERISK_CAUSES_H */
diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h
index e42a4e690f475643316165fc4376dfaa94052fd4..6cb75e4156a9144dfd40373eed500cb1d4e6fa84 100755
--- a/include/asterisk/cdr.h
+++ b/include/asterisk/cdr.h
@@ -1,17 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Call Detail Record API 
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License.
- *
- * Includes code and algorithms from the Zapata library.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Call Detail Record API 
  */
 
 #ifndef _ASTERISK_CDR_H
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 87d29d9560a71f5e1b25f7c45c0156e021d71a2c..40f6867840550bde54fa9bb6d6f56698a4fcbcbb 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * General Asterisk channel definitions.
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * General Asterisk channel definitions.
  */
 
 #ifndef _ASTERISK_CHANNEL_H
@@ -1083,4 +1092,4 @@ extern char *ast_print_group(char *buf, int buflen, ast_group_t group);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_CHANNEL_H */
diff --git a/include/asterisk/chanvars.h b/include/asterisk/chanvars.h
index b03824c4efb31dc085d466c33fb5943425993c3c..434874ba9e04d478cc2f906885b3e9400b557dc5 100755
--- a/include/asterisk/chanvars.h
+++ b/include/asterisk/chanvars.h
@@ -1,18 +1,27 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Channel Variables
- * 
- * Copyright (C) 2002, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Channel Variables
  */
 
-#ifndef _ASTERISK_CHANVARS_INCLUDE
-#define _ASTERISK_CHANVARS_INCLUDE
+#ifndef _ASTERISK_CHANVARS_H
+#define _ASTERISK_CHANVARS_H
 
 #include "asterisk/linkedlists.h"
 
@@ -28,4 +37,4 @@ char *ast_var_name(struct ast_var_t *var);
 char *ast_var_full_name(struct ast_var_t *var);
 char *ast_var_value(struct ast_var_t *var);
 
-#endif
+#endif /* _ASTERISK_CHANVARS_H */
diff --git a/include/asterisk/cli.h b/include/asterisk/cli.h
index 993b616879c5ac21538912e9e0edcb7c6c5c5848..20a259be14027b17bc49f8100bc0172106802efe 100755
--- a/include/asterisk/cli.h
+++ b/include/asterisk/cli.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Standard Command Line Interface
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Standard Command Line Interface
  */
 
 #ifndef _ASTERISK_CLI_H
@@ -100,4 +109,4 @@ extern char **ast_cli_completion_matches(char *, char *);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_CLI_H */
diff --git a/include/asterisk/compiler.h b/include/asterisk/compiler.h
index 137e9e146b90ee217b9196bdd4206699afa965e9..3cd6220382a0ac3f347b8ca8cf79516d7977ac5d 100755
--- a/include/asterisk/compiler.h
+++ b/include/asterisk/compiler.h
@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Compiler-specific macros and other items
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2005, Digium, Inc.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Compiler-specific macros and other items
  */
 
 #ifndef _ASTERISK_COMPILER_H
diff --git a/include/asterisk/config.h b/include/asterisk/config.h
index 69bef1fe92e08de762244aed6b5dcb1c9a3eb5da..5a6e2b22de25a225103ce0dabe0a30dde6129c89 100755
--- a/include/asterisk/config.h
+++ b/include/asterisk/config.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Configuration File Parser
- * 
- * Copyright (C) 1999-2005, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Configuration File Parser
  */
 
 #ifndef _ASTERISK_CONFIG_H
@@ -36,8 +45,6 @@ struct ast_variable {
 	char stuff[0];
 };
 
-#include "asterisk/config_old.h"
-
 typedef struct ast_config *config_load_func(const char *database, const char *table, const char *configfile, struct ast_config *config);
 typedef struct ast_variable *realtime_var_get(const char *database, const char *table, va_list ap);
 typedef struct ast_config *realtime_multi_get(const char *database, const char *table, va_list ap);
@@ -197,4 +204,4 @@ struct ast_config *ast_config_internal_load(const char *configfile, struct ast_c
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_CONFIG_H */
diff --git a/include/asterisk/config_old.h b/include/asterisk/config_old.h
deleted file mode 100755
index dcde09932c65901d3bf79a7c7052ad5e20360bcd..0000000000000000000000000000000000000000
--- a/include/asterisk/config_old.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Asterisk -- A telephony toolkit for Linux.
- *
- * Configuration File Parser (Deprecated APIs)
- * 
- * Copyright (C) 1999-2005, Mark Spencer
- *
- * Mark Spencer <markster@digium.com>
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License
- */
-
-#ifndef _ASTERISK_CONFIG_OLD_H
-#define _ASTERISK_CONFIG_OLD_H
-
-/*! Load a config file */
-/*! 
- * \param configfile path of file to open.  If no preceding '/' character, path is considered relative to AST_CONFIG_DIR
- * Create a config structure from a given configuration file.
- * Returns NULL on error, or an ast_config data structure on success
- */
-struct ast_config *ast_load(char *configfile);
-
-/*! Removes a config */
-/*!
- * \param config config data structure associated with the config.
- * Free memory associated with a given config
- * Returns nothing
- */
-void ast_destroy(struct ast_config *config);
-
-/*! Free variable list */
-/*!
- * \param var the linked list of variables to free
- * This function frees a list of variables.
- */
-void ast_destroy_realtime(struct ast_variable *var);
-
-struct ast_config *ast_internal_load(const char *configfile, struct ast_config *cfg);
-
-#endif
diff --git a/include/asterisk/crypto.h b/include/asterisk/crypto.h
index a869de80aa3b2385c5556b47b86836d34990871c..69010714c7e535242c7a6b70ec7f97ece80d4850 100755
--- a/include/asterisk/crypto.h
+++ b/include/asterisk/crypto.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Provide cryptographic signature routines
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Provide cryptographic signature routines
  */
 
 #ifndef _ASTERISK_CRYPTO_H
@@ -112,4 +121,4 @@ extern int ast_decrypt_bin(unsigned char *dst, const unsigned char *src, int src
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_CRYPTO_H */
diff --git a/include/asterisk/cvsid.h b/include/asterisk/cvsid.h
deleted file mode 100755
index 4ac5b2a08ea6e1b20241a30d1f90d29899675978..0000000000000000000000000000000000000000
--- a/include/asterisk/cvsid.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Asterisk -- A telephony toolkit for Linux.
- *
- * CVSID Macro for including CVS file Id in source files.
- * 
- * Copyright (C) 2004 - 2005, William Waites
- *
- * William Waites <ww@styx.org>
- *
- * This program is free software, distributed under the following
- * terms:
- *
- *        1. Any copies of this file must retain this copyright
- *           notice intact.
- *        2. A non-exclusive, non-cancellible license is given
- *           to Digium Inc. (Linux Support Services) in order that
- *           they may license this file to third parties under terms
- *           of their choosing on the condition that if they do so
- *           they must also make this file, or any derivative of
- *           it, available under terms of the the GNU General Public
- *           License.
- *        3. If you have not recieved this file under a proprietary
- *           license from Digium or one of their licensees, or the
- *           author, it is distributed to you under terms of the GNU
- *           General Public License.
- * 
- * If you do not have a copy of the GNU GPL, which should be
- * available in the root directory of this source tree, it can
- * be found at:
- *
- *        http://www.gnu.org/licenses/gpl.html
- *           
- */
-
-/*
- * To use this macro, in the source file put the lines:
- *
- * #include "asterisk/cvsid.h"
- * #ifndef lint
- * CVSID("$Id$");
- * #endif
- *
- * You will then be able to run strings(1) on the resulting
- * binary and find out what revisions of each source file were
- * used to build it, since when checked into a CVS repository,
- * the portion of the string between the dollar signs will be
- * replaced with version information for the file.
- */
-
-#ifndef ASTERISK_CVSID_H
-#define ASTERISK_CVSID_H
-
-#ifdef __GNUC__
-#define CVSID(x) static char __cvsid[] __attribute__ ((unused)) = x
-#else
-#define CVSID(x) static char __cvsid[] = x
-#endif
-
-#endif /* ASTERISK_CVSID_H */
-
-
diff --git a/include/asterisk/devicestate.h b/include/asterisk/devicestate.h
index 771f33b513e03b76166a35bd47c08f007a791882..687e6819f9dc1e7b2b18d2c43e72b7714c16652b 100755
--- a/include/asterisk/devicestate.h
+++ b/include/asterisk/devicestate.h
@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Device state management
- * 
- * Copyright (C) 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Device state management
  */
 
 #ifndef _ASTERISK_DEVICESTATE_H
diff --git a/include/asterisk/dlfcn-compat.h b/include/asterisk/dlfcn-compat.h
index 40dfd0578246911cb391979f95f5bd4b5250a2d9..2ce827a6aca0ccac2d968e392cfd2e47b3881eb3 100755
--- a/include/asterisk/dlfcn-compat.h
+++ b/include/asterisk/dlfcn-compat.h
@@ -1,3 +1,13 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ */
+
 /*
 Copyright (c) 2002 Jorge Acereda  <jacereda@users.sourceforge.net> &
                    Peter O'Gorman <ogorman@users.sourceforge.net>
@@ -28,6 +38,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+
 #ifndef _DLFCN_H_
 #define _DLFCN_H_
 
diff --git a/include/asterisk/dns.h b/include/asterisk/dns.h
index 66715febde9c0406921e187a0b322f699efa3e3f..c1a0c3afdd338f91cda2db1f86c178bdd936a620 100755
--- a/include/asterisk/dns.h
+++ b/include/asterisk/dns.h
@@ -1,12 +1,23 @@
 /*
- * DNS support
- * 
+ * Asterisk -- An open source telephony toolkit.
+ *
  * Written by Thorsten Lockert <tholo@trollphone.org>
  *
  * Funding provided by Troll Phone Networks AS
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * DNS support
  */
 
 #ifndef _ASTERISK_DNS_H
diff --git a/include/asterisk/dnsmgr.h b/include/asterisk/dnsmgr.h
index e0841a9539ef77add41d6bddb130c83f4967f0af..c5da2d9b04eb8a9e9bd9f453b3b23c9df034a45b 100755
--- a/include/asterisk/dnsmgr.h
+++ b/include/asterisk/dnsmgr.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Background DNS update manager
- * 
- * Copyright (C) 2005, Kevin P. Fleming
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Kevin P. Fleming <kpfleming@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Background DNS update manager
  */
 
 #ifndef _ASTERISK_DNSMGR_H
diff --git a/include/asterisk/dsp.h b/include/asterisk/dsp.h
index 07e74c94724108be21543257b9b89682d7a0b1b5..c189f9d03c3dbccc8d46bb1005e185899f018004 100755
--- a/include/asterisk/dsp.h
+++ b/include/asterisk/dsp.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Convenient Signal Processing routines
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Convenient Signal Processing routines
  */
 
 #ifndef _ASTERISK_DSP_H
@@ -97,4 +106,5 @@ int ast_dsp_get_tstate(struct ast_dsp *dsp);
 
 /* Get tcount (Threshold counter) */
 int ast_dsp_get_tcount(struct ast_dsp *dsp);
-#endif
+
+#endif /* _ASTERISK_DSP_H */
diff --git a/include/asterisk/dundi.h b/include/asterisk/dundi.h
index 080b9da75c49560d3c45cda97b41336a43ee2c82..ef6b89fce76840207105bce827d8a8e9de05b73a 100755
--- a/include/asterisk/dundi.h
+++ b/include/asterisk/dundi.h
@@ -1,13 +1,25 @@
 /*
- * Distributed Universal Number Discovery (DUNDi)
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Copyright (C) 2004 - 2005, Digium Inc.
+ * Mark Spencer <markster@digium.com>
  *
- * Written by Mark Spencer <markster@digium.com>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
- * This program is Free Software distributed under the terms of
- * of the GNU General Public License.
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Distributed Universal Number Discovery (DUNDi)
  */
+
 #ifndef _ASTERISK_DUNDI_H 
 #define _ASTERISK_DUNDI_H
 
@@ -209,4 +221,5 @@ int dundi_query_eid(struct dundi_entity_info *dei, const char *dcontext, dundi_e
 
 /* Pre-cache to push upstream peers */
 int dundi_precache(const char *dcontext, const char *number);
+
 #endif /* _ASTERISK_DUNDI_H */
diff --git a/include/asterisk/endian.h b/include/asterisk/endian.h
index f5e20fb07d7fc23addc8f7cf0612ccaeef82aae4..49a5a8fdd4f2bbd0defeaa0d0d657f4ddc4095e9 100755
--- a/include/asterisk/endian.h
+++ b/include/asterisk/endian.h
@@ -1,16 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Asterisk architecture endianess compatibility definitions
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU Lesser General Public License.  Other components of
- * Asterisk are distributed under The GNU General Public License
- * only.
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Asterisk architecture endianess compatibility definitions
  */
 
 #ifndef _ASTERISK_ENDIAN_H
diff --git a/include/asterisk/enum.h b/include/asterisk/enum.h
index 15c059836f5709fc63526de76287717566bb4065..e52d1db2010d604263d9352375599c5b79c5945c 100755
--- a/include/asterisk/enum.h
+++ b/include/asterisk/enum.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * ENUM support
- * 
- * Copyright (C) 1999-2005, Digium, inc
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * ENUM support
  */
 
 /*!	\file enum.h
@@ -17,7 +26,9 @@
 
 #ifndef _ASTERISK_ENUM_H
 #define _ASTERISK_ENUM_H
+
 #include "asterisk/channel.h"
+
 /*! \brief Lookup entry in ENUM Returns 1 if found, 0 if not found, -1 on hangup 
 	\param chan	Channel
 	\param number	Number in E164 format without the + (for e164.arpa) or format 
@@ -43,4 +54,5 @@ extern int ast_get_txt(struct ast_channel *chan, const char *number, char *locat
 
 extern int ast_enum_init(void);
 extern int ast_enum_reload(void);
-#endif
+
+#endif /* _ASTERISK_ENUM_H */
diff --git a/include/asterisk/features.h b/include/asterisk/features.h
index fb6bf382dee31e0696450475ffa74f55f29a80bf..4fa3e6daaefaa92e81bfe680aef6e3b5e507ffba 100755
--- a/include/asterisk/features.h
+++ b/include/asterisk/features.h
@@ -1,17 +1,24 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Call Parking and Pickup API 
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Call Parking and Pickup API 
  * Includes code and algorithms from the Zapata library.
- *
  */
 
 #ifndef _AST_FEATURES_H
@@ -82,5 +89,4 @@ extern void ast_register_feature(struct ast_call_feature *feature);
     \param feature the ast_call_feature object which was registered before*/
 extern void ast_unregister_feature(struct ast_call_feature *feature);
 
-     
 #endif /* _AST_FEATURES_H */
diff --git a/include/asterisk/file.h b/include/asterisk/file.h
index 7c4442f6703bfcb593f04e6e746b97795d11183a..faf614b331eae1e08af049a0aa2f28127be17eac 100755
--- a/include/asterisk/file.h
+++ b/include/asterisk/file.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Generic File Format Support.
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Generic File Format Support.
  */
 
 #ifndef _ASTERISK_FILE_H
@@ -318,6 +327,4 @@ extern int ast_file_init(void);
 }
 #endif
 
-
-
-#endif
+#endif /* _ASTERISK_FILE_H */
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index 364aaa4cc55d95750405bb9ce3116cbaa52758fb..ae42b6cae6a9452c96ab1863dd80f34816f70a5a 100755
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -1,16 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Asterisk internal frame definitions.
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU Lesser General Public License.  Other components of
- * Asterisk are distributed under The GNU General Public License
- * only.
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Asterisk internal frame definitions.
  */
 
 #ifndef _ASTERISK_FRAME_H
@@ -413,5 +420,4 @@ static inline int ast_codec_interp_len(int format)
 }
 #endif
 
-
-#endif
+#endif /* _ASTERISK_FRAME_H */
diff --git a/include/asterisk/fskmodem.h b/include/asterisk/fskmodem.h
index 61a77449fd242ed2fbf79038cbabc7ad2c1287f1..5f919c0f4ba597e0db7c5b37f9ad4435b3a78be7 100755
--- a/include/asterisk/fskmodem.h
+++ b/include/asterisk/fskmodem.h
@@ -1,21 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * FSK Modem Support 
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * FSK Modem Support 
  * Includes code and algorithms from the Zapata library.
- *
  */
 
-#ifndef _FSKMODEM_H
-#define _FSKMODEM_H
+#ifndef _ASTERISK_FSKMODEM_H
+#define _ASTERISK_FSKMODEM_H
 
 #define PARITY_NONE		0
 #define PARITY_EVEN		1
@@ -60,4 +67,4 @@ typedef struct {
    He must be called with at least 80 bytes of buffer. */
 extern int fsk_serie(fsk_data *fskd, short *buffer, int *len, int *outbyte);
 
-#endif
+#endif /* _ASTERISK_FSKMODEM_H */
diff --git a/include/asterisk/image.h b/include/asterisk/image.h
index 8eb9b18819fb9a57164d68ef4194c56d7f950113..b4044c974e984689e3e96eb4117f51cd835192fa 100755
--- a/include/asterisk/image.h
+++ b/include/asterisk/image.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * General Asterisk channel definitions.
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * General Asterisk channel definitions.
  */
 
 #ifndef _ASTERISK_IMAGE_H
@@ -84,4 +93,4 @@ extern void ast_image_unregister(struct ast_imager *imgdrv);
  */
 extern int ast_image_init(void);
 
-#endif
+#endif /* _ASTERISK_IMAGE_H */
diff --git a/include/asterisk/indications.h b/include/asterisk/indications.h
index 2aec759d2af209a8cb58f46c2a0c7a64d5449200..bc5f8b4314b3561b724136f4d73c9974324d874d 100755
--- a/include/asterisk/indications.h
+++ b/include/asterisk/indications.h
@@ -1,3 +1,13 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ */
+
 /*
  * BSD Telephony Of Mexico "Tormenta" Tone Zone Support 2/22/01
  * 
@@ -74,4 +84,4 @@ void ast_playtones_stop(struct ast_channel *chan);
 extern struct tone_zone *tone_zones;
 extern ast_mutex_t tzlock;
 
-#endif
+#endif /* _ASTERISK_INDICATIONS_H */
diff --git a/include/asterisk/inline_api.h b/include/asterisk/inline_api.h
index 217f3be3f1a10cf66293920822f1ced5f4cf4062..52b5673f609d6d901a4cdae061f0498b9da71d59 100755
--- a/include/asterisk/inline_api.h
+++ b/include/asterisk/inline_api.h
@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Inlinable API function macro
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Kevin P. Fleming <kpfleming@digium.com>
  *
- * Copyright (C) 2005, Digium, Inc.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Inlinable API function macro
  */
 
 #ifndef __ASTERISK_INLINEAPI_H
diff --git a/include/asterisk/io.h b/include/asterisk/io.h
index 2973c5c69c090e7d0a45ed8bd1964b4be218eaf7..a9be35703b92db376e215411c76e5087a20c0679 100755
--- a/include/asterisk/io.h
+++ b/include/asterisk/io.h
@@ -1,18 +1,27 @@
 /*
- * Asterisk
- * 
- * Mark Spencer <markster@marko.net>
+ * Asterisk -- An open source telephony toolkit.
  *
- * Copyright(C) Mark Spencer
- * 
- * Distributed under the terms of the GNU General Public License (GPL) Version 2
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * I/O Managment (derived from Cheops-NG)
+ * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * I/O Management (derived from Cheops-NG)
  */
 
-#ifndef _IO_H
-#define _IO_H
+#ifndef _ASTERISK_IO_H
+#define _ASTERISK_IO_H
 
 #ifdef __APPLE__
 #include "asterisk/poll-compat.h"
@@ -133,5 +142,4 @@ extern int ast_get_termcols(int fd);
 }
 #endif
 
-
-#endif
+#endif /* _ASTERISK_IO_H */
diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h
index 72f19756cdf3270ab62d863aa8102e5d1b78d914..9bf3b90367b44bdb3307d2f0124361e2a9c6e11c 100755
--- a/include/asterisk/linkedlists.h
+++ b/include/asterisk/linkedlists.h
@@ -1,3 +1,22 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ * Kevin P. Fleming <kpfleming@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
 #ifndef ASTERISK_LINKEDLISTS_H
 #define ASTERISK_LINKEDLISTS_H
 
@@ -337,4 +356,4 @@ struct {								\
 	}								\
 } while (0)
 
-#endif
+#endif /* _ASTERISK_LINKEDLISTS_H */
diff --git a/include/asterisk/localtime.h b/include/asterisk/localtime.h
index d7d6bbe22cb2718d031d4d007c8c7bc530b0f148..c02dc43b6677b6edc1ecfb8d93bdb0e531b7471d 100755
--- a/include/asterisk/localtime.h
+++ b/include/asterisk/localtime.h
@@ -1,14 +1,24 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Custom localtime functions for multiple timezones
- * 
- * Copyright (C) 2003, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
+ * Mark Spencer <markster@digium.com>
  * Tilghman Lesher <tlesher@vcch.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Custom localtime functions for multiple timezones
  */
 
 #ifndef _ASTERISK_LOCALTIME_H
@@ -21,4 +31,4 @@ extern time_t ast_mktime(struct tm * const tmp, const char *zone);
 extern char *ast_ctime(const time_t * const timep);
 extern char *ast_ctime_r(const time_t * const timep, char *buf);
 
-#endif
+#endif /* _ASTERISK_LOCALTIME_H */
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index ce9a843504c5513d780c0ea481fcd35cda0c2d46..7d1ff89edeb271d2bce3b9f447b10486d714e0c3 100755
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * General Asterisk channel definitions.
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * General Asterisk channel definitions.
  */
 
 #ifndef _ASTERISK_LOCK_H
@@ -394,4 +403,4 @@ static inline int ast_mutex_trylock(ast_mutex_t *pmutex)
 #define pthread_create __use_ast_pthread_create_instead__
 #endif
 
-#endif
+#endif /* _ASTERISK_LOCK_H */
diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h
index f0530d03c0b40e303571ad018e1750047e921ed8..8751ba20c23020a025fa64954429028a8073bbe0 100755
--- a/include/asterisk/logger.h
+++ b/include/asterisk/logger.h
@@ -1,27 +1,34 @@
 /*
- * Asterisk
- * 
- * Mark Spencer <markster@digium.com>
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Copyright(C) 1999-2005, Digium, Inc.
- * 
- * Distributed under the terms of the GNU General Public License (GPL) Version 2
+ * Mark Spencer <markster@digium.com>
  *
- * Logging routines
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
- * $Revision$
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
  */
+
 /*!
   \file logger.h
   \brief Support for logging to various files, console and syslog
 	Configuration in file logger.conf
 */
 
-#ifndef _LOGGER_H
-#define _LOGGER_H
+#ifndef _ASTERISK_LOGGER_H
+#define _ASTERISK_LOGGER_H
+
 #ifdef SOLARIS
 #include <solaris-compat/compat.h>
 #endif
+
 #include <stdarg.h>
 
 #if defined(__cplusplus) || defined(c_plusplus)
@@ -117,5 +124,4 @@ extern void ast_console_puts(const char *string);
 }
 #endif
 
-
-#endif
+#endif /* _ASTERISK_LOGGER_H */
diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index 547c55cd179ec0231e3f2453ed745cd948e869f7..9d2d77455fa87b8117cce003d1bb6ae294bac97d 100755
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -1,17 +1,24 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * AMI - Asterisk Management Interface
- * External call management support 
- * 
- * Copyright (C) 1999-2005, Digium, Inc.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
- * $Revision$
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * AMI - Asterisk Management Interface
+ * External call management support 
  */
 
 #ifndef _ASTERISK_MANAGER_H
@@ -156,4 +163,5 @@ extern void astman_send_ack(struct mansession *s, struct message *m, char *msg);
 extern int init_manager(void);
 /*! Called by Asterisk initialization */
 extern int reload_manager(void);
-#endif
+
+#endif /* _ASTERISK_MANAGER_H */
diff --git a/include/asterisk/md5.h b/include/asterisk/md5.h
index 30ac30c8cf957210fe272100fa4d9022799d90b2..b2d6eb3d7c0b557e87ef8f15db9bff8c7d3b1aae 100755
--- a/include/asterisk/md5.h
+++ b/include/asterisk/md5.h
@@ -1,5 +1,23 @@
-#ifndef MD5_H
-#define MD5_H
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#ifndef _ASTERISK_MD5_H
+#define _ASTERISK_MD5_H
 
 #include <inttypes.h>
 
@@ -15,4 +33,4 @@ void MD5Update(struct MD5Context *context, unsigned char const *buf,
 void MD5Final(unsigned char digest[16], struct MD5Context *context);
 void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
 
-#endif /* !MD5_H */
+#endif /* _ASTERISK_MD5_H */
diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index 82445a40342f055347239fdbddc698a8d52d718d..df64c8f7a0ebc1c70e200ce5c0cb367e8f6e5029 100755
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -1,14 +1,19 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Module definitions
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
  */
 
 /*! \file
@@ -394,9 +399,8 @@ void ast_unregister_atexit(void (*func)(void));
 	res = localusecnt; \
 }
 	
-	
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif
+
+#endif /* _ASTERISK_MODULE_H */
diff --git a/include/asterisk/monitor.h b/include/asterisk/monitor.h
index 62439cad01459c4e114bba4c0bae5c9d80ab3111..21f30f05ca75eb10e7ae2da44463f1bd1e28c4c5 100755
--- a/include/asterisk/monitor.h
+++ b/include/asterisk/monitor.h
@@ -1,5 +1,27 @@
-#ifndef _MONITOR_H
-#define _MONITOR_H
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Channel monitoring
+ */
+
+#ifndef _ASTERISK_MONITOR_H
+#define _ASTERISK_MONITOR_H
 
 #include <stdio.h>
 
@@ -34,4 +56,4 @@ int ast_monitor_change_fname(	struct ast_channel *chan,
 
 void ast_monitor_setjoinfiles(struct ast_channel *chan, int turnon);
 
-#endif /* _MONITOR_H */
+#endif /* _ASTERISK_MONITOR_H */
diff --git a/include/asterisk/musiconhold.h b/include/asterisk/musiconhold.h
index f6b46c99dccdbd2c03cde76b671b11911e657a30..410e99e588aaee75c46573301cdde3b90f1b5de8 100755
--- a/include/asterisk/musiconhold.h
+++ b/include/asterisk/musiconhold.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Options provided by main asterisk program
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Music on hold handling
  */
 
 #ifndef _ASTERISK_MOH_H
@@ -35,6 +44,4 @@ void ast_moh_cleanup(struct ast_channel *chan);
 }
 #endif
 
-
-
-#endif
+#endif /* _ASTERISK_MOH_H */
diff --git a/include/asterisk/netsock.h b/include/asterisk/netsock.h
index 2215e3d6701cab630d90da94857ddefb7c090dd1..3e99e68757635ef90e8c12c9c550770d39a40af7 100755
--- a/include/asterisk/netsock.h
+++ b/include/asterisk/netsock.h
@@ -1,15 +1,24 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Network socket handling
- * 
- * Copyright (C) 2004-2005, Digium, Inc.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  * Kevin P. Fleming <kpfleming@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Network socket handling
  */
 
 #ifndef _ASTERISK_NETSOCK_H
@@ -54,4 +63,4 @@ void *ast_netsock_data(const struct ast_netsock *ns);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_NETSOCK_H */
diff --git a/include/asterisk/options.h b/include/asterisk/options.h
index 6e28636678262d03e085e05228cabf44e4514ecc..e00fb7696bb4107826c2b7b54a2205b0dd702f10 100755
--- a/include/asterisk/options.h
+++ b/include/asterisk/options.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Options provided by main asterisk program
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Options provided by main asterisk program
  */
 
 #ifndef _ASTERISK_OPTIONS_H
@@ -52,6 +61,4 @@ extern char debug_filename[AST_FILENAME_MAX];
 }
 #endif
 
-
-
-#endif
+#endif /* _ASTERISK_OPTIONS_H */
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index f36d971bf360862d0312c9e675ca43f42ad0bb0c..9828aa6bbc83bb50ea9f8e17fa7b0000aa16769d 100755
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
@@ -1,15 +1,25 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Core PBX routines and definitions.
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
  */
+
+/*
+ * Core PBX routines and definitions.
+ */
+
 #ifndef _ASTERISK_PBX_H
 #define _ASTERISK_PBX_H
 
@@ -642,5 +652,4 @@ void ast_hint_state_changed(const char *device);
 }
 #endif
 
-
-#endif
+#endif /* _ASTERISK_PBX_H */
diff --git a/include/asterisk/poll-compat.h b/include/asterisk/poll-compat.h
index 0ea189f4a028c1551b8b1a335bbe1c4b87784116..5f795a894131d6967ab102dbf4aa4a47764f4e29 100755
--- a/include/asterisk/poll-compat.h
+++ b/include/asterisk/poll-compat.h
@@ -1,3 +1,13 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ */
+
 /*---------------------------------------------------------------------------*\
   $Id$
 
diff --git a/include/asterisk/privacy.h b/include/asterisk/privacy.h
index 263bf452597b5941cfd4a28fdce73624d023175e..48d1518c52ecdb5b839c9506b409f74f2a7a741c 100755
--- a/include/asterisk/privacy.h
+++ b/include/asterisk/privacy.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Persistant data storage (akin to *doze registry)
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Persistant data storage (akin to *doze registry)
  */
 
 #ifndef _ASTERISK_PRIVACY_H
@@ -34,4 +43,4 @@ int ast_privacy_reset(char *dest);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_PRIVACY_H */
diff --git a/include/asterisk/res_odbc.h b/include/asterisk/res_odbc.h
index 66cc5661e193b9f3d871483a362b38b95715ce03..09c1e17ff40f66e6b7b131dcdbbfb83c0b3f23f3 100755
--- a/include/asterisk/res_odbc.h
+++ b/include/asterisk/res_odbc.h
@@ -1,24 +1,34 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 2004 - 2005, Anthony Minessale II
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ * Anthony Minessale <anthmct@yahoo.com>
  *
- * res_odbc.h <ODBC resource manager>
- * Copyright (C) 2004 - 2005 Anthony Minessale II <anthmct@yahoo.com>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * ODBC resource manager
  */
 
-#ifndef _RES_ODBC_H
-#define _RES_ODBC_H
+#ifndef _ASTERISK_RES_ODBC_H
+#define _ASTERISK_RES_ODBC_H
 
 #include <sql.h>
 #include <sqlext.h>
 #include <sqltypes.h>
 
-
-
-
 typedef struct odbc_obj odbc_obj;
 
 typedef enum { ODBC_SUCCESS=0,ODBC_FAIL=-1} odbc_status;
@@ -36,9 +46,6 @@ struct odbc_obj {
 
 };
 
-
-
-
 /* functions */
 odbc_obj *new_odbc_obj(char *name,char *dsn,char *username, char *password);
 odbc_status odbc_obj_connect(odbc_obj *obj);
@@ -50,4 +57,5 @@ int odbc_dump_fd(int fd,odbc_obj *obj);
 int odbc_sanity_check(odbc_obj *obj);
 int odbc_smart_execute(odbc_obj *obj, SQLHSTMT stmt);
 int odbc_smart_direct_execute(odbc_obj *obj, SQLHSTMT stmt, char *sql);
-#endif
+
+#endif /* _ASTERISK_RES_ODBC_H */
diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h
index 4053cd0b59f13c70ebef135e7c8e9585238eb04f..7bea249b2192a5f2f77ba17a4e86db72e50c2c83 100755
--- a/include/asterisk/rtp.h
+++ b/include/asterisk/rtp.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Real-time Transport Protocol support
- * 
- * Copyright (C) 1999-2005, Digium
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Real-time Transport Protocol support
  */
 
 #ifndef _ASTERISK_RTP_H
@@ -125,4 +134,4 @@ void ast_rtp_reload(void);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_RTP_H */
diff --git a/include/asterisk/say.h b/include/asterisk/say.h
index 436281c5db2949c67fc589b222739a07b1714546..9634271f34ca80576cd0067c7f7bc230e69eb327 100755
--- a/include/asterisk/say.h
+++ b/include/asterisk/say.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Say numbers and dates (maybe words one day too)
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Say numbers and dates (maybe words one day too)
  */
 
 #ifndef _ASTERISK_SAY_H
@@ -90,4 +99,4 @@ int ast_say_date_with_format(struct ast_channel *chan, time_t t, const char *int
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_SAY_H */
diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h
index 3b239d87eaa87b18ec27d30f8f5eb99e7fd44218..766342f0f96bb082345f06553ed105b08f67f59e 100755
--- a/include/asterisk/sched.h
+++ b/include/asterisk/sched.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk
- * 
- * Mark Spencer <markster@marko.net>
+ * Asterisk -- An open source telephony toolkit.
  *
- * Copyright(C) Mark Spencer
- * 
- * Distributed under the terms of the GNU General Public License (GPL) Version 2
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Scheduler Routines (derived from cheops)
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Scheduler Routines (derived from cheops)
  */
 
 #ifndef _ASTERISK_SCHED_H
@@ -148,6 +157,4 @@ extern long ast_sched_when(struct sched_context *con,int id);
 }
 #endif
 
-
-
-#endif
+#endif /* _ASTERISK_SCHED_H */
diff --git a/include/asterisk/slinfactory.h b/include/asterisk/slinfactory.h
index 95c655cb205ae6e3faedac51123fc03deed3c7f9..fc799000065395cc2a7ef76a319cb4fdc1813b45 100755
--- a/include/asterisk/slinfactory.h
+++ b/include/asterisk/slinfactory.h
@@ -1,15 +1,24 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * A machine to gather up arbitrary frames and convert them
- * to raw slinear on demand.
- * 
- * Copyright (C) 2005, Anthony Minessale II.
+ * Copyright (C) 2005, Anthony Minessale II
  *
  * Anthony Minessale <anthmct@yahoo.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * A machine to gather up arbitrary frames and convert them
+ * to raw slinear on demand.
  */
 
 #ifndef _ASTERISK_SLINFACTORY_H
@@ -44,4 +53,4 @@ int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t bytes);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_SLINFACTORY_H */
diff --git a/include/asterisk/srv.h b/include/asterisk/srv.h
index 5afb1b469abf9bd9bdf7e983f83ac1e913cb8250..cde9b6ac0dd7e6da3de798ac1ce489fd7730eba2 100755
--- a/include/asterisk/srv.h
+++ b/include/asterisk/srv.h
@@ -1,16 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * DNS SRV record support
- * 
- * Copyright (C) 1999-2005, Digium, Inc.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
- * 
- * $Revision$
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * DNS SRV record support
  */
 
 #ifndef _ASTERISK_SRV_H
@@ -37,4 +44,4 @@ struct ast_channel;
 */
 extern int ast_get_srv(struct ast_channel *chan, char *host, int hostlen, int *port, const char *service);
 
-#endif
+#endif /* _ASTERISK_SRV_H */
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 187c3feef11f4a921c1c41508d555d6a54df1157..651a576e95c3f857a1e30e36b6d579772b50bf50 100755
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * String manipulation functions
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2005, Digium, Inc.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * String manipulation functions
  */
 
 #ifndef _ASTERISK_STRINGS_H
diff --git a/include/asterisk/tdd.h b/include/asterisk/tdd.h
index 669b68ce95fc25c51ac488bbd5d484aa8c0eb197..2e129fed43e53617874f0ffb9c3b6cd9560cb83e 100755
--- a/include/asterisk/tdd.h
+++ b/include/asterisk/tdd.h
@@ -1,21 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * TTY/TDD Generation support 
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * TTY/TDD Generation support 
  * Includes code and algorithms from the Zapata library.
- *
  */
 
-#ifndef _TDD_H
-#define _TDD_H
+#ifndef _ASTERISK_TDD_H
+#define _ASTERISK_TDD_H
 
 #define	TDD_BYTES_PER_CHAR	2700
 
@@ -71,4 +78,4 @@ extern void tdd_free(struct tdd_state *tdd);
  */
 extern int ast_tdd_gen_ecdisa(unsigned char *outbuf, int len);
 
-#endif
+#endif /* _ASTERISK_TDD_H */
diff --git a/include/asterisk/term.h b/include/asterisk/term.h
index f6069db65d6d70ea7aae487aeb6257c9c749094a..fc0dab66917b4161d93f91b39c3583e709dac1be 100755
--- a/include/asterisk/term.h
+++ b/include/asterisk/term.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Handy terminal functions for vt* terms
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Handy terminal functions for vt* terms
  */
 
 #ifndef _ASTERISK_TERM_H
@@ -62,4 +71,4 @@ extern char *term_quit(void);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_TERM_H */
diff --git a/include/asterisk/time.h b/include/asterisk/time.h
index dbdfb446adc37dedef030aef49fb269ebefce778..45fdb46eddc40e3bf6ee668a9e67db02f946d34c 100755
--- a/include/asterisk/time.h
+++ b/include/asterisk/time.h
@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Time-related functions and macros
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2004 - 2005, Digium, Inc.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Time-related functions and macros
  */
 
 #ifndef _ASTERISK_TIME_H
diff --git a/include/asterisk/transcap.h b/include/asterisk/transcap.h
index 1a77dd1ec85557430d69132731d1ceda76b2dbe1..0187a738198e59b0d5ae573623c85130cbecacd1 100755
--- a/include/asterisk/transcap.h
+++ b/include/asterisk/transcap.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * General Asterisk channel definitions.
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Matthew Fredrickson <creslin@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * General Asterisk channel definitions.
  */
 
 #ifndef _ASTERISK_TRANSCAP_H
diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h
index 507682ab5249eb5972a55a9629d358cfd2e3849d..aea3996e5679ae9b9157b28b8dffe31d065ea6d6 100755
--- a/include/asterisk/translate.h
+++ b/include/asterisk/translate.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Translate via the use of pseudo channels
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Translate via the use of pseudo channels
  */
 
 #ifndef _ASTERISK_TRANSLATE_H
@@ -108,4 +117,4 @@ extern struct ast_frame *ast_translate(struct ast_trans_pvt *tr, struct ast_fram
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_TRANSLATE_H */
diff --git a/include/asterisk/ulaw.h b/include/asterisk/ulaw.h
index 027d3df6a73a77059af1227a7437cfc02c653fcc..58c1cb9d431212551724c977123e7a9747359a6e 100755
--- a/include/asterisk/ulaw.h
+++ b/include/asterisk/ulaw.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * u-Law to Signed linear conversion
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * u-Law to Signed linear conversion
  */
 
 #ifndef _ASTERISK_ULAW_H
@@ -31,4 +40,4 @@ extern short __ast_mulaw[256];
 #define AST_LIN2MU(a) (__ast_lin2mu[((unsigned short)(a)) >> 2])
 #define AST_MULAW(a) (__ast_mulaw[(a)])
 
-#endif
+#endif /* _ASTERISK_ULAW_H */
diff --git a/include/asterisk/unaligned.h b/include/asterisk/unaligned.h
index 80d38af322fb91d076a27c754bd169048ee18121..f05369c75a717a96fab2f82fd8ca9c57118c5484 100755
--- a/include/asterisk/unaligned.h
+++ b/include/asterisk/unaligned.h
@@ -1,16 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Handle unaligned data access
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU Lesser General Public License.  Other components of
- * Asterisk are distributed under The GNU General Public License
- * only.
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Handle unaligned data access
  */
 
 #ifndef _ASTERISK_UNALIGNED_H
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 83d9e2185fb8b053c02c5c079b71483716b27582..6d42b7a1c66ab4fb67522096c7d17c6959a9c76e 100755
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Utility functions
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2004 - 2005, Digium, Inc.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Utility functions
  */
 
 #ifndef _ASTERISK_UTILS_H
diff --git a/include/asterisk/vmodem.h b/include/asterisk/vmodem.h
index 1711f4c181847637063831cf6aec239216cd61cf..1ea57c6d622c26b0461178e60ccdc39ed6151e39 100755
--- a/include/asterisk/vmodem.h
+++ b/include/asterisk/vmodem.h
@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Voice Modem Definitions
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Voice Modem Definitions
  */
 
 #ifndef _ASTERISK_VMODEM_H
@@ -171,4 +180,5 @@ extern struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state);
 /*! Trim string of trailing stuff */
 /*! Trim off trailing mess */
 extern void ast_modem_trim(char *s);
-#endif
+
+#endif /* _ASTERISK_VMODEM_H */