diff --git a/action.c b/action.c
index 43cac50bc2d..4e9dc0e6f79 100644
--- a/action.c
+++ b/action.c
@@ -1,6 +1,5 @@
 
 /*
- * $Id$
  *
  * Copyright (C) 2001-2003 FhG Fokus
  *
@@ -25,34 +24,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ---------
- *  2003-02-28  scratchpad compatibility abandoned (jiri)
- *  2003-01-29  removed scratchpad (jiri)
- *  2003-03-19  fixed set* len calculation bug & simplified a little the code
- *              (should be a little faster now) (andrei)
- *              replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)
- *  2003-04-01  Added support for loose routing in forward (janakj)
- *  2003-04-12  FORCE_RPORT_T added (andrei)
- *  2003-04-22  strip_tail added (jiri)
- *  2003-10-02  added SET_ADV_ADDR_T & SET_ADV_PORT_T (andrei)
- *  2003-10-29  added FORCE_TCP_ALIAS_T (andrei)
- *  2004-11-30  added FORCE_SEND_SOCKET_T (andrei)
- *  2005-12-12  return & drop/exit differentiation (andrei)
- *  2005-12-19  select framework (mma)
- *  2006-04-12  updated *_send() calls to use a struct dest_info (andrei)
- *  2006-07-27  dns cache and dns based send address failover support (andrei)
- *  2006-12-06  on popular request last_retcode set also by module functions
- *              (andrei)
- *  2007-06-14  run_actions & do_action need a ctx or handle now, no more
- *               static vars (andrei)
- *  2008-11-18  support for variable parameter module functions (andrei)
- *  2008-12-03  use lvalues/rvalues for assignments (andrei)
- *  2008-12-17  added UDP_MTU_TRY_PROTO_T (andrei)
- *  2009-05-04  switched IF_T to rval_expr (andrei)
- *  2009-09-15  added SET_{FWD,RPL}_NO_CONNECT, SET_{FWD,RPL}_CLOSE (andrei)
- *  2010-06-01  special hack/support for fparam fixups so that they can handle
- *               variable RVEs (andrei)
  */
 
 /*!
diff --git a/atomic_ops.c b/atomic_ops.c
index e631f9faa24..200e827cea4 100644
--- a/atomic_ops.c
+++ b/atomic_ops.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2006 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -18,12 +16,7 @@
 /*
  *  atomic operations init
  */
-/* 
- * History:
- * --------
- *  2006-03-08  created by andrei
- *  2007-05-11  added lock_set support (andrei)
- */
+
 /*!
  * \file
  * \brief SIP-router core :: 
diff --git a/basex.c b/basex.c
index 472c25427a5..36595b7231e 100644
--- a/basex.c
+++ b/basex.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * convert/decode to/from ascii using various bases
  *
  * Copyright (C) 2008 iptelorg GmbH
@@ -16,15 +14,10 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-/*
+ *
  * Defines:
  *  BASE64_LOOKUP_TABLE - use small lookup tables for conversions (faster
  *                         in general)
- *
- * History:
- * --------
- *  2008-06-11  created by andrei
  */
 /*!
  * \file
diff --git a/bit_count.c b/bit_count.c
index faef43cc191..d3809c7883a 100644
--- a/bit_count.c
+++ b/bit_count.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,9 +13,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * History
- * -------
- *  2010-04-26	Initial version (Miklos)
+ */
+/*!
+ * \file 
+ * \brief SIP-router core ::
+ * \ingroup core
+ * Module: \ref core
  */
 
 #include "bit_count.h"
diff --git a/bit_scan.c b/bit_scan.c
index 24b52194225..7fd1d8eae2e 100644
--- a/bit_scan.c
+++ b/bit_scan.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2007 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,17 +13,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- *  bit scan operations, see bit_scan.h.
- */
-/* 
- * History:
- * --------
- *  2007-06-23  created by andrei
- */
+
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief SIP-router core ::  bit scan operations, see bit_scan.h.
  * \ingroup core
  * Module: \ref core
  */
diff --git a/cfg_core.c b/cfg_core.c
index f38e6281514..b5a52e2d14a 100644
--- a/cfg_core.c
+++ b/cfg_core.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2007 iptelorg GmbH
  *
  * This file is part of SIP-router, a free SIP server.
@@ -19,11 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History
- * -------
- *  2007-12-03	Initial version (Miklos)
- *  2008-01-31  added DNS resolver parameters (Miklos)
  */
+
 /** core runtime config.
  * @file cfg_core.c
  * @ingroup core
diff --git a/cfg_parser.c b/cfg_parser.c
index d764709bc2a..2065587a9be 100644
--- a/cfg_parser.c
+++ b/cfg_parser.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Standalone Configuration File Parser
  *
  * Copyright (C) 2008 iptelorg GmbH
@@ -23,7 +22,7 @@
  */
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief SIP-router core :: Standalone Configuration File Parser
  * \ingroup core
  *
  * Module: \ref core
diff --git a/core_cmd.c b/core_cmd.c
index afa4cf58add..da87cff60bc 100644
--- a/core_cmd.c
+++ b/core_cmd.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2005 iptelorg GmbH
  *
  * This file is part of SIP-router, a free SIP server.
diff --git a/counters.c b/counters.c
index 3bfe542235b..06c0c6fc26e 100644
--- a/counters.c
+++ b/counters.c
@@ -20,13 +20,6 @@
  * @ingroup: core
  */
 
-/*
- * History:
- * --------
- *  2010-08-06  initial version (andrei)
- *  2010-08-24  counters can be used (inc,add) before prefork_init (andrei)
-*/
-
 #include "counters.h"
 #include "str_hash.h"
 #include "str.h"
diff --git a/crc.c b/crc.c
index 7d63cad8cde..924e2c524d7 100644
--- a/crc.c
+++ b/crc.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  *  Crc - 32 + 16 BIT ANSI X3.66 + CCITT CRC checksum files
  *
  * Copyright (C) 2001-2003 FhG Fokus
diff --git a/daemonize.c b/daemonize.c
index f8992d7baea..5318df5abe0 100644
--- a/daemonize.c
+++ b/daemonize.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,17 +13,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * 
- * History:
- * --------
- *  2004-02-20  removed from ser main.c into its own file (andrei)
- *  2004-03-04  moved setuid/setgid in do_suid() (andrei)
- *  2004-03-25  added increase_open_fds & set_core_dump (andrei)
- *  2004-05-03  applied pgid patch from janakj
- *  2007-06-07  added mlock_pages (no swap) support (andrei)
-  *             added set_rt_prio() (andrei)
- */
+
 /*!
  * \file
  * \brief SIP-router core :: 
diff --git a/data_lump.c b/data_lump.c
index 5faee6fc9e0..e9504ec8cb0 100644
--- a/data_lump.c
+++ b/data_lump.c
@@ -1,6 +1,4 @@
-/* $Id$
- *
- *
+/*
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of SIP-router, a free SIP server.
@@ -19,19 +17,10 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * --------
- *  2003-01-19  support for duplication lump lists added (jiri)
- *  2003-03-31  added subst lumps --they expand in ip addr, port a.s.o (andrei)
- *  2003-04-01  added conditional lump support functions (andrei)
- *  2003-10-20  anchor_lump & del_lump will automatically choose the lump list
- *              based on  msg->eoh comparisons (andrei)
- *  2003-10-28  added extra checks (paranoia) for {anchor,del}_lump (andrei)
- *  2005-03-24  the type of type attribute changed to enum _hdr_types_t (janakj)
  */
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief SIP-router core :: Data lumps
  * \ingroup core
  * Module: \ref core
  */
diff --git a/data_lump_rpl.c b/data_lump_rpl.c
index c5231e5d337..82751597234 100644
--- a/data_lump_rpl.c
+++ b/data_lump_rpl.c
@@ -1,22 +1,19 @@
 /*
- * $Id$
- *
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
  *
- * For a license to use the ser software under conditions
+ * For a license to use the Kamailio software under conditions
  * other than those described here, or to purchase support for this
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -25,18 +22,10 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * 2002-02-14 : created by bogdan
- * 2003-09-11 : lump_rpl type added - LUMP_RPL_BODY & LUMP_RPL_HDR (bogdan)
- * 2003-11-11 : build_lump_rpl merged into add_lump_rpl; types -> flags ;
- *              flags LUMP_RPL_NODUP and LUMP_RPL_NOFREE added (bogdan)
- * 2006-10-16   add_lump_rpl2 added: same as the old add_lump_rpl, but
- *               returns a lump_rpl**, making a specific lump removal much
- *               more easy (andrei)
  */
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief SIP-router core :: Data lump handling
  * \ingroup core
  * Module: \ref core
  */
diff --git a/dns_cache.c b/dns_cache.c
index 2e963a8ac1f..7cd80cd1a16 100644
--- a/dns_cache.c
+++ b/dns_cache.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * resolver related functions
  *
  * Copyright (C) 2006 iptelorg GmbH
@@ -26,31 +24,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* History:
- * --------
- *  2006-07-13  created by andrei
- *  2006-10-06  port fix (andrei)
- *  2007-06-14  dns iterate through A & AAAA records fix (andrei)
- *  2007-06-15  srv rr weight based load balancing support (andrei)
- *  2007-06-16  naptr support (andrei)
- *  2008-07-18  DNS watchdog support -- can be used to inform the core
- *              that the DNS servers are down (Miklos)
- *  2008-07-25  various rpc commands to manipulate the content
- *		of the cache (Miklos)
- *  2007-07-30  DNS cache measurements added (Gergo)
- *  2007-08-17  dns_cache_del_nonexp config option is introduced (Miklos)
- *  2008-02-04  DNS cache options are adapted for the configuration
- *		framework (Miklos)
- *  2008-02-11  dns_cache_init cfg parameter is introduced (Miklos)
- *  2008-10-17  fixed srv continue with 0 hostname (when falling back to
-                  aaaa) (andrei)
- *  2009-03-30  TXT record support, more rpcs (andrei)
- *  2009-03-30  EBL record support (andrei)
- *  2009-04-01  PTR record support (andrei)
- */
+
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief SIP-router core :: DNS cache handling
  * \ingroup core
  * Module: \ref core
  */
diff --git a/dns_func.c b/dns_func.c
index da2ce7b75ac..8fe10a492a6 100644
--- a/dns_func.c
+++ b/dns_func.c
@@ -1,7 +1,5 @@
 
 /* 
- * $Id$
- * 
  * Copyright (C) 2013  mariuszbi@gmail.com
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,14 +14,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * DNS wrappers
+/*!
+ * \file 
+ * \brief SIP-router core :: DNS wrappers
+ * \ingroup core
+ * Module: \ref core
  */
-/*
- * History:
- * --------
- *  2013-03 initial version (marius)
-*/
 
 #include "dns_func.h"
 
diff --git a/dprint.c b/dprint.c
index 9bc9d93accb..be0355a7413 100644
--- a/dprint.c
+++ b/dprint.c
@@ -1,24 +1,21 @@
 /*
- * $Id$
- *
  * debug print 
  *
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
  *
- * For a license to use the ser software under conditions
+ * For a license to use the Kamailio software under conditions
  * other than those described here, or to purchase support for this
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -29,7 +26,7 @@
  */
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief SIP-router core :: Debug print
  * \ingroup core
  * Module: \ref core
  */
diff --git a/dset.c b/dset.c
index 43e28db8202..110b73336ab 100644
--- a/dset.c
+++ b/dset.c
@@ -1,13 +1,11 @@
 /*
- * $Id$
- *
  * destination set
  *
  * Copyright (C) 2001-2004 FhG FOKUS
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -17,7 +15,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
diff --git a/dst_blacklist.c b/dst_blacklist.c
index a69d2151a99..83ff356aa5f 100644
--- a/dst_blacklist.c
+++ b/dst_blacklist.c
@@ -1,13 +1,11 @@
 /*
- * $Id$
- *
  * resolver related functions
  *
  * Copyright (C) 2006 iptelorg GmbH
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -17,7 +15,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -26,20 +24,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* History:
- * --------
- *  2006-07-29  created by andrei
- *  2007-05-39  added hooks for add; more locks to reduce contention (andrei)
- *  2007-06-26  added hooks for search (andrei)
- *  2007-07-30  added dst_blacklist_del() and dst_blacklist_add_to()  (andrei)
- *  2007-07-30  dst blacklist measurements added (Gergo)
- *  2008-02-11  dns_blacklist_init cfg parameter is introduced (Miklos)
- *  2009-02-26  added dst_blacklist_su* variant (andrei)
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: resolver related functions
  * \ingroup core
  * Module: \ref core
  */
diff --git a/endianness.c b/endianness.c
index 8f621e8935a..1151739a91a 100644
--- a/endianness.c
+++ b/endianness.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2008 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,17 +13,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- *  endianness compile and runtime  tests
- * 
- * History:
- * --------
- *  2008-06-13  created by andrei
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: endianness compile and runtime  tests
  * \ingroup core
  * Module: \ref core
  */
diff --git a/error.c b/error.c
index e54c3d1eafa..c7e0176e988 100644
--- a/error.c
+++ b/error.c
@@ -1,12 +1,9 @@
 /*
- * $Id$
- *
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -16,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -25,14 +22,11 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * --------
- * 2003-04-04 phrase length corrected not to include trailer 0 (jiri)
  */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief SIP-router core :: Error handling
  * \ingroup core
  * Module: \ref core
  */
diff --git a/events.c b/events.c
index 0e1d85dfa6a..c42865ba8f1 100644
--- a/events.c
+++ b/events.c
@@ -1,9 +1,7 @@
 /**
- * $Id$
- *
  * Copyright (C) 2009 SIP-Router.org
  *
- * This file is part of Extensible SIP Router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,7 +18,7 @@
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief SIP-router core :: event handling
  * \ingroup core
  * Module: \ref core
  */
diff --git a/flags.c b/flags.c
index 883e3120cdd..5fbd71b1b7e 100644
--- a/flags.c
+++ b/flags.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,16 +22,10 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/*
- * History:
- * --------
- *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)
- *  2006-02-02  named flags support (andrei)
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: Flags
  * \ingroup core
  * Module: \ref core
  */
diff --git a/forward.c b/forward.c
index 81e39fec05c..6adef103d9e 100644
--- a/forward.c
+++ b/forward.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,41 +22,11 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * -------
- *  2001-??-??  created by andrei
- *  ????-??-??  lots of changes by a lot of people
- *  2003-01-23  support for determination of outbound interface added :
- *               get_out_socket (jiri)
- *  2003-01-24  reply to rport support added, contributed by
- *               Maxim Sobolev <sobomax@FreeBSD.org> and modified by andrei
- *  2003-02-11  removed calls to upd_send & tcp_send & replaced them with
- *               calls to msg_send (andrei)
- *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)
- *  2003-04-02  fixed get_send_socket for tcp fwd to udp (andrei)
- *  2003-04-03  added su_setport (andrei)
- *  2003-04-04  update_sock_struct_from_via now differentiates between
- *               local replies  & "normal" replies (andrei)
- *  2003-04-12  update_sock_struct_from via uses also FL_FORCE_RPORT for
- *               local replies (andrei)
- *  2003-08-21  check_self properly handles ipv6 addresses & refs   (andrei)
- *  2003-10-21  check_self updated to handle proto (andrei)
- *  2003-10-24  converted to the new socket_info lists (andrei)
- *  2004-10-10  modified check_self to use grep_sock_info (andrei)
- *  2004-11-08  added force_send_socket support in get_send_socket (andrei)
- *  2005-12-11  onsend_router support; forward_request to no longer
- *              pkg_malloc'ed (andrei)
- *  2006-04-12  forward_{request,reply} use now struct dest_info (andrei)
- *  2006-04-21  basic comp via param support (andrei)
- *  2006-07-31  forward_request can resolve destination on its own, uses the 
- *              dns cache and falls back on send error to other ips (andrei)
- *  2007-10-08  get_send_socket() will ignore force_send_socket if the forced
- *               socket is multicast (andrei)
  */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: Message forwarding
  * \ingroup core
  * Module: \ref core
  */
@@ -391,7 +359,7 @@ static struct _check_self_func {
 	struct _check_self_func *next;
 } *_check_self_func_list = NULL;
 
-/* check if _check_self_func_list is set
+/** check if _check_self_func_list is set
  * - return 1 if yes, 0 if no
  */
 int is_check_self_func_list_set(void)
@@ -399,7 +367,7 @@ int is_check_self_func_list_set(void)
 	return (_check_self_func_list)?1:0;
 }
 
-/* register a function to be called when matching for myself
+/** register a function to be called when matching for myself
  * - return 0 on success, -1 on error
  * - f must have same prototype as check_self() and return same kind of values
  */
@@ -418,7 +386,7 @@ int register_check_self_func(check_self_f f)
 	return 0;
 }
 
-/* run registered check self functions
+/** run registered check self functions
  * returns 1 if true, 0 if false
  */
 int run_check_self_func(str* host, unsigned short port, unsigned short proto)
@@ -433,7 +401,8 @@ int run_check_self_func(str* host, unsigned short port, unsigned short proto)
 	return 0;
 }
 
-/* checks if the proto: host:port is one of the address we listen on;
+/** checks if the proto: host:port is one of the address we listen on;
+ *
  * if port==0, the  port number is ignored
  * if proto==0 (PROTO_NONE) the protocol is ignored
  * returns 1 if true, 0 if false, -1 on error
@@ -453,7 +422,7 @@ int check_self(str* host, unsigned short port, unsigned short proto)
 	return 1;
 }
 
-/* checks if the proto:port is one of the ports we listen on;
+/** checks if the proto:port is one of the ports we listen on;
  * if proto==0 (PROTO_NONE) the protocol is ignored
  * returns 1 if true, 0 if false, -1 on error
  */
@@ -468,7 +437,7 @@ int check_self_port(unsigned short port, unsigned short proto)
 
 
 
-/* forwards a request to dst
+/** forwards a request to dst
  * parameters:
  *   msg       - sip msg
  *   dst       - destination name, if non-null it will be resolved and
@@ -750,7 +719,7 @@ int update_sock_struct_from_via( union sockaddr_union* to,
 
 
 
-/* removes first via & sends msg to the second
+/** removes first via & sends msg to the second
  * - mode param controls if modules sip response callbacks are executed */
 static int do_forward_reply(struct sip_msg* msg, int mode)
 {
@@ -879,13 +848,13 @@ static int do_forward_reply(struct sip_msg* msg, int mode)
 	return -1;
 }
 
-/* removes first via & sends msg to the second */
+/** removes first via & sends msg to the second */
 int forward_reply(struct sip_msg* msg)
 {
 	return do_forward_reply(msg, 0);
 }
 
-/* removes first via & sends msg to the second - no module callbacks */
+/** removes first via & sends msg to the second - no module callbacks */
 int forward_reply_nocb(struct sip_msg* msg)
 {
 	return do_forward_reply(msg, 1);
diff --git a/hash_func.c b/hash_func.c
index 88957bc562d..f75b9ca152e 100644
--- a/hash_func.c
+++ b/hash_func.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -27,7 +25,7 @@
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: Hash functions
  * \ingroup core
  * Module: \ref core
  */
diff --git a/id.c b/id.c
index 7b9dbbb2d57..ef3eca6b020 100644
--- a/id.c
+++ b/id.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2005 iptelorg GmbH
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -27,7 +25,7 @@
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: UID handling
  * \ingroup core
  * Module: \ref core
  */
@@ -42,7 +40,7 @@ static str uid_name = STR_STATIC_INIT(AVP_UID);
 static str did_name = STR_STATIC_INIT(AVP_DID);
 
 
-/*
+/**
  * Set From UID
  */
 int set_from_uid(str* uid)
@@ -63,7 +61,7 @@ int set_from_uid(str* uid)
 }
 
 
-/* Extract username attribute from authorized credentials */
+/** Extract username attribute from authorized credentials */
 static inline str* cred_user(struct sip_msg* msg)
 {
 	struct hdr_field* h;
@@ -77,7 +75,7 @@ static inline str* cred_user(struct sip_msg* msg)
 	return &cred->digest.username.user;
 }
 
-/*
+/**
  * Set From UID
  */
 int get_from_uid(str* uid, struct sip_msg* msg)
@@ -125,7 +123,8 @@ int get_from_uid(str* uid, struct sip_msg* msg)
 	}
 }
 
-
+/** Get to UID
+ */
 int get_to_uid(str* uid, struct sip_msg* msg)
 {
 	static char buf[MAX_URI_SIZE];
@@ -181,7 +180,7 @@ int get_to_uid(str* uid, struct sip_msg* msg)
 }
 
 
-/*
+/**
  * Set To UID
  */
 int set_to_uid(str* uid)
@@ -202,7 +201,7 @@ int set_to_uid(str* uid)
 }
 
 
-/*
+/**
  * Return current To domain id
  */
 int get_to_did(str* did, struct sip_msg* msg)
@@ -218,7 +217,7 @@ int get_to_did(str* did, struct sip_msg* msg)
 }
 
 
-/*
+/**
  * Return current To domain id
  */
 int get_from_did(str* did, struct sip_msg* msg)
diff --git a/io_wait.c b/io_wait.c
index 9a807004cf5..b4f262c8bb1 100644
--- a/io_wait.c
+++ b/io_wait.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2005 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,21 +13,11 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* 
- * tcp io wait common stuff used by tcp_main.c & tcp_read.c
- * (see io_wait.h)
- */
-/* 
- * History:
- * --------
- *  2005-06-15  created by andrei
- *  2005-06-26  added kqueue (andrei)
- *  2005-07-04  added /dev/poll (andrei)
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: tcp io wait common stuff used by tcp_main.c & tcp_read.c
+ * (see io_wait.h)
  * \ingroup core
  * Module: \ref core
  */
diff --git a/ip_addr.c b/ip_addr.c
index 458eaa05843..0c476c3b9c7 100644
--- a/ip_addr.c
+++ b/ip_addr.c
@@ -1,14 +1,11 @@
 /*
- * $Id$
- *
- *
  * ip address & address family related functions
  *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -18,7 +15,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -27,14 +24,8 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/*
- * History:
- * --------
- *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free
- *  2004-10-01  mk_net fixes bad network addresses now (andrei)
- */
 
-/** inernal ip addresses representation functions.
+/** Kamailio core :: internal ip addresses representation functions.
  * @file ip_addr.c
  * @ingroup core
  * Module: @ref core
diff --git a/local_timer.c b/local_timer.c
index 1673e0e0195..d81ffdd072a 100644
--- a/local_timer.c
+++ b/local_timer.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2007 iptelorg GmbH
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,19 +22,13 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* local, per process timer routines
- * WARNING: this should be used only within the same process, the timers
- *  are not multi-process safe or multi-thread safe
- *  (there are no locks)
- *
- * History:
- * --------
- *  2006-02-03  created by andrei
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: local, per process timer routines
+ * WARNING: this should be used only within the same process, the timers
+ *  are not multi-process safe or multi-thread safe
+ *  (there are no locks)
  * \ingroup core
  * Module: \ref core
  */
@@ -53,7 +45,7 @@
 
 
 
-/* init a local_timer handle
+/** init a local_timer handle
  * returns 0 on success, -1 on error */
 int init_local_timer(struct local_timer *t, ticks_t crt_ticks)
 {
@@ -83,7 +75,7 @@ void destroy_local_timer(struct local_timer* lt)
 
 
 
-/* generic add timer entry to the timer lists function (see _timer_add)
+/** generic add timer entry to the timer lists function (see _timer_add)
  * tl->expire must be set previously, delta is the difference in ticks
  * from current time to the timer desired expire (should be tl->expire-*tick)
  * If you don't know delta, you probably want to call _timer_add instead.
@@ -124,7 +116,7 @@ static inline void local_timer_redist(struct local_timer* l,
 
 
 
-/* local timer add function (no lock, not multithread or multiprocess safe,
+/** local timer add function (no lock, not multithread or multiprocess safe,
  * designed for local process use only)
  * t = current ticks
  * tl must be filled (the intial_timeout and flags must be set)
@@ -141,7 +133,7 @@ static inline int _local_timer_add(struct local_timer *h, ticks_t t,
 
 
 
-/* "public", safe timer add functions (local process use only)
+/** "public", safe timer add functions (local process use only)
  * adds a timer at delta ticks from the current time
  * returns -1 on error, 0 on success
  * WARNING: to re-add a deleted or expired timer you must call
@@ -173,7 +165,7 @@ int local_timer_add(struct local_timer* h, struct timer_ln* tl, ticks_t delta,
 
 
 
-/* safe timer delete
+/** safe timer delete
  * deletes tl and inits the list pointer to 0
  * WARNING: to be able to reuse a deleted timer you must call
  *          timer_reinit(tl) on it
@@ -199,7 +191,7 @@ void local_timer_del(struct local_timer* h, struct timer_ln* tl)
 
 
 
-/* called from timer_handle*/
+/** called from timer_handle*/
 inline static void local_timer_list_expire(struct local_timer* l, 
 											ticks_t t, struct timer_head* h)
 {
@@ -226,7 +218,7 @@ inline static void local_timer_list_expire(struct local_timer* l,
 
 
 
-/* run all the handler that expire at t ticks */
+/** run all the handler that expire at t ticks */
 static inline void local_timer_expire(struct local_timer* h, ticks_t t)
 {
 	/* trust the compiler for optimizing */
@@ -245,7 +237,7 @@ static inline void local_timer_expire(struct local_timer* h, ticks_t t)
 
 
 
-/* "main" local timer routine, should be called with a proper ticks value
+/** "main" local timer routine, should be called with a proper ticks value
  * WARNING: it should never be called twice for the same ticks value
  * (it could cause too fast expires for long timers), ticks must be also
  *  always increasing */
diff --git a/lock_ops.c b/lock_ops.c
index 3392c585700..c932a840845 100644
--- a/lock_ops.c
+++ b/lock_ops.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2007 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,18 +13,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- *  lock operations init
- */
-/* 
- * History:
- * --------
- *  2007-05-14  created by andrei
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core ::  lock operations init
  * \ingroup core
  *
  * Module: \ref core
diff --git a/lvalue.c b/lvalue.c
index 156e5067ca5..89e1f4e5a72 100644
--- a/lvalue.c
+++ b/lvalue.c
@@ -16,22 +16,11 @@
 
 /**
  * @file 
- * @brief SIP-router core :: lvalues (assignment)
+ * @brief Kamailio core :: lvalues (assignment)
  * \ingroup core
  * Module: \ref core
  */
 
-/* 
- * History:
- * --------
- *  2008-11-30  initial version (andrei)
- *  2009-04-24  delete avps after finding their new value and not before
- *               (fixed $avp=$avp)
- *              when assigning something undefined (e.g. non-existing avp),
- *              delete the lvalue (similar to perl)  (andrei)
- */
-
-
 #include "lvalue.h"
 #include "dprint.h"
 #include "route.h"
diff --git a/main.c b/main.c
index 06672765390..ec88a1f8b4b 100644
--- a/main.c
+++ b/main.c
@@ -1,16 +1,14 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of SIP-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SIP-router is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
  *
- * SIP-router is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -19,73 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * -------
- *  2002-01-29  argc/argv globalized via my_{argc|argv} (jiri)
- *  2003-01-23  mhomed added (jiri)
- *  2003-03-19  replaced all malloc/frees w/ pkg_malloc/pkg_free (andrei)
- *  2003-03-29  pkg cleaners for fifo and script callbacks introduced (jiri)
- *  2003-03-31  removed snmp part (obsolete & no place in core) (andrei)
- *  2003-04-06  child_init called in all processes (janakj)
- *  2003-04-08  init_mallocs split into init_{pkg,shm}_mallocs and
- *               init_shm_mallocs called after cmd. line parsing (andrei)
- *  2003-04-15  added tcp_disable support (andrei)
- *  2003-05-09  closelog() before openlog to force opening a new fd
- *               (needed on solaris) (andrei)
- *  2003-06-11  moved all signal handlers init. in install_sigs and moved it
- *               after daemonize (so that we won't catch anymore our own
- *               SIGCHLD generated when becoming session leader) (andrei)
- *              changed is_main default value to 1 (andrei)
- *  2003-06-28  kill_all_children is now used instead of kill(0, sig)
- *                see comment above it for explanations. (andrei)
- *  2003-06-29  replaced port_no_str snprintf w/ int2str (andrei)
- *  2003-10-10  added switch for config check (-c) (andrei)
- *  2003-10-24  converted to the new socket_info lists (andrei)
- *  2004-03-30  core dump is enabled by default
- *              added support for increasing the open files limit    (andrei)
- *  2004-04-28  sock_{user,group,uid,gid,mode} added
- *              user2uid() & user2gid() added  (andrei)
- *  2004-09-11  added timeout on children shutdown and final cleanup
- *               (if it takes more than 60s => something is definitely wrong
- *                => kill all or abort)  (andrei)
- *              force a shm_unlock before cleaning-up, in case we have a
- *               crashed childvwhich still holds the lock  (andrei)
- *  2004-12-02  removed -p, extended -l to support [proto:]address[:port],
- *               added parse_phostport, parse_proto (andrei)
- *  2005-06-16  always record the pid in pt[process_no].pid twice: once in the
- *               parent & once in the child to avoid a short window when one
- *               of them might use it "unset" (andrei)
- *  2005-07-25  use sigaction for setting the signal handlers (andrei)
- *  2006-07-13  added dns cache/failover init. (andrei)
- *  2006-10-13  added global variables stun_refresh_interval, stun_allow_stun
- *               and stun_allow_fp (vlada)
- *  2006-10-25  don't log messages from signal handlers if NO_SIG_DEBUG is
- *               defined; improved exit kill timeout (andrei)
- *              init_childs(PROC_MAIN) before starting tcp_main, to allow
- *               tcp usage for module started processes (andrei)
- * 2007-01-18  children shutdown procedure moved into shutdown_children;
- *               safer shutdown on start-up error (andrei)
- * 2007-02-09  TLS support split into tls-in-core (CORE_TLS) and generic TLS
- *             (USE_TLS)  (andrei)
- * 2007-06-07  added support for locking pages in mem. and using real time
- *              scheduling policies (andrei)
- * 2007-07-30  dst blacklist and DNS cache measurements added (Gergo)
- * 2008-08-08  sctp support (andrei)
- * 2008-08-19  -l support for mmultihomed addresses/addresses lists
- *                (e.g. -l (eth0, 1.2.3.4, foo.bar) ) (andrei)
- * 2010-04-19  added daemon_status_fd pipe to communicate the parent process
- *              with the main process in daemonize mode, so the parent process
- *              can return the proper exit status code (ibc)
- * 2010-08-19  moved the daemon status stuff to daemonize.c (andrei)
  */
 
-/** main file (init, daemonize, startup) 
+/** Kamailio core :: main file (init, daemonize, startup) 
  * @file main.c
  * @ingroup core
  * Module: core
  */
 
-/*! @defgroup core SIP-router core
+/*! @defgroup core Kamailio core
  *
  * sip router core part.
  */
diff --git a/md5utils.c b/md5utils.c
index b610cf9a462..e415eabe89d 100644
--- a/md5utils.c
+++ b/md5utils.c
@@ -23,7 +23,7 @@
 
 /*!
  * \file
- * \brief SIP-router core :: md5 hash support
+ * \brief Kamailio core :: md5 hash support
  * \ingroup core
  * Module: \ref core
  */
diff --git a/mod_fix.c b/mod_fix.c
index dc04d2fe043..46505f49700 100644
--- a/mod_fix.c
+++ b/mod_fix.c
@@ -14,15 +14,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* 
- * History:
- * --------
- *  2008-11-25  initial version (andrei)
- */
-
 /*!
  * \file
- * \brief SIP-router core :: kamailio compatible fixups
+ * \brief Kamailio core :: kamailio compatible fixups
  * \ingroup core
  * Module: \ref core
  */
diff --git a/modparam.c b/modparam.c
index 17d0642910c..f5d08afbe9f 100644
--- a/modparam.c
+++ b/modparam.c
@@ -1,12 +1,9 @@
 /*
- * $Id$
- *
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -16,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -25,17 +22,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * -------
- * 2003-03-20  regex support in modparam (janakj)
- * 2004-03-12  extra flag USE_FUNC_PARAM added to modparam type -
- *             instead of copying the param value, a func is called (bogdan)
- * 2005-07-01  PARAM_STRING & PARAM_STR support
  */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: Configuration parameters for modules (modparams)
  * \ingroup core
  * Module: \ref core
  */
diff --git a/msg_translator.c b/msg_translator.c
index 8bca35f0d17..4d506d552e9 100644
--- a/msg_translator.c
+++ b/msg_translator.c
@@ -1,12 +1,9 @@
 /*
- * $Id$
- *
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -16,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -26,48 +23,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *
- * History:
- * --------
- * 2003-01-20  bug_fix: use of return value of snprintf aligned to C99 (jiri)
- * 2003-01-23  added rport patches, contributed by
- *              Maxim Sobolev <sobomax@FreeBSD.org> and heavily modified by me
- *              (andrei)
- * 2003-01-24  added i param to via of outgoing requests (used by tcp),
- *              modified via_builder params (andrei)
- * 2003-01-27  more rport fixes (make use of new via_param->start)  (andrei)
- * 2003-01-27  next baby-step to removing ZT - PRESERVE_ZT (jiri)
- * 2003-01-29  scratchpad removed (jiri)
- * 2003-02-28  scratchpad compatibility abandoned (jiri)
- * 2003-03-01  VOICE_MAIL defs removed (jiri)
- * 2003-03-06  totags in outgoing replies bookmarked to enable
- *             ACK/200 tag matching (andrei)
- * 2003-03-18  killed the build_warning snprintf (andrei)
- * 2003-03-31  added subst lump support (andrei)
- * 2003-04-01  added opt (conditional) lump support (andrei)
- * 2003-04-02  added more subst lumps: SUBST_{SND,RCV}_ALL
- *              => ip:port;transport=proto (andrei)
- * 2003-04-12  added FL_FORCE_RPORT support (andrei)
- * 2003-04-13  updated warning builder -- fixed (andrei)
- * 2003-07-10  check_via_address knows now how to compare with ipv6 address
- *              references (e.g [::1]) (andrei)
- *             build_req_fomr_sip_req no longer adds 1 for ipv6 via parameter
- *              position calculations ([] are part of host.s now) (andrei)
- * 2003-10-02  via+lump dst address/port can be set to preset values (andrei)
- * 2003-10-08  receive_test function-alized (jiri)
- * 2003-10-20  added body_lump list (sip_msg), adjust_clen (andrei & jan)
- * 2003-11-11  type of rpl_lumps replaced by flags (bogdan)
- * 2006-04-20  build_req_from_sip_req, via_builder and lump_* functions
- *              use now struct dest_info; lumps & via comp param support
- *              (rfc3486) (andrei)
- * 2007-08-31  id_builder() and via_builder() are grouped into one function:
- *             create_via_hf() -- tm module needs them as well (Miklos)
- * 2008-12-17  build_req_from_sip_req() will now fallback to tcp, tls or sctp
- *              if packet size > udp_mtu and fallback is enabled 
- *             build_req_from_sip_req() uses now global_req_flags along
- *               msg->msg_flags  (andrei)
  *
  */
-/* Via special params:
+/** Via special params:
  * requests:
  * - if the address in via is different from the src_ip or an existing
  *   received=something is found, received=src_ip is added (and any preexisting
@@ -119,7 +77,7 @@
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: Message translations
  * \ingroup core
  * Module: \ref core
  */
diff --git a/nonsip_hooks.c b/nonsip_hooks.c
index 4690f8ca812..9e25a7f7f4c 100644
--- a/nonsip_hooks.c
+++ b/nonsip_hooks.c
@@ -1,11 +1,9 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2006 iptelorg GmbH
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,20 +22,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/*
- * non-sip callbacks, called whenever a message with protocol != SIP/2.0
- * is received (the message must have at least a sip like first line or
- * else they will be dropped before this callbacks are called
- */
-/* 
- * History:
- * --------
- *  2006-11-29  created by andrei
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: non-sip callbacks, called whenever a message with protocol != SIP/2.0
+ * is received (the message must have at least a sip like first line or
+ * else they will be dropped before this callbacks are called
+ *
  * \ingroup core
  * Module: \ref core
  */
diff --git a/pass_fd.c b/pass_fd.c
index 461bd7f28ba..f3d407bdd61 100644
--- a/pass_fd.c
+++ b/pass_fd.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,21 +22,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
- /*
-  * History:
-  * --------
-  *  2002-11-29  created by andrei
-  *  2003-02-20  added solaris support (! HAVE_MSGHDR_MSG_CONTROL) (andrei)
-  *  2003-11-03  added send_all, recv_all  and updated send/get_fd
-  *               to handle signals  (andrei)
-  *  2005-06-13  added flags to recv_all & receive_fd, to allow full blocking
-  *              or semi-nonblocking mode (andrei)
-  *  2008-04-30  added MSG_WAITALL emulation for cygwin (andrei)
-  */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: 
  * \ingroup core
  * Module: \ref core
  */
@@ -61,7 +48,7 @@
 
 
 
-/* receive all the data or returns error (handles EINTR etc.)
+/** receive all the data or returns error (handles EINTR etc.)
  * params: socket
  *         data     - buffer for the results
  *         data_len - 
@@ -141,7 +128,7 @@ int recv_all(int socket, void* data, int data_len, int flags)
 
 
 
-/* sends all data (takes care of signals) (assumes blocking fd)
+/** sends all data (takes care of signals) (assumes blocking fd)
  * returns number of bytes sent or < 0 for an error */
 int send_all(int socket, void* data, int data_len)
 {
@@ -160,7 +147,7 @@ int send_all(int socket, void* data, int data_len)
 }
 
 
-/* at least 1 byte must be sent! */
+/** at least 1 byte must be sent! */
 int send_fd(int unix_socket, void* data, int data_len, int fd)
 {
 	struct msghdr msg;
@@ -214,7 +201,7 @@ int send_fd(int unix_socket, void* data, int data_len, int fd)
 
 
 
-/* receives a fd and data_len data
+/** receives a fd and data_len data
  * params: unix_socket 
  *         data
  *         data_len
diff --git a/ppcfg.c b/ppcfg.c
index 63549ac8cda..5d98fc0f1dd 100644
--- a/ppcfg.c
+++ b/ppcfg.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com)
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,8 +13,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * ppcfg.c - config preprocessor directives
+
+/*!
+ * \file
+ * \brief Kamailio core :: ppcfg.c - config preprocessor directives
+ * \ingroup core
+ * Module: \ref core
  */
 
 #include <stdio.h>
diff --git a/proxy.c b/proxy.c
index 98343c87a7c..259f7adf030 100644
--- a/proxy.c
+++ b/proxy.c
@@ -1,14 +1,12 @@
 /*
- * $Id$
- *
  * proxy list & assoc. functions
  *
  *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -18,7 +16,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -27,16 +25,10 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
- /*
-  * History:
-  * -------
-  *  2003-02-13  all *proxy functions are now proto aware (andrei)
-  *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)
-  */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: proxy list & assoc. functions
  * \ingroup core
  * Module: \ref core
  */
diff --git a/pt.c b/pt.c
index bec1c4efdbe..2c6525041e6 100644
--- a/pt.c
+++ b/pt.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Process Table
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -17,17 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * History:
- * --------
- *  2006-06-14	added process table in shared mem (dragos)
- *  2006-09-20	added profile support (-DPROFILING) (hscholz)
- *  2006-10-25	sanity check before allowing forking w/ tcp support (is_main
- *               & tcp not started yet); set is_main=0 in childs (andrei)
- *  2007-07-04	added register_fds() and get_max_open_fds(() (andrei)
- *  2010-08-19	use daemon_status_on_fork_cleanup() (andrei)
- */
-/** internal fork functions and process table.
+/** Kamailio Core :: internal fork functions and process table.
  * @file: pt.c
  * @ingroup core
  */
diff --git a/pv_core.c b/pv_core.c
index 80020ab89ec..c50de35df41 100644
--- a/pv_core.c
+++ b/pv_core.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2009 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,16 +13,13 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * pv_core.c - pvars needed in the core, e.g. $?, $retcode
- *
- * Note: in general please avoid adding pvars directly to the core, unless
- * absolutely necessary (use/create a new module instead).
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core ::  pv_core.c - pvars needed in the core, e.g. $?, $retcode
+ *
+ * \note Note: in general please avoid adding pvars directly to the core, unless
+ * absolutely necessary (use/create a new module instead).
  * \ingroup core
  * Module: \ref core
  */
@@ -45,7 +40,7 @@ static pv_export_t core_pvs[] = {
 };
 
 
-/* ugly hack to get the return code, needed because the PVs do not know (yet)
+/** ugly hack to get the return code, needed because the PVs do not know (yet)
    about the script context */
 extern int _last_returned_code;
 
diff --git a/pvapi.c b/pvapi.c
index 981d85cf8fd..710b460b8ee 100644
--- a/pvapi.c
+++ b/pvapi.c
@@ -1,14 +1,14 @@
 /*
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of SIP-Router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SIP-Router is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
  *
- * SIP-Router is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -20,7 +20,7 @@
 
 /*!
  * \file
- * \brief SIP-router core :: PV API specification
+ * \brief Kamailio core :: PV API specification
  * \ingroup core
  * Module: \ref core
  */
diff --git a/qvalue.c b/qvalue.c
index 25460ac1448..bac7fd351b5 100644
--- a/qvalue.c
+++ b/qvalue.c
@@ -1,13 +1,11 @@
 /*
- * $Id$
- *
  * Handling of the q value
  *
  * Copyright (C) 2004 FhG FOKUS
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -17,7 +15,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -26,14 +24,11 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History
- * ------
- * 2004-04-25 created (janakj)
  */
 
 /*!
  * \file
- * \brief SIP-router core ::  Handling of the q value
+ * \brief Kamailio core ::  Handling of the q value
  * \ingroup core
  * Module: \ref core
  */
diff --git a/raw_listener.c b/raw_listener.c
index 5ff9e3140b4..ec9c44776f9 100644
--- a/raw_listener.c
+++ b/raw_listener.c
@@ -13,16 +13,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/** raw socket udp listen functions.
+
+/** Kamailio core :: raw socket udp listen functions.
  *  @file raw_listener.c
  *  @ingroup core
  *  Module: @ref core
  */
-/*
- * History:
- * --------
- *  2010-06-09  intial version (from older code) andrei
- */
 
 #ifdef USE_RAW_SOCKS
 
diff --git a/raw_sock.c b/raw_sock.c
index 1d18e5ab55b..397f3fba12d 100644
--- a/raw_sock.c
+++ b/raw_sock.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- *
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,18 +13,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/** raw socket functions.
+
+/** Kamailio core :: raw socket functions.
  *  @file raw_sock.c
  *  @ingroup core
  *  Module: @ref core
  */
-/* 
- * History:
- * --------
- *  2010-06-07  initial version (from older code) andrei
- *  2010-06-15  IP_HDRINCL raw socket support, including on-send
- *               fragmentation (andrei)
- */
 
 #ifdef USE_RAW_SOCKS
 
diff --git a/re.c b/re.c
index e1fe37dccd6..ba28e6cecb5 100644
--- a/re.c
+++ b/re.c
@@ -1,13 +1,11 @@
 /* 
- * $Id$
- *
  * regexp and regexp substitutions implementations
  * 
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -17,7 +15,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -26,16 +24,11 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- * History:
- * --------
- *   2003-08-04  created by andrei
- *   2004-11-12  minor api extension, added *count (andrei)
  */
 
 /*!
  * \file
- * \brief SIP-router core ::  regexp and regexp substitutions implementations
+ * \brief Kamailio core ::  regexp and regexp substitutions implementations
  * \ingroup core
  * Module: \ref core
  */
diff --git a/receive.c b/receive.c
index 05a23e22020..20bedc22152 100644
--- a/receive.c
+++ b/receive.c
@@ -1,11 +1,9 @@
 /* 
- *$Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,25 +22,11 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ---------
- * 2003-02-28 scratchpad compatibility abandoned (jiri)
- * 2003-01-29 transport-independent message zero-termination in
- *            receive_msg (jiri)
- * 2003-02-07 undoed jiri's zero term. changes (they break tcp) (andrei)
- * 2003-02-10 moved zero-term in the calling functions (udp_receive &
- *            tcp_read_req)
- * 2003-08-13 fixed exec_pre_cb returning 0 (backported from stable) (andrei)
- * 2004-02-06 added user preferences support - destroy_avps() (bogdan)
- * 2004-04-30 exec_pre_cb is called after basic sanity checks (at least one
- *            via present & parsed ok)  (andrei)
- * 2004-08-23 avp core changed - destroy_avp-> reset_avps (bogdan)
- * 2006-11-29 nonsip_msg hooks called for non-sip msg (e.g HTTP) (andrei)
  */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: 
  * \ingroup core
  * Module: \ref core
  */
@@ -96,7 +80,8 @@ unsigned int inc_msg_no(void)
 }
 
 
-/* WARNING: buf must be 0 terminated (buf[len]=0) or some things might 
+/** Receive message
+ *  WARNING: buf must be 0 terminated (buf[len]=0) or some things might 
  * break (e.g.: modules/textops)
  */
 int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) 
diff --git a/resolve.c b/resolve.c
index c9f0977ccc2..e0b1f93b583 100644
--- a/resolve.c
+++ b/resolve.c
@@ -1,11 +1,9 @@
-/* $Id$*/
 /*
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,34 +22,10 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/*
- * History:
- * -------
- *  2003-02-13  added proto to sip_resolvehost, for SRV lookups (andrei)
- *  2003-07-03  default port value set according to proto (andrei)
- *  2005-07-11  added resolv_init (timeouts a.s.o) (andrei)
- *  2006-04-13  added sip_hostport2su()  (andrei)
- *  2006-07-13  rdata structures put on diet (andrei)
- *  2006-07-17  rdata contains now also the record name (andrei)
- *  2006-08-18  get_record can append also the additional records to the
- *               returned list (andrei)
- *  2007-06-15  naptr support (andrei)
- *  2007-10-10  short name resolution using search list supported (mma)
- *              set dns_use_search_list=1 (default on)
- *              new option dns_search_full_match (default on) controls
- *              whether rest of the name is matched against search list
- *              or blindly accepted (better performance but exploitable)
- *  2008-01-31  resolver options use the configuration framework, and the
- *               resolver is reinitialized when the options change (Miklos)
- *  2008-08-12  sctp preference support for NAPTR queries (andrei)
- *  2009-03-30  TXT record support (andrei)
- *  2009-03-31  EBL record support (andrei)
- *  2009-04-01  PTR record support (andrei)
- */ 
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: DNS resolver
  * \ingroup core
  * Module: \ref core
  */
@@ -171,7 +145,7 @@ static int stat_init(void)
 	return -1;
 }
 
-/* init. the resolver
+/** init. the resolver
  * params: retr_time  - time before retransmitting (must be >0)
  *         retr_no    - retransmissions number
  *         servers_no - how many dns servers will be used
@@ -205,7 +179,7 @@ static int _resolv_init(void)
 	return 0;
 }
 
-/* wrapper function to initialize the resolver at startup */
+/** wrapper function to initialize the resolver at startup */
 int resolv_init(void)
 {
 	int res = -1;
@@ -219,7 +193,7 @@ int resolv_init(void)
 	return res;
 }
 
-/* wrapper function to reinitialize the resolver
+/** wrapper function to reinitialize the resolver
  * This function must be called by each child process whenever
  * a resolver option changes
  */
@@ -233,7 +207,7 @@ void resolv_reinit(str *gname, str *name)
 	LM_DBG("DNS resolver has been reinitialized\n");
 }
 
-/* fixup function for dns_reinit variable
+/** fixup function for dns_reinit variable
  * (resets the variable to 0)
  */
 int dns_reinit_fixup(void *handle, str *gname, str *name, void **val)
@@ -242,7 +216,7 @@ int dns_reinit_fixup(void *handle, str *gname, str *name, void **val)
 	return 0;
 }
 
-/* wrapper function to recalculate the naptr and srv protocol preferences */
+/** wrapper function to recalculate the naptr and srv protocol preferences */
 void reinit_proto_prefs(str *gname, str *name)
 {
 #ifdef USE_NAPTR
@@ -251,8 +225,8 @@ void reinit_proto_prefs(str *gname, str *name)
 	init_srv_proto_prefs();
 }
 
-/* fixup function for dns_try_ipv6
- * verifies that SER really listens on an ipv6 interface
+/** fixup function for dns_try_ipv6
+ * verifies that Kamailio really listens on an ipv6 interface
  */
 int dns_try_ipv6_fixup(void *handle, str *gname, str *name, void **val)
 {
@@ -264,7 +238,7 @@ int dns_try_ipv6_fixup(void *handle, str *gname, str *name, void **val)
 	return 0;
 }
 
- /*  skips over a domain name in a dns message
+/**  skips over a domain name in a dns message
  *  (it can be  a sequence of labels ending in \0, a pointer or
  *   a sequence of labels ending in a pointer -- see rfc1035
  *   returns pointer after the domain name or null on error*/
@@ -290,13 +264,14 @@ unsigned char* dns_skipname(unsigned char* p, unsigned char* end)
 
 
 
-/* parses the srv record into a srv_rdata structure
+/** parses the srv record into a srv_rdata structure
  *   msg   - pointer to the dns message
  *   end   - pointer to the end of the message
  *   eor   - pointer to the end of the record/rdata
  *   rdata - pointer  to the rdata part of the srv answer
- * returns 0 on error, or a dyn. alloc'ed srv_rdata structure */
-/* SRV rdata format:
+ * returns 0 on error, or a dyn. alloc'ed srv_rdata structure 
+ *
+ * SRV rdata format:
  *            111111
  *  0123456789012345
  * +----------------+
@@ -354,12 +329,13 @@ struct srv_rdata* dns_srv_parser( unsigned char* msg, unsigned char* end,
 }
 
 
-/* parses the naptr record into a naptr_rdata structure
+/** parses the naptr record into a naptr_rdata structure
  *   msg   - pointer to the dns message
  *   end   - pointer to the end of the message
  *   eor   - pointer to the end of the record/rdata
  *   rdata - pointer  to the rdata part of the naptr answer
  * returns 0 on error, or a dyn. alloc'ed naptr_rdata structure */
+
 /* NAPTR rdata format:
  *            111111
  *  0123456789012345
@@ -451,7 +427,7 @@ struct naptr_rdata* dns_naptr_parser( unsigned char* msg, unsigned char* end,
 
 
 
-/* parses a CNAME record into a cname_rdata structure */
+/** parses a CNAME record into a cname_rdata structure */
 struct cname_rdata* dns_cname_parser( unsigned char* msg, unsigned char* end,
 									  unsigned char* rdata)
 {
@@ -482,7 +458,7 @@ struct cname_rdata* dns_cname_parser( unsigned char* msg, unsigned char* end,
 
 
 
-/* parses an A record rdata into an a_rdata structure
+/** parses an A record rdata into an a_rdata structure
  * returns 0 on error or a dyn. alloc'ed a_rdata struct
  */
 struct a_rdata* dns_a_parser(unsigned char* rdata, unsigned char* eor)
@@ -503,7 +479,7 @@ struct a_rdata* dns_a_parser(unsigned char* rdata, unsigned char* eor)
 
 
 
-/* parses an AAAA (ipv6) record rdata into an aaaa_rdata structure
+/** parses an AAAA (ipv6) record rdata into an aaaa_rdata structure
  * returns 0 on error or a dyn. alloc'ed aaaa_rdata struct */
 struct aaaa_rdata* dns_aaaa_parser(unsigned char* rdata, unsigned char* eor)
 {
@@ -654,7 +630,7 @@ static struct ebl_rdata* dns_ebl_parser(unsigned char* msg, unsigned char* end,
 
 
 
-/* parses a PTR record into a ptr_rdata structure */
+/** parses a PTR record into a ptr_rdata structure */
 struct ptr_rdata* dns_ptr_parser( unsigned char* msg, unsigned char* end,
 									  unsigned char* rdata)
 {
@@ -685,7 +661,7 @@ struct ptr_rdata* dns_ptr_parser( unsigned char* msg, unsigned char* end,
 
 
 
-/* frees completely a struct rdata list */
+/** frees completely a struct rdata list */
 void free_rdata_list(struct rdata* head)
 {
 	struct rdata* l;
@@ -701,7 +677,7 @@ void free_rdata_list(struct rdata* head)
 }
 
 #ifdef HAVE_RESOLV_RES
-/* checks whether supplied name exists in the resolver search list
+/** checks whether supplied name exists in the resolver search list
  * returns 1 if found
  *         0 if not found
  */
@@ -715,7 +691,7 @@ int match_search_list(const struct __res_state* res, char* name) {
 }
 #endif
 
-/* gets the DNS records for name:type
+/** gets the DNS records for name:type
  * returns a dyn. alloc'ed struct rdata linked list with the parsed responses
  * or 0 on error
  * see rfc1035 for the query/response format */
@@ -1049,7 +1025,7 @@ struct rdata* get_record(char* name, int type, int flags)
 #define SIPS_D2T	0x7432642b
 
 
-/* get protocol from a naptr rdata and check for validity
+/** get protocol from a naptr rdata and check for validity
  * returns > 0 (PROTO_UDP, PROTO_TCP, PROTO_SCTP or PROTO_TLS)
  *         <=0  on error 
  */
@@ -1126,7 +1102,7 @@ inline static int srv_proto_pref_score(char proto)
 
 
 
-/* returns true if we support the protocol */
+/** returns true if we support the protocol */
 int naptr_proto_supported(char proto)
 {
 	if (naptr_proto_pref_score(proto)<0)
@@ -1153,14 +1129,14 @@ int naptr_proto_supported(char proto)
 
 
 
-/* returns true if new_proto is preferred over old_proto */
+/** returns true if new_proto is preferred over old_proto */
 int naptr_proto_preferred(char new_proto, char old_proto)
 {
 	return naptr_proto_pref_score(new_proto)>naptr_proto_pref_score(old_proto);
 }
 
 
-/* choose between 2 naptr records, should take into account local
+/** choose between 2 naptr records, should take into account local
  * preferences too
  * returns 1 if the new record was selected, 0 otherwise */
 int naptr_choose (struct naptr_rdata** crt, char* crt_proto,
@@ -1196,7 +1172,7 @@ int naptr_choose (struct naptr_rdata** crt, char* crt_proto,
 
 
 
-/* internal sip srv resolver: resolves a host name trying:
+/** internal sip srv resolver: resolves a host name trying:
  * - SRV lookup if the address is not an ip *port==0. The result of the SRV
  *   query will be used for an A/AAAA lookup.
  *  - normal A/AAAA lookup (either fallback from the above or if *port!=0
@@ -1214,7 +1190,7 @@ int naptr_choose (struct naptr_rdata** crt, char* crt_proto,
  *  0 on error
  */
 struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port,
-									char* proto, int is_srv, struct rdata* ars)
+	char* proto, int is_srv, struct rdata* ars)
 {
 	struct hostent* he;
 	struct ip_addr* ip;
@@ -1369,7 +1345,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port,
 #ifdef USE_NAPTR 
 
 
-/* iterates over a naptr rr list, returning each time a "good" naptr record
+/** iterates over a naptr rr list, returning each time a "good" naptr record
  * is found.( srv type, no regex and a supported protocol)
  * params:
  *         naptr_head - naptr rr list head
@@ -1446,7 +1422,7 @@ struct rdata* naptr_sip_iterate(struct rdata* naptr_head,
 	return 0;
 }
 
-/* Prepend srv prefix according to the proto. */
+/** Prepend srv prefix according to the proto. */
 void create_srv_name(char proto, str *name, char *srv) {
 	switch (proto) {
 		case PROTO_UDP:
@@ -1529,13 +1505,12 @@ size_t create_srv_pref_list(char *proto, struct dns_srv_proto *list) {
 	return list_len;
 }
 
-/* Resolves SRV if no naptr found. 
+/** Resolves SRV if no naptr found. 
  * It reuse dns_pref values and according that resolves supported protocols. 
  * If dns_pref are equal then it use udp,tcp,tls,sctp order.
  * returns: hostent struct & *port filled with the port from the SRV record;
  *  0 on error
  */
-
 struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, char* proto)
 {
 	struct dns_srv_proto srv_proto_list[PROTO_LAST];
@@ -1603,7 +1578,7 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch
 
 } 
 
-/* internal sip naptr resolver function: resolves a host name trying:
+/** internal sip naptr resolver function: resolves a host name trying:
  * - NAPTR lookup if the address is not an ip and *proto==0 and *port==0.
  *   The result of the NAPTR query will be used for a SRV lookup
  * - SRV lookup if the address is not an ip *port==0. The result of the SRV
@@ -1681,7 +1656,7 @@ struct hostent* naptr_sip_resolvehost(str* name,  unsigned short* port,
 
 
 
-/* resolves a host name trying:
+/** resolves a host name trying:
  * - NAPTR lookup if enabled, the address is not an ip and *proto==0 and 
  *   *port==0. The result of the NAPTR query will be used for a SRV lookup
  * - SRV lookup if the address is not an ip *port==0. The result of the SRV
@@ -1711,7 +1686,7 @@ struct hostent* _sip_resolvehost(str* name, unsigned short* port, char* proto)
 }
 
 
-/* resolve host, port, proto using sip rules (e.g. use SRV if port=0 a.s.o)
+/** resolve host, port, proto using sip rules (e.g. use SRV if port=0 a.s.o)
  *  and write the result in the sockaddr_union to
  *  returns -1 on error (resolve failed), 0 on success */
 int sip_hostport2su(union sockaddr_union* su, str* name, unsigned short port,
diff --git a/route.c b/route.c
index 35c099f80a3..ef72c022944 100644
--- a/route.c
+++ b/route.c
@@ -1,14 +1,11 @@
 /*
- * $Id$
- *
  * SIP routing engine
  *
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -18,7 +15,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -27,37 +24,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * --------
- *  2003-01-28  scratchpad removed, src_port introduced (jiri)
- *  2003-02-28  scratchpad compatibility abandoned (jiri)
- *  2003-03-10  updated to the new module exports format (andrei)
- *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)
- *  2003-04-01  added dst_port, proto, af; renamed comp_port to comp_no,
- *               inlined all the comp_* functions (andrei)
- *  2003-04-05  s/reply_route/failure_route, onreply_route introduced (jiri)
- *  2003-05-23  comp_ip fixed, now it will resolve its operand and compare
- *              the ip with all the addresses (andrei)
- *  2003-10-10  added more operators support to comp_* (<,>,<=,>=,!=) (andrei)
- *  2004-10-19  added from_uri & to_uri (andrei)
- *  2005-12-12  added retcode support (anrei)
- *  2005-12-19  select framework (mma)
- *  2006-01-30  removed rec. protection from eval_expr (andrei)
- *  2006-02-06  added named route tables (andrei)
- *  2008-04-14  (expr1 != expr2) is evaluated true if at least one of
- *		the expressions does not exist (Miklos)
- *  2008-04-23  errors are treated as false during expression evaluation
- *  		unless the operator is DIFF_OP (Miklos)
- *  2008-12-03  fixups for rvalues in assignments (andrei)
- *  2009-05-04  switched IF_T to rval_expr (andrei)
- *  2010-06-01  special hack/support for fparam fixups so that they can handle
- *               variable RVEs (andrei)
- *  2010-06-18  ip comparison (comp_ip()) normalizes strings to
- *              ip/netmask  (andrei)
  */
 
 
-/** expression evaluation, route fixups and routing lists.
+/** Kamailio core :: expression evaluation, route fixups and routing lists.
  * @file route.c
  * @ingroup core
  * Module: @ref core
diff --git a/route_struct.c b/route_struct.c
index 11c11fa9fb9..98036f70880 100644
--- a/route_struct.c
+++ b/route_struct.c
@@ -1,13 +1,11 @@
 /*
- * $Id$
- *
  * route structures helping functions
  *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -17,7 +15,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -26,19 +24,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* History:
- * --------
- *  2003-01-29  src_port introduced (jiri)
- *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)
- *  2003-04-12  FORCE_RPORT_T added (andrei)
- *  2003-10-02  added SET_ADV_ADDRESS & SET_ADV_PORT (andrei)
- *  2004-02-24  added LOAD_AVP_T and AVP_TO_URI_T (bogdan)
- *  2005-12-19  select framework added SELECT_O and SELECT_ST (mma)
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief SIP-router core :: route structures helping functions
  * \ingroup core
  * Module: \ref core
  */
diff --git a/rpc_lookup.c b/rpc_lookup.c
index bbe551ca2d7..cbcd2a95f9f 100644
--- a/rpc_lookup.c
+++ b/rpc_lookup.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2009 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,18 +13,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * SER RPC lookup and register functions
- */
-/*
- * History:
- * --------
- *  2009-05-11  initial version (andrei)
-*/
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core ::  RPC lookup and register functions
  * \ingroup core
  * Module: \ref core
  */
diff --git a/rvalue.c b/rvalue.c
index 8e5ba202991..0971dc4755c 100644
--- a/rvalue.c
+++ b/rvalue.c
@@ -16,24 +16,12 @@
 
 /**
  * @file 
- * @brief SIP-router core :: rvalue expressions
+ * @brief Kamailio core :: rvalue expressions
  * @ingroup core
  * Module: \ref core
  */
 
-/* 
- * History:
- * --------
- *  2008-12-01  initial version (andrei)
- *  2009-04-24  added support for defined, strempty, strlen (andrei)
- *  2009-04-28  int and str automatic conversions: (int)undef=0,
- *               (str)undef="", (int)""=0, (int)"123"=123, (int)"abc"=0
- *              handle undef == expr, in function of the UNDEF_EQ_* defines.
- *              (andrei)
- *  2009-05-05  casts operator for int & string (andrei)
- */
-
-/* special defines:
+/** special defines:
  *
  *  UNDEF_EQ_* - how to behave when undef is on the right side of a generic
  *               compare operator
diff --git a/script_cb.c b/script_cb.c
index bf2af249220..a90c2625f68 100644
--- a/script_cb.c
+++ b/script_cb.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Script callbacks -- they add the ability to register callback
  * functions which are always called when script for request
  * processing is entered or left
@@ -8,9 +6,9 @@
  *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -20,7 +18,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -29,18 +27,15 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * --------
- *  2003-03-29  cleaning pkg allocation introduced (jiri)
- *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)
- *  2005-02-13  script callbacks devided into request and reply types (bogdan)
- *  2009-06-01  Added pre- and post-script callback support for all types
- *		of route blocks. (Miklos)
  */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: Script callbacks 
+ *
+ * Script callbacks adds the ability to register callback
+ * functions which are always called when script for request
+ * processing is entered or left
  * \ingroup core
  * Module: \ref core
  */
diff --git a/sctp_core.c b/sctp_core.c
index a27f60312fa..b529e835fd7 100644
--- a/sctp_core.c
+++ b/sctp_core.c
@@ -1,6 +1,4 @@
-/**
- * $Id$
- *
+/*
  * Copyright (C) 2013 Daniel-Constantin Mierla (asipto.com)
  *
  * This file is part of Kamailio, a free SIP server.
@@ -18,6 +16,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/*!
+ * \file
+ * \brief Kamailio core :: SCTP support
+ * \ingroup core
+ * Module: \ref core
+ */
+
 #include "sctp_core.h"
 
 /**
diff --git a/select.c b/select.c
index 3b605d58bd4..811db30fd4d 100644
--- a/select.c
+++ b/select.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2005-2006 iptelorg GmbH
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,21 +22,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * --------
- *  2005-12-19  select framework (mma)
- *  2006-01-19  multiple nested calls, IS_ALIAS -> NESTED flag renamed (mma)
- *              DIVERSION flag checked
- *  2006-02-26  don't free str when changing type STR -> DIVERSION (mma)
- *				it can't be freeable sometimes (e.g. xlog's select)
- *	2006-05-30  parse_select (mma)
- *	2006-06-02  shm_parse_select (mma)
- *
  */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: The Select framework
  * \ingroup core
  * Module: \ref core
  */
@@ -55,19 +43,19 @@
 #include "mem/mem.h"
 #include "mem/shm_mem.h"
 
-/*
+/**
  * The main parser table list placeholder
  * at startup use core table, modules can
  * add their own via register_select_table call
  */
 static select_table_t *select_list = &select_core_table;
 
-/* the level of the select call that is beeing evaluated
+/** the level of the select call that is beeing evaluated
  * by the child process
  */
 int select_level = 0;
 
-/* pointer to the SIP uri beeing processed.
+/** pointer to the SIP uri beeing processed.
  * Nested function calls can pass information to each
  * other using this pointer. Only for performace reasons.
  * (Miklos)
diff --git a/select_buf.c b/select_buf.c
index 87fc73bd006..ad1bf82d5fc 100644
--- a/select_buf.c
+++ b/select_buf.c
@@ -1,16 +1,14 @@
 /*
- * $Id$
- *
  * Copyright (C) 2005-2006 iptelorg GmbH
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
  *
- * For a license to use the ser software under conditions
+ * For a license to use the Kamailio software under conditions
  * other than those described here, or to purchase support for this
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
@@ -24,17 +22,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * --------
- *	2006-06-16  static buffer for select results (mma)
- *	            each process owns a separate space
- *	            each request starts using the buffer from the start
- *
  */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: static buffer for select results (mma)
+ *	            each process owns a separate space
+ *	            each request starts using the buffer from the start
  * \ingroup core
  * Module: \ref core
  */
diff --git a/select_core.c b/select_core.c
index 7a869d0c6b7..bb1ab20bfb0 100644
--- a/select_core.c
+++ b/select_core.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2005-2006 iptelorg GmbH
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,17 +22,11 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * --------
- *  2005-12-19  select framework, basic core functions (mma)
- *  2006-01-19  multiple nested calls, IS_ALIAS -> NESTED flag renamed (mma)
- *  2006-02-17  fixup call for select_anyhdr (mma)
- *  2007-01-26  date, identity, identity_info support added (gergo)
  */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: select framework, basic core functions (mma)
  * \ingroup core
  * Module: \ref core
  */
diff --git a/shm_init.c b/shm_init.c
index d981ae5d8cc..19e611747f3 100644
--- a/shm_init.c
+++ b/shm_init.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,14 +13,13 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * shm_init.c
+
+/*!
+ * \file
+ * \brief Kamailio core :: Shared memory initialization
+ * \ingroup core
+ * Module: \ref core
  */
-/*
- * History:
- * --------
- *  2010-01-10  initial version (andrei)
-*/
 
 #include "shm_init.h"
 #include "mem/mem.h"
diff --git a/signals.c b/signals.c
index edeef002fd9..b797bf9f19c 100644
--- a/signals.c
+++ b/signals.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
-  * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,17 +22,10 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/*
- * Handle the signals
- *
- * History:
- * --------
- *  2005-10-05  split from main.c  (andrei)
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: Handle the signals
  * \ingroup core
  * Module: \ref core
  */
diff --git a/sip_msg_clone.c b/sip_msg_clone.c
index b9c413c9dfb..e736b7b6506 100644
--- a/sip_msg_clone.c
+++ b/sip_msg_clone.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2009 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,16 +13,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * sip_msg_clone.c - moved sip msg clone-in-shm functions from tm
- */
-/*
- * History:
- * --------
- *  2009-07-22  initial version: functions moved from tm/sip_msg.c (andrei)
-*/
 
-/** SIP-router core :: sip message shared memory cloner.
+/** Kamailio core :: sip message shared memory cloner.
  * @file
  * @ingroup core
  * Module: @ref core
diff --git a/sock_ut.c b/sock_ut.c
index 3aee2cd1f3c..69764c510cf 100644
--- a/sock_ut.c
+++ b/sock_ut.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,15 +13,11 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/** various socket related functions.
+
+/** Kamailio core :: various socket related functions.
  * @file sock_ut.c
  * @ingroup: core 
  */
-/*
- * History:
- * --------
- *  2010-08-09  initial version (andrei)
-*/
 
 #include "sock_ut.h"
 
diff --git a/socket_info.c b/socket_info.c
index 443e0a4f29d..33d209df80f 100644
--- a/socket_info.c
+++ b/socket_info.c
@@ -1,13 +1,12 @@
 
-/* $Id$
- *
+/* 
  * find & manage listen addresses 
  *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -17,7 +16,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -26,26 +25,13 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/*
- * This file contains code that initializes and handles ser listen addresses
- * lists (struct socket_info). It is used mainly on startup.
- * 
- * History:
- * --------
- *  2003-10-22  created by andrei
- *  2004-10-10  added grep_sock_info (andrei)
- *  2004-11-08  added find_si (andrei)
- *  2007-08-23  added detection for INADDR_ANY types of sockets (andrei)
- *  2008-08-08  sctp support (andrei)
- *  2008-08-15  support for handling sctp multihomed sockets (andrei)
- *  2008-10-15  fixed protocol list iteration when some protocols are
- *               compile time disabled (andrei)
- */
-
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief SIP-router core :: find & manage listen addresses 
+ *
+ * This file contains code that initializes and handles Kamailio listen addresses
+ * lists (struct socket_info). It is used mainly on startup.
  * \ingroup core
  * Module: \ref core
  */
diff --git a/sr_compat.c b/sr_compat.c
index 02e05276afd..ced1aaba538 100644
--- a/sr_compat.c
+++ b/sr_compat.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2008 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,9 +13,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
 /*!
  * \file
- * \brief SIP-router core :: ser/kamailio/openser compatibility macros & vars.
+ * \brief Kamailio core :: ser/kamailio/openser compatibility macros & vars.
  * \ingroup core
  * Module: \ref core
  */
diff --git a/sr_module.c b/sr_module.c
index c7f7833d03a..945ad12a93c 100644
--- a/sr_module.c
+++ b/sr_module.c
@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -13,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -23,27 +23,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-/*
- * History:
- * --------
- *  2003-03-10  switched to new module_exports format: updated find_export,
- *               find_export_param, find_module (andrei)
- *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)
- *  2003-03-19  Support for flags in find_export (janakj)
- *  2003-03-29  cleaning pkg_mallocs introduced (jiri)
- *  2003-04-24  module version checking introduced (jiri)
- *  2004-09-19  compile flags are checked too (andrei)
- *  2005-01-07  removed find_module-overloading problems, added
- *               find_export_record
- *  2006-02-07  added fix_flag (andrei)
- *  2008-02-29  store all the reponse callbacks in their own array (andrei)
- *  2008-11-17  support dual module interface: ser & kamailio (andrei)
- *  2008-11-26  added fparam_free_contents() and fix_param_types (andrei)
- */
-
 /**
  * @file
- * @brief SIP-Router core :: modules loading, structures declarations and utilities
+ * @brief Kamailio core :: modules loading, structures declarations and utilities
  * @ingroup core
  * Module: \ref core
  */
diff --git a/stats.c b/stats.c
index 60de5e5e3fd..a32bfae4ba0 100644
--- a/stats.c
+++ b/stats.c
@@ -1,14 +1,12 @@
 /* 
- * $Id$
- *
  * Stats reporting code. It reports through SIG_USR1 and if loaded
  * through the SNMP module
  *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -18,7 +16,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -27,14 +25,13 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * -------
- * 2003-03-19: added support for route type in find_export (janakj)
  */
 
 /*!
  * \file
- * \brief SIP-router core :: Stats reporting code
+ * \brief Kamailio core :: Stats reporting code
+ * Stats reporting code. It reports through SIG_USR1 and if loaded
+ * through the SNMP module
  * \ingroup core
  * Module: \ref core
  */
diff --git a/str.c b/str.c
index a7fcf93adba..c9c4d3325ce 100644
--- a/str.c
+++ b/str.c
@@ -1,5 +1,4 @@
-/**
- * $Id$
+/*
  *
  * Copyright (C) 2014 Victor Seva <vseva@sipwise.com>
  *
@@ -17,6 +16,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+/*!
+ * \file
+ * \brief Kamailio core :: Append to str data
+ * \ingroup core
+ * Module: \ref core
+ */
 
 #include <string.h>
 #include "str.h"
diff --git a/str_list.c b/str_list.c
index 3fc6428f3b8..f63b4c91511 100644
--- a/str_list.c
+++ b/str_list.c
@@ -1,14 +1,14 @@
 /*
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of sip-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * sip-router is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
  *
- * sip-router is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -20,10 +20,11 @@
 
 /**
  * @file 
- * @brief Simple str type list and helper functions
+ * @brief Kamailio core :: Simple str type list and helper functions
+ * @ingroup core
+ * Module: @ref core
  */
 
-
 #include "str.h"
 #include "mem/mem.h"
 #include "str_list.h"
diff --git a/stun.c b/stun.c
index 15f3c6c24ea..9061e174803 100644
--- a/stun.c
+++ b/stun.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2013 Crocodile RCS Ltd
  *
  * This file is part of Kamailio, a free SIP server.
@@ -20,6 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+/*!
+ * \file
+ * \brief Kamailio core :: STUN support
+ * STUN support callback, used by the STUN module
+ * \ingroup core
+ * Module: \ref core
+ */
 
 #include "events.h"
 #include "ip_addr.h"
diff --git a/switch.c b/switch.c
index 2958a75a8eb..e732473e27b 100644
--- a/switch.c
+++ b/switch.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2009 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,19 +13,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * switch.c
- */
-/*
- * History:
- * --------
- *  2009-02-02  initial version (andrei)
- *  2009-02-19  string and RE switch support added (andrei)
-*/
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: 
  * \ingroup core
  * Module: \ref core
  */
diff --git a/tcp_main.c b/tcp_main.c
index 70409f22f95..b9a257a7caf 100644
--- a/tcp_main.c
+++ b/tcp_main.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,89 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/*
- * History:
- * --------
- *  2002-11-29  created by andrei
- *  2002-12-11  added tcp_send (andrei)
- *  2003-01-20  locking fixes, hashtables (andrei)
- *  2003-02-20  s/lock_t/gen_lock_t/ to avoid a conflict on solaris (andrei)
- *  2003-02-25  Nagle is disabled if -DDISABLE_NAGLE (andrei)
- *  2003-03-29  SO_REUSEADDR before calling bind to allow
- *              server restart, Nagle set on the (hopefuly) 
- *              correct socket (jiri)
- *  2003-03-31  always try to find the corresponding tcp listen socket for
- *               a temp. socket and store in in *->bind_address: added
- *               find_tcp_si, modified tcpconn_connect (andrei)
- *  2003-04-14  set sockopts to TOS low delay (andrei)
- *  2003-06-30  moved tcp new connect checking & handling to
- *               handle_new_connect (andrei)
- *  2003-07-09  tls_close called before closing the tcp connection (andrei)
- *  2003-10-24  converted to the new socket_info lists (andrei)
- *  2003-10-27  tcp port aliases support added (andrei)
- *  2003-11-04  always lock before manipulating refcnt; sendchild
- *              does not inc refcnt by itself anymore (andrei)
- *  2003-11-07  different unix sockets are used for fd passing
- *              to/from readers/writers (andrei)
- *  2003-11-17  handle_new_connect & tcp_connect will close the 
- *              new socket if tcpconn_new return 0 (e.g. out of mem) (andrei)
- *  2003-11-28  tcp_blocking_write & tcp_blocking_connect added (andrei)
- *  2004-11-08  dropped find_tcp_si and replaced with find_si (andrei)
- *  2005-06-07  new tcp optimized code, supports epoll (LT), sigio + real time
- *               signals, poll & select (andrei)
- *  2005-06-26  *bsd kqueue support (andrei)
- *  2005-07-04  solaris /dev/poll support (andrei)
- *  2005-07-08  tcp_max_connections, tcp_connection_lifetime, don't accept
- *               more connections if tcp_max_connections is exceeded (andrei)
- *  2005-10-21  cleanup all the open connections on exit
- *              decrement the no. of open connections on timeout too    (andrei) *  2006-01-30  queue send_fd request and execute them at the end of the
- *              poll loop  (#ifdef) (andrei)
- *              process all children requests, before attempting to send
- *              them new stuff (fixes some deadlocks) (andrei)
- *  2006-02-03  timers are run only once per s (andrei)
- *              tcp children fds can be non-blocking; send fds are queued on
- *              EAGAIN; lots of bug fixes (andrei)
- *  2006-02-06  better tcp_max_connections checks, tcp_connections_no moved to
- *              shm (andrei)
- *  2006-04-12  tcp_send() changed to use struct dest_info (andrei)
- *  2006-11-02  switched to atomic ops for refcnt, locking improvements 
- *               (andrei)
- *  2006-11-04  switched to raw ticks (to fix conversion errors which could
- *               result in inf. lifetime) (andrei)
- *  2007-07-25  tcpconn_connect can now bind the socket on a specified
- *                source addr/port (andrei)
- *  2007-07-26   tcp_send() and tcpconn_get() can now use a specified source
- *                addr./port (andrei)
- *  2007-08-23   getsockname() for INADDR_ANY(SI_IS_ANY) sockets (andrei)
- *  2007-08-27   split init_sock_opt into a lightweight init_sock_opt_accept() 
- *               used when accepting connections and init_sock_opt used for 
- *               connect/ new sockets (andrei)
- *  2007-11-22  always add the connection & clear the coresponding flags before
- *               io_watch_add-ing its fd - it's safer this way (andrei)
- *  2007-11-26  improved tcp timers: switched to local_timer (andrei)
- *  2007-11-27  added send fd cache and reader fd reuse (andrei)
- *  2007-11-28  added support for TCP_DEFER_ACCEPT, KEEPALIVE, KEEPINTVL,
- *               KEEPCNT, QUICKACK, SYNCNT, LINGER2 (andrei)
- *  2007-12-04  support for queueing write requests (andrei)
- *  2007-12-12  destroy connection asap on wbuf. timeout (andrei)
- *  2007-12-13  changed the refcnt and destroy scheme, now refcnt is 1 if
- *                linked into the hash tables (was 0) (andrei)
- *  2007-12-21  support for pending connects (connections are added to the
- *               hash immediately and writes on them are buffered) (andrei)
- *  2008-02-05  handle POLLRDHUP (if supported), POLLERR and
- *               POLLHUP (andrei)
- *              on write error check if there's still data in the socket 
- *               read buffer and process it first (andrei)
- *  2009-02-26  direct blacklist support (andrei)
- *  2009-03-20  s/wq_timeout/send_timeout ; send_timeout is now in ticks
- *              (andrei)
- *  2009-04-09  tcp ev and tcp stats macros added (andrei)
- *  2009-09-15  support for force connection reuse and close after send
- *               send flags (andrei)
- *  2010-03-23  tcp_send() split in 3 smaller functions (andrei)
- */
 
-/** tcp main/dispatcher and tcp send functions.
+/** Kamailio core: tcp main/dispatcher and tcp send functions.
  * @file tcp_main.c
  * @ingroup core
  * Module: @ref core
diff --git a/tcp_options.c b/tcp_options.c
index 5069948e34d..b23d1d11eb1 100644
--- a/tcp_options.c
+++ b/tcp_options.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2007 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,18 +13,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * tcp options
- *
- * History:
- * --------
- *  2007-11-28  created by andrei
- *  2009-03-05  use cfg framework (andrei)
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief SIP-router core :: tcp options
  * \ingroup core
  * Module: \ref core
  */
diff --git a/tcp_read.c b/tcp_read.c
index 768f17c2b7b..a159f2a4044 100644
--- a/tcp_read.c
+++ b/tcp_read.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,29 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/*
- * History:
- * --------
- * 2002-12-??  created by andrei.
- * 2003-02-10  zero term before calling receive_msg & undo afterward (andrei)
- * 2003-05-13  l: (short form of Content-Length) is now recognized (andrei)
- * 2003-07-01  tcp_read & friends take no a single tcp_connection 
- *              parameter & they set c->state to S_CONN_EOF on eof (andrei)
- * 2003-07-04  fixed tcp EOF handling (possible infinite loop) (andrei)
- * 2005-07-05  migrated to the new io_wait code (andrei)
- * 2006-02-03  use tsend_stream instead of send_all (andrei)
- * 2006-10-13  added STUN support - state machine for TCP (vlada)
- * 2007-02-20  fixed timeout calc. bug (andrei)
- * 2007-11-26  improved tcp timers: switched to local_timer (andrei)
- * 2008-02-04  optimizations: handle POLLRDHUP (if supported), detect short
- *              reads (sock. buffer empty) (andrei)
- * 2009-02-26  direct blacklist support (andrei)
- * 2009-04-09  tcp ev and tcp stats macros added (andrei)
- * 2010-05-14  split tcp_read() into tcp_read() and tcp_read_data() (andrei)
- * 2010-05-17  new RD_CONN_REPEAT_READ flag, used by the tls hooks (andrei)
- */
 
-/** tcp readers processes, tcp read and pre-parse msg. functions.
+/** Kamailio core :: tcp readers processes, tcp read and pre-parse msg. functions.
  * @file tcp_read.c
  * @ingroup core
  * Module: @ref core
diff --git a/tcp_stats.c b/tcp_stats.c
index dc2dd61fbdb..3dac06780bf 100644
--- a/tcp_stats.c
+++ b/tcp_stats.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,15 +13,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/** tcp statistics.
+
+/** Kamailio core :: TCP statistics.
  * @file tcp_stats.c
  * @ingroup:  core
+ * Module: \ref core
  */
-/*
- * History:
- * --------
- *  2010-08-08  initial version (andrei)
-*/
 
 #ifdef USE_TCP
 #include "tcp_stats.h"
diff --git a/timer.c b/timer.c
index 786db49a865..47c1c7b4be4 100644
--- a/timer.c
+++ b/timer.c
@@ -1,16 +1,14 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of SIP-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SIP-router is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
  *
- * SIP-router is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -19,23 +17,10 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* History:
- * --------
- *  2003-03-19  replaced all the mallocs/frees w/ pkg_malloc/pkg_free (andrei)
- *  2003-03-29  cleaning pkg_mallocs introduced (jiri)
- *  2005-07-27  complete re-design/re-implementation (andrei)
- *  2005-12-12  workaround & bug reporting for timer_del(self) called from
- *              a timer handle; added timer_allow_del()  (andrei)
- *  2007-05-26  workaround for darwin sigwait() bug, see slow_timer_main() or
- *              grep __OS_darwin for more info (andrei)
- *  2007-07-01  timer_del() returns <0 if the timer is not active or 
- *               cannot be deleted (andrei)
- */
-
 
 /**
  * @file
- * @brief SIP-router core :: 
+ * @brief Kamailio core :: Timer
  * @ingroup core
  * Module: @ref core
  */
diff --git a/timer_proc.c b/timer_proc.c
index 6c8a081d91b..3593a1a7af0 100644
--- a/timer_proc.c
+++ b/timer_proc.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2009 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,15 +13,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * timer_proc.c  - separate process timers
- * (unrelated to the main fast and slow timers)
- */
-/*
- * History:
- * --------
- *  2009-03-10  initial version (andrei)
-*/
 
 /**
  * @file
diff --git a/tls_hooks.c b/tls_hooks.c
index 9b6dab653bd..e19e4d0c3cc 100644
--- a/tls_hooks.c
+++ b/tls_hooks.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2007 iptelorg GmbH 
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,13 +13,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * tls hooks for modules
- *
- * History:
- * --------
- *  2007-02-09  created by andrei
- */
 
 /**
  * @file
diff --git a/tsend.c b/tsend.c
index 1716951fe24..403c62ff914 100644
--- a/tsend.c
+++ b/tsend.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,19 +22,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/*
- * send with timeout for stream and datagram sockets
- * 
- * History:
- * --------
- *  2004-02-26  created by andrei
- *  2003-03-03  switched to heavy macro use, added tsend_dgram_ev (andrei) 
- *  2006-02-03  tsend* will wait forever if timeout==-1 (andrei)
- */
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: send with timeout for stream and datagram sockets
  * \ingroup core
  * Module: \ref core
  */
diff --git a/udp_server.c b/udp_server.c
index 63c03ef3164..85047727618 100644
--- a/udp_server.c
+++ b/udp_server.c
@@ -1,11 +1,9 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -15,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -24,28 +22,10 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History
- * --------
- *  2003-01-28  packet zero-termination moved to receive_msg (jiri)
- *  2003-02-10  undoed the above changes (andrei)
- *  2003-03-19  replaced all the mallocs/frees w/ pkg_malloc/pkg_free (andrei)
- *  2003-04-14  set sockopts to TOS low delay (andrei)
- *  2004-05-03  applied multicast support patch from janakj
- *              added set multicast ttl support (andrei)
- *  2004-07-05  udp_rcv_loop: drop packets with 0 src port + error msg.
- *              cleanups (andrei)
- *  2005-03-10  multicast options are now set for all the udp sockets (andrei)
- *  2005-06-26  failure to set mcast options is not an error anymore (andrei)
- *  2006-04-12  udp_send() switched to struct dest_info (andrei)
- *  2006-10-13  added STUN support (vlada)
- *  2007-08-28  disable/set MTU discover option for the udp sockets
- *               (in linux it's enabled by default which produces udp packets
- *                with the DF flag ser) (patch from hscholz)
- *  2010-06-15  support for using raw sockets for sending (andrei)
  */
 
 
-/** udp send and loop-receive functions.
+/** Kamailio core :: udp send and loop-receive functions.
  * @file udp_server.c
  * @ingroup core
  * Module: @ref core
diff --git a/usr_avp.c b/usr_avp.c
index 94e6a36e9ff..d924c1ab1e8 100644
--- a/usr_avp.c
+++ b/usr_avp.c
@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of ser, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * ser is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
@@ -13,7 +13,7 @@
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
- * ser is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -22,19 +22,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ---------
- *  2004-07-21  created (bogdan)
- *  2004-10-09  interface more flexible - more function available (bogdan)
- *  2004-11-07  AVP string values are kept 0 terminated (bogdan)
- *  2004-11-14  global aliases support added
- *  2005-01-05  parse avp name according new syntax
  */
 
 
 /*!
  * \file
- * \brief SIP-router core :: 
+ * \brief Kamailio core :: Attribute value pair handling (AVP)
  * \ingroup core
  * Module: \ref core
  */
diff --git a/ut.c b/ut.c
index 7079c707454..71907b48cf2 100644
--- a/ut.c
+++ b/ut.c
@@ -1,6 +1,4 @@
 /*
- *$Id$
- *
  * various general purpose functions
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -20,7 +18,7 @@
  */
 
 
-/** various general purpose/utility functions.
+/** Kamailio core :: various general purpose/utility functions.
  * @file ut.c
  * @ingroup core
  * Module: core
diff --git a/ver.c b/ver.c
index e81586fe1b9..9e4ce78d47e 100644
--- a/ver.c
+++ b/ver.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,15 +13,11 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/** version strings.
+
+/** Kamailio core :: version strings.
  * @file ver.c
  * @ingroup: core
  */
-/*
- * History:
- * --------
- *  2010-07-13  initial version (andrei)
-*/
 
 #include "ver_defs.h"
 #include "autover.h" /* REPO_VER, REPO_STATE */
diff --git a/xavp.c b/xavp.c
index 0d73fd37a0a..66398044b53 100644
--- a/xavp.c
+++ b/xavp.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) 
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,13 +13,13 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * History:
- * --------
- *  2009-05-20  created by daniel
+/*!
+ * \file
+ * \brief Kamailio core :: Extended AVPs
+ * \ingroup core
+ * Module: \ref core
  */
 
-
 #ifdef WITH_XAVP
 
 #include <stdio.h>