Just changing keyword expansion

git-svn-id: http://svn.pjsip.org/repos/pjproject/main@3 74dad513-b988-da41-8d7b-12977e46ad98

60 files changed, 180 insertions, 60 deletions

diff --git a/pjsip/src/pjsip/print.h b/pjsip/src/pjsip/print.h
index 83afa2f0..d1b9850c 100644
--- a/pjsip/src/pjsip/print.h
+++ b/pjsip/src/pjsip/print.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/print.h 9     6/22/05 12:27a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_PRINT_H__
 #define __PJSIP_PRINT_H__
 
diff --git a/pjsip/src/pjsip/sip_auth.c b/pjsip/src/pjsip/sip_auth.c
index 8f581a61..91e91862 100644
--- a/pjsip/src/pjsip/sip_auth.c
+++ b/pjsip/src/pjsip/sip_auth.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth.c 12    9/11/05 9:08a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_auth.h>
 #include <pjsip/sip_auth_parser.h>	/* just to get pjsip_DIGEST_STR */
 #include <pjsip/sip_transport.h>
diff --git a/pjsip/src/pjsip/sip_auth.h b/pjsip/src/pjsip/sip_auth.h
index a527896f..3396b669 100644
--- a/pjsip/src/pjsip/sip_auth.h
+++ b/pjsip/src/pjsip/sip_auth.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth.h 11    8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_AUTH_SIP_AUTH_H__
 #define __PJSIP_AUTH_SIP_AUTH_H__
 
diff --git a/pjsip/src/pjsip/sip_auth_msg.c b/pjsip/src/pjsip/sip_auth_msg.c
index 6e8b8780..a5d52f10 100644
--- a/pjsip/src/pjsip/sip_auth_msg.c
+++ b/pjsip/src/pjsip/sip_auth_msg.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth_msg.c 9     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_auth_msg.h>
 #include <pjsip/sip_auth_parser.h>
 #include <pj/pool.h>
diff --git a/pjsip/src/pjsip/sip_auth_msg.h b/pjsip/src/pjsip/sip_auth_msg.h
index ab4c04af..ce1ca1e7 100644
--- a/pjsip/src/pjsip/sip_auth_msg.h
+++ b/pjsip/src/pjsip/sip_auth_msg.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth_msg.h 7     6/19/05 6:12p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_AUTH_SIP_AUTH_MSG_H__
 #define __PJSIP_AUTH_SIP_AUTH_MSG_H__
 
diff --git a/pjsip/src/pjsip/sip_auth_parser.c b/pjsip/src/pjsip/sip_auth_parser.c
index 7043e8a2..2f5a3baf 100644
--- a/pjsip/src/pjsip/sip_auth_parser.c
+++ b/pjsip/src/pjsip/sip_auth_parser.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth_parser.c 7     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_auth_parser.h>
 #include <pjsip/sip_auth_msg.h>
 #include <pjsip/sip_parser.h>
diff --git a/pjsip/src/pjsip/sip_auth_parser.h b/pjsip/src/pjsip/sip_auth_parser.h
index 8e6d20a0..7f280ecd 100644
--- a/pjsip/src/pjsip/sip_auth_parser.h
+++ b/pjsip/src/pjsip/sip_auth_parser.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth_parser.h 7     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_AUTH_SIP_AUTH_PARSER_H__
 #define __PJSIP_AUTH_SIP_AUTH_PARSER_H__
 
diff --git a/pjsip/src/pjsip/sip_config.h b/pjsip/src/pjsip/sip_config.h
index 010a4a3a..a594d488 100644
--- a/pjsip/src/pjsip/sip_config.h
+++ b/pjsip/src/pjsip/sip_config.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_config.h 10    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_CONFIG_H__
 #define __PJSIP_SIP_CONFIG_H__
 
diff --git a/pjsip/src/pjsip/sip_endpoint.c b/pjsip/src/pjsip/sip_endpoint.c
index 3727cc86..321d2e34 100644
--- a/pjsip/src/pjsip/sip_endpoint.c
+++ b/pjsip/src/pjsip/sip_endpoint.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_endpoint.c 26    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_endpoint.h>
 #include <pjsip/sip_transaction.h>
 #include <pjsip/sip_private.h>
diff --git a/pjsip/src/pjsip/sip_endpoint.h b/pjsip/src/pjsip/sip_endpoint.h
index 5e866eb8..d950657d 100644
--- a/pjsip/src/pjsip/sip_endpoint.h
+++ b/pjsip/src/pjsip/sip_endpoint.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_endpoint.h 12    6/22/05 12:27a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_ENDPOINT_H__
 #define __PJSIP_SIP_ENDPOINT_H__
 
diff --git a/pjsip/src/pjsip/sip_event.h b/pjsip/src/pjsip/sip_event.h
index c326822b..ac7bc691 100644
--- a/pjsip/src/pjsip/sip_event.h
+++ b/pjsip/src/pjsip/sip_event.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_event.h 5     6/17/05 11:16p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_EVENT_H__
 #define __PJSIP_SIP_EVENT_H__
 
diff --git a/pjsip/src/pjsip/sip_misc.c b/pjsip/src/pjsip/sip_misc.c
index ec36e090..38a2e95c 100644
--- a/pjsip/src/pjsip/sip_misc.c
+++ b/pjsip/src/pjsip/sip_misc.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_misc.c 15    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_misc.h>
 #include <pjsip/sip_transport.h>
 #include <pjsip/sip_msg.h>
diff --git a/pjsip/src/pjsip/sip_misc.h b/pjsip/src/pjsip/sip_misc.h
index 15897f7e..be2ccca9 100644
--- a/pjsip/src/pjsip/sip_misc.h
+++ b/pjsip/src/pjsip/sip_misc.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_misc.h 7     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_MISC_H__
 #define __PJSIP_SIP_MISC_H__
 
diff --git a/pjsip/src/pjsip/sip_module.h b/pjsip/src/pjsip/sip_module.h
index 10237e8e..f380b967 100644
--- a/pjsip/src/pjsip/sip_module.h
+++ b/pjsip/src/pjsip/sip_module.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_module.h 6     6/17/05 11:16p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_MODULE_H__
 #define __PJSIP_SIP_MODULE_H__
 
diff --git a/pjsip/src/pjsip/sip_msg.c b/pjsip/src/pjsip/sip_msg.c
index 2038b988..fff7bacc 100644
--- a/pjsip/src/pjsip/sip_msg.c
+++ b/pjsip/src/pjsip/sip_msg.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_msg.c 16    6/22/05 12:40a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_msg.h>
 #include <pjsip/print.h>
 #include <pj/string.h>
diff --git a/pjsip/src/pjsip/sip_msg.h b/pjsip/src/pjsip/sip_msg.h
index 69350ec8..76834c29 100644
--- a/pjsip/src/pjsip/sip_msg.h
+++ b/pjsip/src/pjsip/sip_msg.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_msg.h 13    6/22/05 12:27a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_MSG_H__
 #define __PJSIP_SIP_MSG_H__
 
diff --git a/pjsip/src/pjsip/sip_msg_i.h b/pjsip/src/pjsip/sip_msg_i.h
index ff98c9ea..7aa50950 100644
--- a/pjsip/src/pjsip/sip_msg_i.h
+++ b/pjsip/src/pjsip/sip_msg_i.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_msg_i.h 2     2/24/05 10:46a Bennylp $ */
+/* $Id$
+ *
+ */
 
 PJ_IDEF(void) pjsip_msg_add_hdr( pjsip_msg *msg, pjsip_hdr *hdr )
 {
diff --git a/pjsip/src/pjsip/sip_parser.c b/pjsip/src/pjsip/sip_parser.c
index 21162836..4d439120 100644
--- a/pjsip/src/pjsip/sip_parser.c
+++ b/pjsip/src/pjsip/sip_parser.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_parser.c 17    9/11/05 9:28a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_parser.h>
 #include <pjsip/sip_uri.h>
 #include <pjsip/sip_msg.h>
diff --git a/pjsip/src/pjsip/sip_parser.h b/pjsip/src/pjsip/sip_parser.h
index 7cca2673..69e4aba7 100644
--- a/pjsip/src/pjsip/sip_parser.h
+++ b/pjsip/src/pjsip/sip_parser.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_parser.h 10    9/11/05 9:28a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_PARSER_H__
 #define __PJSIP_SIP_PARSER_H__
 
diff --git a/pjsip/src/pjsip/sip_private.h b/pjsip/src/pjsip/sip_private.h
index b256a460..afcff08b 100644
--- a/pjsip/src/pjsip/sip_private.h
+++ b/pjsip/src/pjsip/sip_private.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_private.h 5     6/17/05 11:16p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_PRIVATE_H__
 #define __PJSIP_SIP_PRIVATE_H__
 
diff --git a/pjsip/src/pjsip/sip_resolve.c b/pjsip/src/pjsip/sip_resolve.c
index e9a2ce54..1267b8b4 100644
--- a/pjsip/src/pjsip/sip_resolve.c
+++ b/pjsip/src/pjsip/sip_resolve.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_resolve.c 5     10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #include <pjsip/sip_resolve.h>
 #include <pjsip/sip_transport.h>
diff --git a/pjsip/src/pjsip/sip_resolve.h b/pjsip/src/pjsip/sip_resolve.h
index f8e1dff1..4a47c135 100644
--- a/pjsip/src/pjsip/sip_resolve.h
+++ b/pjsip/src/pjsip/sip_resolve.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_resolve.h 5     6/17/05 11:16p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_RESOLVE_H__
 #define __PJSIP_SIP_RESOLVE_H__
 
diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c
index 8a89f763..cdb20626 100644
--- a/pjsip/src/pjsip/sip_transaction.c
+++ b/pjsip/src/pjsip/sip_transaction.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_transaction.c 21    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_transaction.h>
 #include <pjsip/sip_transport.h>
 #include <pjsip/sip_config.h>
diff --git a/pjsip/src/pjsip/sip_transaction.h b/pjsip/src/pjsip/sip_transaction.h
index 10379e6a..3ef6ad14 100644
--- a/pjsip/src/pjsip/sip_transaction.h
+++ b/pjsip/src/pjsip/sip_transaction.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_transaction.h 7     10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_TRANSACTION_H__
 #define __PJSIP_SIP_TRANSACTION_H__
 
diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c
index 7b18aba0..65b8ec45 100644
--- a/pjsip/src/pjsip/sip_transport.c
+++ b/pjsip/src/pjsip/sip_transport.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_transport.c 18    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_transport.h>
 #include <pjsip/sip_endpoint.h>
 #include <pjsip/sip_parser.h>
diff --git a/pjsip/src/pjsip/sip_transport.h b/pjsip/src/pjsip/sip_transport.h
index 71fae8ae..29b5d8d1 100644
--- a/pjsip/src/pjsip/sip_transport.h
+++ b/pjsip/src/pjsip/sip_transport.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_transport.h 11    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_TRANSPORT_H__
 #define __PJSIP_SIP_TRANSPORT_H__
 
diff --git a/pjsip/src/pjsip/sip_types.h b/pjsip/src/pjsip/sip_types.h
index 9ed7d484..33e8ca03 100644
--- a/pjsip/src/pjsip/sip_types.h
+++ b/pjsip/src/pjsip/sip_types.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_types.h 5     6/19/05 6:12p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_TYPES_H__
 #define __PJSIP_SIP_TYPES_H__
 
diff --git a/pjsip/src/pjsip/sip_uri.c b/pjsip/src/pjsip/sip_uri.c
index a18abe16..516b78c9 100644
--- a/pjsip/src/pjsip/sip_uri.c
+++ b/pjsip/src/pjsip/sip_uri.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_uri.c 8     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_uri.h>
 #include <pjsip/sip_msg.h>
 #include <pjsip/print.h>
diff --git a/pjsip/src/pjsip/sip_uri.h b/pjsip/src/pjsip/sip_uri.h
index 6a759a95..c43bc3df 100644
--- a/pjsip/src/pjsip/sip_uri.h
+++ b/pjsip/src/pjsip/sip_uri.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_uri.h 7     6/19/05 6:12p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_URI_H__
 #define __PJSIP_SIP_URI_H__
 
diff --git a/pjsip/src/pjsip_auth.h b/pjsip/src/pjsip_auth.h
index 310b13f1..9c0d33b1 100644
--- a/pjsip/src/pjsip_auth.h
+++ b/pjsip/src/pjsip_auth.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_auth.h 2     6/05/05 12:13p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_AUTH_H__
 #define __PJSIP_AUTH_H__
 
diff --git a/pjsip/src/pjsip_core.h b/pjsip/src/pjsip_core.h
index bf6aec8c..acce9cc6 100644
--- a/pjsip/src/pjsip_core.h
+++ b/pjsip/src/pjsip_core.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_core.h 2     6/19/05 6:12p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_CORE_H__
 #define __PJSIP_CORE_H__
 
diff --git a/pjsip/src/pjsip_mod_ua/sip_dialog.c b/pjsip/src/pjsip_mod_ua/sip_dialog.c
index 8b979182..0c9db5ec 100644
--- a/pjsip/src/pjsip_mod_ua/sip_dialog.c
+++ b/pjsip/src/pjsip_mod_ua/sip_dialog.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip_mod_ua/sip_dialog.c 27    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_mod_ua/sip_dialog.h>
 #include <pjsip_mod_ua/sip_ua.h>
 #include <pjsip_mod_ua/sip_ua_private.h>
diff --git a/pjsip/src/pjsip_mod_ua/sip_dialog.h b/pjsip/src/pjsip_mod_ua/sip_dialog.h
index d1d942d0..14f0159a 100644
--- a/pjsip/src/pjsip_mod_ua/sip_dialog.h
+++ b/pjsip/src/pjsip_mod_ua/sip_dialog.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_mod_ua/sip_dialog.h 13    8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_DIALOG_H__
 #define __PJSIP_DIALOG_H__
 
diff --git a/pjsip/src/pjsip_mod_ua/sip_reg.c b/pjsip/src/pjsip_mod_ua/sip_reg.c
index 23b48637..1167975e 100644
--- a/pjsip/src/pjsip_mod_ua/sip_reg.c
+++ b/pjsip/src/pjsip_mod_ua/sip_reg.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_mod_ua/sip_reg.c 14    8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_mod_ua/sip_reg.h>
 #include <pjsip/sip_endpoint.h>
 #include <pjsip/sip_parser.h>
diff --git a/pjsip/src/pjsip_mod_ua/sip_reg.h b/pjsip/src/pjsip_mod_ua/sip_reg.h
index 48d56519..7570c735 100644
--- a/pjsip/src/pjsip_mod_ua/sip_reg.h
+++ b/pjsip/src/pjsip_mod_ua/sip_reg.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_mod_ua/sip_reg.h 11    8/24/05 10:35a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_REG_H__
 #define __PJSIP_SIP_REG_H__
 
diff --git a/pjsip/src/pjsip_mod_ua/sip_ua.c b/pjsip/src/pjsip_mod_ua/sip_ua.c
index bd7fe015..6502a5e2 100644
--- a/pjsip/src/pjsip_mod_ua/sip_ua.c
+++ b/pjsip/src/pjsip_mod_ua/sip_ua.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip_mod_ua/sip_ua.c 16    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_mod_ua/sip_ua.h>
 #include <pjsip_mod_ua/sip_dialog.h>
 #include <pjsip_mod_ua/sip_ua_private.h>
diff --git a/pjsip/src/pjsip_mod_ua/sip_ua.h b/pjsip/src/pjsip_mod_ua/sip_ua.h
index 4ea6c2a2..87e6f3a7 100644
--- a/pjsip/src/pjsip_mod_ua/sip_ua.h
+++ b/pjsip/src/pjsip_mod_ua/sip_ua.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_mod_ua/sip_ua.h 6     6/17/05 11:16p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_UA_H__
 #define __PJSIP_SIP_UA_H__
 
diff --git a/pjsip/src/pjsip_mod_ua/sip_ua_private.h b/pjsip/src/pjsip_mod_ua/sip_ua_private.h
index f5264ba5..471c4db0 100644
--- a/pjsip/src/pjsip_mod_ua/sip_ua_private.h
+++ b/pjsip/src/pjsip_mod_ua/sip_ua_private.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_mod_ua/sip_ua_private.h 3     3/25/05 12:51p Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJSIP_UA_PRIVATE_H__
 #define __PJSIP_UA_PRIVATE_H__
diff --git a/pjsip/src/pjsip_simple.h b/pjsip/src/pjsip_simple.h
index 14db7840..3ede0394 100644
--- a/pjsip/src/pjsip_simple.h
+++ b/pjsip/src/pjsip_simple.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple.h 5     6/17/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 /**
  * @defgroup PJSIP_SIMPLE SIP Event, Instant Messaging and Presence Extension (SIMPLE)
diff --git a/pjsip/src/pjsip_simple/event_notify.c b/pjsip/src/pjsip_simple/event_notify.c
index 658ccde8..24aa68a0 100644
--- a/pjsip/src/pjsip_simple/event_notify.c
+++ b/pjsip/src/pjsip_simple/event_notify.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/event_notify.c 11    8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/event_notify.h>
 #include <pjsip/sip_msg.h>
 #include <pjsip/sip_misc.h>
diff --git a/pjsip/src/pjsip_simple/event_notify.h b/pjsip/src/pjsip_simple/event_notify.h
index a8c2c10d..91b53657 100644
--- a/pjsip/src/pjsip_simple/event_notify.h
+++ b/pjsip/src/pjsip_simple/event_notify.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/event_notify.h 7     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_EVENT_NOTIFY_H__
 #define __PJSIP_SIMPLE_EVENT_NOTIFY_H__
 
diff --git a/pjsip/src/pjsip_simple/event_notify_msg.c b/pjsip/src/pjsip_simple/event_notify_msg.c
index 0451c816..9d0f0cd7 100644
--- a/pjsip/src/pjsip_simple/event_notify_msg.c
+++ b/pjsip/src/pjsip_simple/event_notify_msg.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/event_notify_msg.c 2     6/21/05 12:37a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/event_notify_msg.h>
 #include <pjsip/print.h>
 #include <pjsip/sip_parser.h>
diff --git a/pjsip/src/pjsip_simple/event_notify_msg.h b/pjsip/src/pjsip_simple/event_notify_msg.h
index 92e6bdd3..ab66a05d 100644
--- a/pjsip/src/pjsip_simple/event_notify_msg.h
+++ b/pjsip/src/pjsip_simple/event_notify_msg.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/event_notify_msg.h 4     8/24/05 10:33a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_EVENT_NOTIFY_MSG_H__
 #define __PJSIP_SIMPLE_EVENT_NOTIFY_MSG_H__
 
diff --git a/pjsip/src/pjsip_simple/messaging.c b/pjsip/src/pjsip_simple/messaging.c
index b8891291..c3992b4c 100644
--- a/pjsip/src/pjsip_simple/messaging.c
+++ b/pjsip/src/pjsip_simple/messaging.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/messaging.c 7     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/messaging.h>
 #include <pjsip/sip_endpoint.h>
 #include <pjsip/sip_parser.h>
diff --git a/pjsip/src/pjsip_simple/messaging.h b/pjsip/src/pjsip_simple/messaging.h
index 6b4c79d5..ef7484bf 100644
--- a/pjsip/src/pjsip_simple/messaging.h
+++ b/pjsip/src/pjsip_simple/messaging.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/messaging.h 6     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_MESSAGING_H__
 #define __PJSIP_SIMPLE_MESSAGING_H__
 
diff --git a/pjsip/src/pjsip_simple/pidf.c b/pjsip/src/pjsip_simple/pidf.c
index f3505a9c..f1de9c9d 100644
--- a/pjsip/src/pjsip_simple/pidf.c
+++ b/pjsip/src/pjsip_simple/pidf.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/pidf.c 3     6/21/05 12:37a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/pidf.h>
 #include <pj/string.h>
 #include <pj/pool.h>
diff --git a/pjsip/src/pjsip_simple/pidf.h b/pjsip/src/pjsip_simple/pidf.h
index 1a79f0c4..a6caeb6c 100644
--- a/pjsip/src/pjsip_simple/pidf.h
+++ b/pjsip/src/pjsip_simple/pidf.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/pidf.h 3     8/24/05 10:33a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_PIDF_H__
 #define __PJSIP_SIMPLE_PIDF_H__
 
diff --git a/pjsip/src/pjsip_simple/presence.c b/pjsip/src/pjsip_simple/presence.c
index 6d46c447..32ed8e3c 100644
--- a/pjsip/src/pjsip_simple/presence.c
+++ b/pjsip/src/pjsip_simple/presence.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/presence.c 7     8/24/05 10:33a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/presence.h>
 #include <pjsip/sip_transport.h>
 #include <pj/pool.h>
diff --git a/pjsip/src/pjsip_simple/presence.h b/pjsip/src/pjsip_simple/presence.h
index 3c69d356..80ed93c0 100644
--- a/pjsip/src/pjsip_simple/presence.h
+++ b/pjsip/src/pjsip_simple/presence.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/presence.h 6     8/24/05 10:33a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_PRESENCE_H__
 #define __PJSIP_SIMPLE_PRESENCE_H__
 
diff --git a/pjsip/src/pjsip_simple/xpidf.c b/pjsip/src/pjsip_simple/xpidf.c
index 971a44fd..5787f674 100644
--- a/pjsip/src/pjsip_simple/xpidf.c
+++ b/pjsip/src/pjsip_simple/xpidf.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/xpidf.c 3     6/22/05 11:42p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/xpidf.h>
 #include <pj/pool.h>
 #include <pj/string.h>
diff --git a/pjsip/src/pjsip_simple/xpidf.h b/pjsip/src/pjsip_simple/xpidf.h
index 1ae85f3a..27254fa7 100644
--- a/pjsip/src/pjsip_simple/xpidf.h
+++ b/pjsip/src/pjsip_simple/xpidf.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/xpidf.h 3     8/24/05 10:33a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_XPIDF_H__
 #define __PJSIP_SIMPLE_XPIDF_H__
 
diff --git a/pjsip/src/pjsip_ua.h b/pjsip/src/pjsip_ua.h
index 24b2e984..883faa51 100644
--- a/pjsip/src/pjsip_ua.h
+++ b/pjsip/src/pjsip_ua.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsip_ua.h 1     4/17/05 11:59a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJSIP_UA_H__
 #define __PJSIP_UA_H__
diff --git a/pjsip/src/pjsua/getopt.c b/pjsip/src/pjsua/getopt.c
index 512d057e..caa8920f 100644
--- a/pjsip/src/pjsua/getopt.c
+++ b/pjsip/src/pjsua/getopt.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsua/getopt.c 4     5/14/05 12:24a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifdef _MSC_VER
 /* in VC this file will generate a lot of warning about old style function
diff --git a/pjsip/src/pjsua/getopt.h b/pjsip/src/pjsua/getopt.h
index 3783c6ab..b5c91d01 100644
--- a/pjsip/src/pjsua/getopt.h
+++ b/pjsip/src/pjsua/getopt.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsua/getopt.h 3     5/05/05 11:43p Bennylp $ */
+/* $Id$
+ *
+ */
 /* Declarations for getopt.
    Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
diff --git a/pjsip/src/pjsua/main.c b/pjsip/src/pjsua/main.c
index 48603d57..c04d1a22 100644
--- a/pjsip/src/pjsua/main.c
+++ b/pjsip/src/pjsua/main.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsua/main.c 40    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #include <pjlib.h>
 #include <pjsip_core.h>
diff --git a/pjsip/src/pjsua/misc.c b/pjsip/src/pjsua/misc.c
index 927a4ec6..36439ccc 100644
--- a/pjsip/src/pjsua/misc.c
+++ b/pjsip/src/pjsua/misc.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/pjsua/misc.c 21    6/23/05 12:36a Bennylp $ */
+/* $Id$
+ *
+ */
 
 /*
  * THIS FILE IS INCLUDED BY main.c.
diff --git a/pjsip/src/tests/pjsip_core/main.c b/pjsip/src/tests/pjsip_core/main.c
index c4c0f558..6212ba4a 100644
--- a/pjsip/src/tests/pjsip_core/main.c
+++ b/pjsip/src/tests/pjsip_core/main.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/tests/pjsip_core/main.c 2     2/24/05 10:46a Bennylp $ */
+/* $Id$
+ *
+ */
 #include "test.h"
 #include <stdio.h>
 
diff --git a/pjsip/src/tests/pjsip_core/test.h b/pjsip/src/tests/pjsip_core/test.h
index 6e62aca8..8bb57b2a 100644
--- a/pjsip/src/tests/pjsip_core/test.h
+++ b/pjsip/src/tests/pjsip_core/test.h
@@ -1,4 +1,6 @@
-/* $Header: /pjproject/pjsip/src/tests/pjsip_core/test.h 2     2/24/05 10:46a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pj/types.h>
 
 pj_status_t test_uri(void);
diff --git a/pjsip/src/tests/pjsip_core/test_msg.c b/pjsip/src/tests/pjsip_core/test_msg.c
index ebabc4b7..7326e37c 100644
--- a/pjsip/src/tests/pjsip_core/test_msg.c
+++ b/pjsip/src/tests/pjsip_core/test_msg.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/tests/pjsip_core/test_msg.c 10    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_msg.h>
 #include <pjsip/sip_parser.h>
 #include <pj/os.h>
diff --git a/pjsip/src/tests/pjsip_core/test_uri.c b/pjsip/src/tests/pjsip_core/test_uri.c
index 55f2580c..0c786605 100644
--- a/pjsip/src/tests/pjsip_core/test_uri.c
+++ b/pjsip/src/tests/pjsip_core/test_uri.c
@@ -1,4 +1,6 @@
-/* $Header: /pjproject-0.3/pjsip/src/tests/pjsip_core/test_uri.c 9     10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_parser.h>
 #include <pjsip/sip_uri.h>
 #include <pj/os.h>