diff --git a/trunk/tinyHTTP/ragel/thttp_parser_message.rl b/trunk/tinyHTTP/ragel/thttp_parser_message.rl
index dfdf81e1..7185f6a9 100644
--- a/trunk/tinyHTTP/ragel/thttp_parser_message.rl
+++ b/trunk/tinyHTTP/ragel/thttp_parser_message.rl
@@ -216,6 +216,7 @@ int thttp_message_parse(tsk_ragel_state_t *state, thttp_message_t **result, int
 
 	if( state->cs < %%{ write first_final; }%% )
 	{
+		TSK_DEBUG_ERROR("Failed to parse HTTP message.");
 		TSK_OBJECT_SAFE_FREE(*result);
 		return -2;
 	}
diff --git a/trunk/tinyHTTP/src/thttp_message.c b/trunk/tinyHTTP/src/thttp_message.c
index 7371da67..2f9efebc 100644
--- a/trunk/tinyHTTP/src/thttp_message.c
+++ b/trunk/tinyHTTP/src/thttp_message.c
@@ -179,7 +179,7 @@ const thttp_header_t *thttp_message_get_header(const thttp_message_t *self, thtt
 
 int thttp_message_tostring(const thttp_message_t *self, tsk_buffer_t *output)
 {
-	if(!self){
+	if(!self || !output){
 		return -1;
 	}
 
diff --git a/trunk/tinyHTTP/test/test.vcproj b/trunk/tinyHTTP/test/test.vcproj
index 9b1e42bc..15d341e2 100644
--- a/trunk/tinyHTTP/test/test.vcproj
+++ b/trunk/tinyHTTP/test/test.vcproj
@@ -206,6 +206,10 @@
 				RelativePath=".\test_auth.h"
 				>
 			</File>
+			<File
+				RelativePath=".\test_messages.h"
+				>
+			</File>
 			<File
 				RelativePath=".\test_stack.h"
 				>
diff --git a/trunk/tinyHTTP/test/test_messages.h b/trunk/tinyHTTP/test/test_messages.h
index 1acffccb..02bd9d83 100644
--- a/trunk/tinyHTTP/test/test_messages.h
+++ b/trunk/tinyHTTP/test/test_messages.h
@@ -63,7 +63,7 @@ void test_messages()
 
 		/* serialize the message */
 		thttp_message_tostring(message, buffer);
-		TSK_DEBUG_INFO("Response=\n%s", TSK_BUFFER_TO_STRING(buffer));
+		TSK_DEBUG_INFO("HTTP Message=\n%s", TSK_BUFFER_TO_STRING(buffer));
 
 		TSK_OBJECT_SAFE_FREE(buffer);
 	}
diff --git a/trunk/tinyHTTP/tinyHTTP.vcproj b/trunk/tinyHTTP/tinyHTTP.vcproj
index f5eafbbf..401ddf58 100644
--- a/trunk/tinyHTTP/tinyHTTP.vcproj
+++ b/trunk/tinyHTTP/tinyHTTP.vcproj
@@ -336,7 +336,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="src"
+			Name="source(*.c)"
 			>
 			<File
 				RelativePath=".\src\thttp.c"
@@ -420,7 +420,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="include"
+			Name="include(*.h)"
 			>
 			<File
 				RelativePath=".\include\thttp.h"
@@ -508,7 +508,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="abnf"
+			Name="abnf(*.abnf)"
 			>
 			<File
 				RelativePath=".\abnf\http.abnf"
@@ -524,7 +524,7 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="ragel"
+			Name="ragel(*.rl)"
 			>
 			<File
 				RelativePath=".\ragel\thttp_machine_header.rl"
diff --git a/trunk/tinyIPSec/tinyIPSec.vcproj b/trunk/tinyIPSec/tinyIPSec.vcproj
index e4c9574e..4eee0f3a 100644
--- a/trunk/tinyIPSec/tinyIPSec.vcproj
+++ b/trunk/tinyIPSec/tinyIPSec.vcproj
@@ -174,7 +174,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="source"
+			Name="source(*.c)"
 			>
 			<File
 				RelativePath=".\src\tipsec.c"
@@ -198,7 +198,7 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="include"
+			Name="include(*.h)"
 			>
 			<File
 				RelativePath=".\src\tinyipsec_config.h"
diff --git a/trunk/tinyNET/smc/ice.sm b/trunk/tinyNET/smc/ice.sm
deleted file mode 100644
index e69de29b..00000000
diff --git a/trunk/tinyNET/smc/stun.sm b/trunk/tinyNET/smc/stun.sm
deleted file mode 100644
index e69de29b..00000000
diff --git a/trunk/tinyNET/smc/turn.sm b/trunk/tinyNET/smc/turn.sm
deleted file mode 100644
index e69de29b..00000000
diff --git a/trunk/tinyNET/tinyNET.vcproj b/trunk/tinyNET/tinyNET.vcproj
index adc5ae8e..063f94d8 100644
--- a/trunk/tinyNET/tinyNET.vcproj
+++ b/trunk/tinyNET/tinyNET.vcproj
@@ -336,7 +336,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="source"
+			Name="source(*.c)"
 			>
 			<File
 				RelativePath=".\src\tnet.c"
@@ -524,7 +524,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="include"
+			Name="include(*.h)"
 			>
 			<File
 				RelativePath=".\src\tinyNET_config.h"
@@ -719,22 +719,6 @@
 				</File>
 			</Filter>
 		</Filter>
-		<Filter
-			Name="smc"
-			>
-			<File
-				RelativePath=".\smc\ice.sm"
-				>
-			</File>
-			<File
-				RelativePath=".\smc\stun.sm"
-				>
-			</File>
-			<File
-				RelativePath=".\smc\turn.sm"
-				>
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/trunk/tinySAK/src/tsk_list.h b/trunk/tinySAK/src/tsk_list.h
index 8ee52a94..8d72ddf7 100644
--- a/trunk/tinySAK/src/tsk_list.h
+++ b/trunk/tinySAK/src/tsk_list.h
@@ -53,6 +53,9 @@ TSK_BEGIN_DECLS
 */
 #define TSK_LIST_IS_EMPTY(self)				(self ? (!self->head) : 1)
 
+#define TSK_LIST_IS_FIRST(self, item)		(self ? (self->head == item) : 0)
+#define TSK_LIST_IS_LAST(self, item)		(self ? (self->tail == item) : 0)
+
 /**@ingroup tsk_list_group
 * Item for linked list. 
 */
diff --git a/trunk/tinySAK/src/tsk_object.c b/trunk/tinySAK/src/tsk_object.c
index 05be609f..0a536675 100644
--- a/trunk/tinySAK/src/tsk_object.c
+++ b/trunk/tinySAK/src/tsk_object.c
@@ -55,12 +55,12 @@ tsk_object_header_t;
 * Creates new object. The object MUST be declared using @ref TSK_DECLARE_OBJECT macro.
 * @param objdef The object meta-data (definition). For more infomation see @ref tsk_object_def_t.
 * @param ... List of parameters to pass to the constructor(defined in the meta-data).
-* @retval The newly calloc()ed object with a reference counter equal to 1.
+* @retval @ref tsk_object_t object with a reference counter equal to 1.
 * @sa @ref tsk_object_new2.
 */
-void* tsk_object_new(const tsk_object_def_t *objdef, ...)
+tsk_object_t* tsk_object_new(const tsk_object_def_t *objdef, ...)
 {
-	void *newobj = tsk_calloc(1, objdef->size);
+	tsk_object_t *newobj = tsk_calloc(1, objdef->size);
 	if(newobj)
 	{
 		(*(const tsk_object_def_t **) newobj) = objdef;
@@ -91,12 +91,12 @@ void* tsk_object_new(const tsk_object_def_t *objdef, ...)
 * Creates new object. The object MUST be declared using @ref TSK_DECLARE_OBJECT macro.
 * @param objdef The object meta-data (definition). For more infomation see @ref tsk_object_def_t.
 * @param ap Variable argument list to pass to the constructor(defined in the meta-data).
-* @retval The newly calloc()ed object with a reference counter equal to 1.
+* @retval @ref tsk_object_t object with a reference counter equal to 1.
 * @sa @ref tsk_object_new.
 */
-void* tsk_object_new2(const tsk_object_def_t *objdef, va_list* ap)
+tsk_object_t* tsk_object_new2(const tsk_object_def_t *objdef, va_list* ap)
 {
-	void *newobj = tsk_calloc(1, objdef->size);
+	tsk_object_t *newobj = tsk_calloc(1, objdef->size);
 	if(newobj)
 	{
 		(*(const tsk_object_def_t **) newobj) = objdef;
@@ -121,7 +121,7 @@ void* tsk_object_new2(const tsk_object_def_t *objdef, va_list* ap)
 * The object MUST be declared using @ref TSK_DECLARE_OBJECT macro and created using @ref tsk_object_new or @ref tsk_object_new2.
 * @retval The size of the object.
 */
-size_t tsk_object_sizeof(const void *self)
+size_t tsk_object_sizeof(const tsk_object_t *self)
 {
 	const tsk_object_def_t **objdef = (const tsk_object_def_t **)self;
 	if(objdef && *objdef){
@@ -141,7 +141,7 @@ size_t tsk_object_sizeof(const void *self)
 * @retval Zero if the two object are equal.
 * Positive value if @a object1 is greater than @a object2 and a negative value otherwise.
 */
-int tsk_object_cmp(const void *object1, const void *object2)
+int tsk_object_cmp(const tsk_object_t *object1, const tsk_object_t *object2)
 {
 	const tsk_object_def_t **objdef = (const tsk_object_def_t **)object1;
 
@@ -159,7 +159,7 @@ int tsk_object_cmp(const void *object1, const void *object2)
 * @retval The new object (incremented).
 * @sa tsk_object_unref.
 */
-void* tsk_object_ref(void *self)
+tsk_object_t* tsk_object_ref(tsk_object_t *self)
 {
 	if(self){
 		TSK_OBJECT_HEADER_GET(self)->refCount++;
@@ -177,7 +177,7 @@ void* tsk_object_ref(void *self)
 * @sa ref tsk_object_ref.
 * @sa ref TSK_OBJECT_SAFE_FREE.
 */
-void* tsk_object_unref(void *self)
+tsk_object_t* tsk_object_unref(tsk_object_t *self)
 {
 	if(self)
 	{
@@ -196,7 +196,7 @@ void* tsk_object_unref(void *self)
 * @param self The object to delete.
 * @sa @ref TSK_OBJECT_SAFE_FREE.
 */
-void tsk_object_delete(void *self)
+void tsk_object_delete(tsk_object_t *self)
 {
 	const tsk_object_def_t ** objdef = self;
 	if(self && *objdef)
diff --git a/trunk/tinySAK/src/tsk_object.h b/trunk/tinySAK/src/tsk_object.h
index 30693f81..72caa9dd 100644
--- a/trunk/tinySAK/src/tsk_object.h
+++ b/trunk/tinySAK/src/tsk_object.h
@@ -37,6 +37,11 @@
 
 TSK_BEGIN_DECLS
 
+/**@ingroup tsk_object_group
+* Plain object.
+*/
+typedef void tsk_object_t;
+
 /**@ingroup tsk_object_group
 * Safely free any object created using @ref tsk_object_new and declared using @ref TSK_DECLARE_OBJECT. If the reference count of the object was equal to 1 then this
  * 	object will be freed otherwise the refrence counter will be decremented. 
@@ -142,19 +147,19 @@ TSK_BEGIN_DECLS
 typedef struct tsk_object_def_s
 {
 	size_t size;													/**< The size of the object. */
-	void*	(* constructor) (void *self, va_list *app);				/**< Pointer to the constructor. */
-	void*	(* destructor) (void *);								/**< Pointer to the destructor. */
-	int		(* objcmp) (const void *object1, const void *object2);	/**< Pointer to the comparator. */
+	void*	(* constructor) (tsk_object_t *, va_list *);				/**< Pointer to the constructor. */
+	void*	(* destructor) (tsk_object_t *);								/**< Pointer to the destructor. */
+	int		(* objcmp) (const tsk_object_t *, const tsk_object_t *);	/**< Pointer to the comparator. */
 }
 tsk_object_def_t;
 
-TINYSAK_API void* tsk_object_new(const tsk_object_def_t *objdef, ...);
-TINYSAK_API void* tsk_object_new2(const tsk_object_def_t *objdef, va_list* ap);
-TINYSAK_API size_t tsk_object_sizeof(const void *self);
-TINYSAK_API int tsk_object_cmp(const void *self, const void *object);
-TINYSAK_API void* tsk_object_ref(void *self);
-TINYSAK_API void* tsk_object_unref(void *self);
-TINYSAK_API void tsk_object_delete(void *self);
+TINYSAK_API tsk_object_t* tsk_object_new(const tsk_object_def_t *objdef, ...);
+TINYSAK_API tsk_object_t* tsk_object_new2(const tsk_object_def_t *objdef, va_list* ap);
+TINYSAK_API size_t tsk_object_sizeof(const void *tsk_object_t);
+TINYSAK_API int tsk_object_cmp(const void *self, const tsk_object_t *object);
+TINYSAK_API tsk_object_t* tsk_object_ref(tsk_object_t *self);
+TINYSAK_API tsk_object_t* tsk_object_unref(tsk_object_t *self);
+TINYSAK_API void tsk_object_delete(tsk_object_t *self);
 
 TSK_END_DECLS
 
diff --git a/trunk/tinySAK/tinySAK.vcproj b/trunk/tinySAK/tinySAK.vcproj
index 1e8e827d..054542a7 100644
--- a/trunk/tinySAK/tinySAK.vcproj
+++ b/trunk/tinySAK/tinySAK.vcproj
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(DOUBANGO_HOME)\thirdparties\win32\include&quot;"
-				PreprocessorDefinitions="DEBUG_LEVEL=DEBUG_LEVEL_INFO;WIN32;_DEBUG;_WINDOWS;_USRDLL;TINYSAK_EXPORTS;_WIN32_WINNT 0x0501"
+				PreprocessorDefinitions="DEBUG_LEVEL=DEBUG_LEVEL_INFO;WIN32;_DEBUG;_WINDOWS;_USRDLL;TINYSAK_EXPORTS;_WIN32_WINNT=0x0501"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -342,7 +342,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="include"
+			Name="include(*.h)"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
@@ -472,7 +472,7 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="source"
+			Name="source(*.c)"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
diff --git a/trunk/tinySIP/include/tinysip/api/tsip_api_message.h b/trunk/tinySIP/include/tinysip/api/tsip_api_message.h
index 1a2dcbf8..3849bd49 100644
--- a/trunk/tinySIP/include/tinysip/api/tsip_api_message.h
+++ b/trunk/tinySIP/include/tinysip/api/tsip_api_message.h
@@ -30,9 +30,9 @@
 #ifndef TINYSIP_TSIP_MESSAGE_H
 #define TINYSIP_TSIP_MESSAGE_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/tsip_event.h"
+#include "tinySIP/tsip_event.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/api/tsip_api_publish.h b/trunk/tinySIP/include/tinysip/api/tsip_api_publish.h
index 0f6edbda..f32fc341 100644
--- a/trunk/tinySIP/include/tinysip/api/tsip_api_publish.h
+++ b/trunk/tinySIP/include/tinysip/api/tsip_api_publish.h
@@ -30,9 +30,9 @@
 #ifndef TINYSIP_TSIP_PUBLISH_H
 #define TINYSIP_TSIP_PUBLISH_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/tsip_event.h"
+#include "tinySIP/tsip_event.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/api/tsip_api_register.h b/trunk/tinySIP/include/tinysip/api/tsip_api_register.h
index 5353d58f..2c8c2b41 100644
--- a/trunk/tinySIP/include/tinysip/api/tsip_api_register.h
+++ b/trunk/tinySIP/include/tinysip/api/tsip_api_register.h
@@ -30,9 +30,9 @@
 #ifndef TINYSIP_TSIP_REGISTER_H
 #define TINYSIP_TSIP_REGISTER_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/tsip_event.h"
+#include "tinySIP/tsip_event.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/api/tsip_api_subscribe.h b/trunk/tinySIP/include/tinysip/api/tsip_api_subscribe.h
index 301aa5cd..33016805 100644
--- a/trunk/tinySIP/include/tinysip/api/tsip_api_subscribe.h
+++ b/trunk/tinySIP/include/tinysip/api/tsip_api_subscribe.h
@@ -30,9 +30,9 @@
 #ifndef TINYSIP_TSIP_SUBSCRIBE_H
 #define TINYSIP_TSIP_SUBSCRIBE_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/tsip_event.h"
+#include "tinySIP/tsip_event.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/authentication/tsip_challenge.h b/trunk/tinySIP/include/tinysip/authentication/tsip_challenge.h
index 2a39f420..978dba0d 100644
--- a/trunk/tinySIP/include/tinysip/authentication/tsip_challenge.h
+++ b/trunk/tinySIP/include/tinysip/authentication/tsip_challenge.h
@@ -30,14 +30,14 @@
 #ifndef TINYSIP_AUTHENTICATION_CHALLENGE_H
 #define TINYSIP_AUTHENTICATION_CHALLENGE_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 #include "tsip.h"
 
-#include "tinysip/tsip_message.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP/tsip_message.h"
+#include "tinySIP/headers/tsip_header.h"
 
-#include "tinysip/authentication/tsip_milenage.h"
+#include "tinySIP/authentication/tsip_milenage.h"
 
 #include "tinyhttp/auth/thttp_auth.h"
 
diff --git a/trunk/tinySIP/include/tinysip/authentication/tsip_milenage.h b/trunk/tinySIP/include/tinysip/authentication/tsip_milenage.h
index d949eaca..58d585e3 100644
--- a/trunk/tinySIP/include/tinysip/authentication/tsip_milenage.h
+++ b/trunk/tinySIP/include/tinysip/authentication/tsip_milenage.h
@@ -56,7 +56,7 @@
 #ifndef TINYSIP_AUTHENTICATION_MILENAGE_H
 #define TINYSIP_AUTHENTICATION_MILENAGE_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/authentication/tsip_rijndael.h b/trunk/tinySIP/include/tinysip/authentication/tsip_rijndael.h
index 78534d78..a503d92e 100644
--- a/trunk/tinySIP/include/tinysip/authentication/tsip_rijndael.h
+++ b/trunk/tinySIP/include/tinysip/authentication/tsip_rijndael.h
@@ -59,7 +59,7 @@
 #ifndef TINYSIP_AUTHENTICATION_RIJNDAEL_H
 #define TINYSIP_AUTHENTICATION_RIJNDAEL_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog.h b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog.h
index 9d94d258..152278e1 100644
--- a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog.h
+++ b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog.h
@@ -30,15 +30,15 @@
 #ifndef TINYSIP_DIALOG_H
 #define TINYSIP_DIALOG_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 #include "tsip.h"
-#include "tinysip/tsip_uri.h"
-#include "tinysip/tsip_timers.h"
-#include "tinysip/tsip_message.h"
-#include "tinysip/tsip_operation.h"
+#include "tinySIP/tsip_uri.h"
+#include "tinySIP/tsip_timers.h"
+#include "tinySIP/tsip_message.h"
+#include "tinySIP/tsip_operation.h"
 
-#include "tinysip/authentication/tsip_challenge.h"
+#include "tinySIP/authentication/tsip_challenge.h"
 
 #include "tsk_safeobj.h"
 #include "tsk_list.h"
diff --git a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_layer.h b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_layer.h
index 0da9e42a..eb0fe62d 100644
--- a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_layer.h
+++ b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_layer.h
@@ -30,10 +30,10 @@
 #ifndef TINYSIP_DIALOG_LAYER_H
 #define TINYSIP_DIALOG_LAYER_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 #include "tsip.h"
-#include "tinysip/dialogs/tsip_dialog.h"
+#include "tinySIP/dialogs/tsip_dialog.h"
 
 #include "tsk_safeobj.h"
 #include "tsk_list.h"
diff --git a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_message.h b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_message.h
index 0a6cddf9..64d3c8e3 100644
--- a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_message.h
+++ b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_message.h
@@ -30,8 +30,8 @@
 #ifndef TINYSIP_DIALOG_MESSAGE_H
 #define TINYSIP_DIALOG_MESSAGE_H
 
-#include "tinysip_config.h"
-#include "tinysip/dialogs/tsip_dialog.h"
+#include "tinySIP_config.h"
+#include "tinySIP/dialogs/tsip_dialog.h"
 
 #include "tsk_fsm.h"
 
diff --git a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.h b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.h
index bd7a35ac..591c4bbb 100644
--- a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.h
+++ b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.h
@@ -30,8 +30,8 @@
 #ifndef TINYSIP_DIALOG_PUBLISH_H
 #define TINYSIP_DIALOG_PUBLISH_H
 
-#include "tinysip_config.h"
-#include "tinysip/dialogs/tsip_dialog.h"
+#include "tinySIP_config.h"
+#include "tinySIP/dialogs/tsip_dialog.h"
 
 #include "tsk_fsm.h"
 
diff --git a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_register.h b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_register.h
index c76c2111..ba59b4ce 100644
--- a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_register.h
+++ b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_register.h
@@ -30,8 +30,8 @@
 #ifndef TINYSIP_DIALOG_REGISTER_H
 #define TINYSIP_DIALOG_REGISTER_H
 
-#include "tinysip_config.h"
-#include "tinysip/dialogs/tsip_dialog.h"
+#include "tinySIP_config.h"
+#include "tinySIP/dialogs/tsip_dialog.h"
 
 #include "tsk_fsm.h"
 
diff --git a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_subscribe.h b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_subscribe.h
index aea03183..eab8be24 100644
--- a/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_subscribe.h
+++ b/trunk/tinySIP/include/tinysip/dialogs/tsip_dialog_subscribe.h
@@ -30,8 +30,8 @@
 #ifndef TINYSIP_DIALOG_SUBSCRIBE_H
 #define TINYSIP_DIALOG_SUBSCRIBE_H
 
-#include "tinysip_config.h"
-#include "tinysip/dialogs/tsip_dialog.h"
+#include "tinySIP_config.h"
+#include "tinySIP/dialogs/tsip_dialog.h"
 
 #include "tsk_fsm.h"
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header.h b/trunk/tinySIP/include/tinysip/headers/tsip_header.h
index 3503270f..59182642 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header.h
@@ -30,7 +30,7 @@
 #ifndef TINYSIP_HEADER_H
 #define TINYSIP_HEADER_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 #include "tsk_ragel_state.h"
 
@@ -44,10 +44,11 @@
 
 TSIP_BEGIN_DECLS
 
-#define TSIP_HEADER(self)			((tsip_header_t*)(self))
-#define TSIP_HEADER_PARAMS(self)	(TSIP_HEADER(self)->params)
+#define TSIP_HEADER(self)					((tsip_header_t*)(self))
+#define TSIP_HEADER_PARAMS(self)			(TSIP_HEADER(self)->params)
+#define TSIP_HEADER_VALUE_TOSTRING_F(self)	((tsip_header_value_tostring_f)(self))
 
-typedef int (*tsip_header_value_tostring)(const void* header/*FIXME*/, tsk_buffer_t* output);
+typedef int (*tsip_header_value_tostring_f)(const struct tsip_header_s* header, tsk_buffer_t* output);
 
 /**
  * @enum	tsip_header_type_e
@@ -158,7 +159,7 @@ typedef struct tsip_header_s
 {
 	TSK_DECLARE_OBJECT;
 	tsip_header_type_t type;
-	tsip_header_value_tostring tostring;
+	tsip_header_value_tostring_f tostring;
 	tsk_params_L_t *params;
 }
 tsip_header_t;
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Contact.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Contact.h
index 25345d0c..581fd028 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Contact.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Contact.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_ACCEPT_CONTACT_H_
 #define _TSIP_HEADER_ACCEPT_CONTACT_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Encoding.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Encoding.h
index be4dbbdb..366e572b 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Encoding.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Encoding.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_ACCEPT_ENCODING_H_
 #define _TSIP_HEADER_ACCEPT_ENCODING_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Language.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Language.h
index 5ffd2548..52ba5c5c 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Language.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Language.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_ACCEPT_LANGUAGE_H_
 #define _TSIP_HEADER_ACCEPT_LANGUAGE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Resource_Priority.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Resource_Priority.h
index eba2ac50..5d826f96 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Resource_Priority.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Accept_Resource_Priority.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_ACCEPT_RESOURCE_PRIORITY_H_
 #define _TSIP_HEADER_ACCEPT_RESOURCE_PRIORITY_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Alert_Info.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Alert_Info.h
index 97686b6c..bfdc1d7c 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Alert_Info.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Alert_Info.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_ALERT_INFO_H_
 #define _TSIP_HEADER_ALERT_INFO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Allow.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Allow.h
index 386288a0..b38716a9 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Allow.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Allow.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_ALLOW_H_
 #define _TSIP_HEADER_ALLOW_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Allow_Events.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Allow_Events.h
index f8573285..a892ae54 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Allow_Events.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Allow_Events.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_ALLOW_EVENTS_H_
 #define _TSIP_HEADER_ALLOW_EVENTS_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Authentication_Info.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Authentication_Info.h
index 929238bc..3b5a3b5c 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Authentication_Info.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Authentication_Info.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_AUTHENTICATION_INFO_H_
 #define _TSIP_HEADER_AUTHENTICATION_INFO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 
 TSIP_BEGIN_DECLS
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Authorization.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Authorization.h
index 5078ea7c..0a1f78e0 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Authorization.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Authorization.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_AUTHORIZATION_H_
 #define _TSIP_HEADER_AUTHORIZATION_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_CSeq.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_CSeq.h
index 9bfcd354..e5c5aabe 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_CSeq.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_CSeq.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_CSEQ_H_
 #define _TSIP_HEADER_CSEQ_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Call_ID.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Call_ID.h
index db2db52f..73f10413 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Call_ID.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Call_ID.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_CALL_ID_H_
 #define _TSIP_HEADER_CALL_ID_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 #include "tsk_uuid.h"
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Call_Info.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Call_Info.h
index 8d23c7ed..45174f0c 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Call_Info.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Call_Info.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_CALL_INFO_H_
 #define _TSIP_HEADER_CALL_INFO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Contact.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Contact.h
index 08c8fa1b..2abd519c 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Contact.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Contact.h
@@ -30,9 +30,9 @@
 #ifndef _TSIP_HEADER_CONTACT_H_
 #define _TSIP_HEADER_CONTACT_H_
 
-#include "tinysip_config.h"
-#include "tinysip/tsip_uri.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/tsip_uri.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Disposition.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Disposition.h
index ea386a0f..dcff1e8f 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Disposition.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Disposition.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_CONTENT_DISPOSITION_H_
 #define _TSIP_HEADER_CONTENT_DISPOSITION_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Encoding.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Encoding.h
index 7b690257..f646ff23 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Encoding.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Encoding.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_CONTENT_ENCODING_H_
 #define _TSIP_HEADER_CONTENT_ENCODING_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Language.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Language.h
index cc7ade5d..ed600174 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Language.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Language.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_CONTENT_LANGUAGE_H_
 #define _TSIP_HEADER_CONTENT_LANGUAGE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 /// @struct	
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Length.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Length.h
index 10a9a83d..d01f0ed6 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Length.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Length.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_CONTENT_LENGTH_H_
 #define _TSIP_HEADER_CONTENT_LENGTH_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Type.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Type.h
index f7e1583c..0835d96c 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Type.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Content_Type.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_CONTENT_TYPE_H_
 #define _TSIP_HEADER_CONTENT_TYPE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Date.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Date.h
index ae6eeaf5..d915dd67 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Date.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Date.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_DATE_H_
 #define _TSIP_HEADER_DATE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Dummy.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Dummy.h
index a7422b7a..c0eaf828 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Dummy.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Dummy.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_DUMMY_H_
 #define _TSIP_HEADER_DUMMY_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Error_Info.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Error_Info.h
index e8f9c175..1c114d5f 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Error_Info.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Error_Info.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_ERROR_INFO_H_
 #define _TSIP_HEADER_ERROR_INFO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Event.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Event.h
index 1ab0376b..dcf928ce 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Event.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Event.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_EVENT_H_
 #define _TSIP_HEADER_EVENT_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Expires.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Expires.h
index e3572815..b4b5d926 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Expires.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Expires.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_EXPIRES_H_
 #define _TSIP_HEADER_EXPIRES_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_From.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_From.h
index ef112517..facf93b2 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_From.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_From.h
@@ -30,9 +30,9 @@
 #ifndef _TSIP_HEADER_FROM_H_
 #define _TSIP_HEADER_FROM_H_
 
-#include "tinysip_config.h"
-#include "tinysip/tsip_uri.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/tsip_uri.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_History_Info.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_History_Info.h
index 6b150776..a9caa802 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_History_Info.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_History_Info.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_HISTORY_INFO_H_
 #define _TSIP_HEADER_HISTORY_INFO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Identity.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Identity.h
index 4e02002a..9a68bc7b 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Identity.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Identity.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_IDENTITY_H_
 #define _TSIP_HEADER_IDENTITY_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Identity_Info.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Identity_Info.h
index 4548f111..4c2e2ad9 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Identity_Info.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Identity_Info.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_IDENTITY_INFO_H_
 #define _TSIP_HEADER_IDENTITY_INFO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_In_Reply_To.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_In_Reply_To.h
index 260c26d5..4dcedf7d 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_In_Reply_To.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_In_Reply_To.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_IN_REPLY_TO_H_
 #define _TSIP_HEADER_IN_REPLY_TO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Join.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Join.h
index 6260d9f5..ebc0032d 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Join.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Join.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_JOIN_H_
 #define _TSIP_HEADER_JOIN_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_MIME_Version.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_MIME_Version.h
index 918192c0..e57b964b 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_MIME_Version.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_MIME_Version.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_MIME_VERSION_H_
 #define _TSIP_HEADER_MIME_VERSION_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Max_Forwards.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Max_Forwards.h
index 8f6a43d3..173725d8 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Max_Forwards.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Max_Forwards.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_MAX_FORWARDS_H_
 #define _TSIP_HEADER_MAX_FORWARDS_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Min_Expires.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Min_Expires.h
index 21141398..3200e562 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Min_Expires.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Min_Expires.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_MIN_EXPIRES_H_
 #define _TSIP_HEADER_MIN_EXPIRES_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Min_SE.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Min_SE.h
index a15ba00a..258b369c 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Min_SE.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Min_SE.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_MIN_SE_H_
 #define _TSIP_HEADER_MIN_SE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Organization.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Organization.h
index c31c855f..d3aed6d8 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Organization.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Organization.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_ORGANIZATION_H_
 #define _TSIP_HEADER_ORGANIZATION_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Access_Network_Info.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Access_Network_Info.h
index 2aa35f22..1fe36177 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Access_Network_Info.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Access_Network_Info.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_ACCESS_NETWORK_INFO_H_
 #define _TSIP_HEADER_P_ACCESS_NETWORK_INFO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Answer_State.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Answer_State.h
index cb3126b1..b90aaf36 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Answer_State.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Answer_State.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_ANSWER_STATE_H_
 #define _TSIP_HEADER_P_ANSWER_STATE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Asserted_Identity.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Asserted_Identity.h
index 00e4084f..2e5a445a 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Asserted_Identity.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Asserted_Identity.h
@@ -30,10 +30,10 @@
 #ifndef _TSIP_HEADER_P_ASSERTED_IDENTITY_H_
 #define _TSIP_HEADER_P_ASSERTED_IDENTITY_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
-#include "tinysip/tsip_uri.h"
+#include "tinySIP/tsip_uri.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Associated_URI.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Associated_URI.h
index 2c67bb91..73188481 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Associated_URI.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Associated_URI.h
@@ -30,10 +30,10 @@
 #ifndef _TSIP_HEADER_P_ASSOCIATED_URI_H_
 #define _TSIP_HEADER_P_ASSOCIATED_URI_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
-#include "tinysip/tsip_uri.h"
+#include "tinySIP/tsip_uri.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Called_Party_ID.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Called_Party_ID.h
index 583fb4f2..21398040 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Called_Party_ID.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Called_Party_ID.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_CALLED_PARTY_ID_H_
 #define _TSIP_HEADER_P_CALLED_PARTY_ID_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Function_Addresses.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Function_Addresses.h
index e9dbabda..8654593f 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Function_Addresses.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Function_Addresses.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_CHARGING_FUNCTION_ADDRESSES_H_
 #define _TSIP_HEADER_P_CHARGING_FUNCTION_ADDRESSES_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Vector.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Vector.h
index ff388324..a4825431 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Vector.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Vector.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_CHARGING_VECTOR_H_
 #define _TSIP_HEADER_P_CHARGING_VECTOR_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Billing_Info.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Billing_Info.h
index b2724a5a..fb661d59 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Billing_Info.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Billing_Info.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_DCS_BILLING_INFO_H_
 #define _TSIP_HEADER_P_DCS_BILLING_INFO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_LAES.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_LAES.h
index 2a9a5538..13e5d532 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_LAES.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_LAES.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_DCS_LAES_H_
 #define _TSIP_HEADER_P_DCS_LAES_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_OSPS.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_OSPS.h
index 87bbf244..90ab6878 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_OSPS.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_OSPS.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_DCS_OSPS_H_
 #define _TSIP_HEADER_P_DCS_OSPS_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Redirect.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Redirect.h
index c8fcd5d1..b5d09aed 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Redirect.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Redirect.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_DCS_REDIRECT_H_
 #define _TSIP_HEADER_P_DCS_REDIRECT_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Trace_Party_ID.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Trace_Party_ID.h
index 85dfa243..c3d3bbd8 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Trace_Party_ID.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Trace_Party_ID.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_DCS_TRACE_PARTY_ID_H_
 #define _TSIP_HEADER_P_DCS_TRACE_PARTY_ID_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Early_Media.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Early_Media.h
index 5a39164c..89835535 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Early_Media.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Early_Media.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_EARLY_MEDIA_H_
 #define _TSIP_HEADER_P_EARLY_MEDIA_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Media_Authorization.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Media_Authorization.h
index b5a15d36..3c6b4f61 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Media_Authorization.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Media_Authorization.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_MEDIA_AUTHORIZATION_H_
 #define _TSIP_HEADER_P_MEDIA_AUTHORIZATION_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Preferred_Identity.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Preferred_Identity.h
index 548d2af5..347c421a 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Preferred_Identity.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Preferred_Identity.h
@@ -30,9 +30,9 @@
 #ifndef _TSIP_HEADER_P_PREFERRED_IDENTITY_H_
 #define _TSIP_HEADER_P_PREFERRED_IDENTITY_H_
 
-#include "tinysip_config.h"
-#include "tinysip/tsip_uri.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/tsip_uri.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Profile_Key.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Profile_Key.h
index e86a3d65..09dfaa1f 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Profile_Key.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Profile_Key.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_PROFILE_KEY_H_
 #define _TSIP_HEADER_P_PROFILE_KEY_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_User_Database.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_User_Database.h
index 0b816efd..2d4a081d 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_User_Database.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_User_Database.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_USER_DATABASE_H_
 #define _TSIP_HEADER_P_USER_DATABASE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Visited_Network_ID.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Visited_Network_ID.h
index b77836d7..bd62b8c2 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Visited_Network_ID.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_P_Visited_Network_ID.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_P_VISITED_NETWORK_ID_H_
 #define _TSIP_HEADER_P_VISITED_NETWORK_ID_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Path.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Path.h
index 6ed27c73..b31e29f1 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Path.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Path.h
@@ -30,10 +30,10 @@
 #ifndef _TSIP_HEADER_PATH_H_
 #define _TSIP_HEADER_PATH_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
-#include "tinysip/tsip_uri.h"
+#include "tinySIP/tsip_uri.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Priority.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Priority.h
index a2163d0e..93cd51dd 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Priority.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Priority.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_PRIORITY_H_
 #define _TSIP_HEADER_PRIORITY_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Privacy.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Privacy.h
index 43c04e45..17485fab 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Privacy.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Privacy.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_PRIVACY_H_
 #define _TSIP_HEADER_PRIVACY_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authenticate.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authenticate.h
index b30d24b7..9422ed9f 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authenticate.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authenticate.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_PROXY_AUTHENTICATE_H_
 #define _TSIP_HEADER_PROXY_AUTHENTICATE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authorization.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authorization.h
index 0461fc86..94bef943 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authorization.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authorization.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_PROXY_AUTHORIZATION_H_
 #define _TSIP_HEADER_PROXY_AUTHORIZATION_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Require.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Require.h
index a43c76ad..9a7de300 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Require.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Proxy_Require.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_PROXY_REQUIRE_H_
 #define _TSIP_HEADER_PROXY_REQUIRE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_RAck.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_RAck.h
index e6bf125e..01828d49 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_RAck.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_RAck.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_RACK_H_
 #define _TSIP_HEADER_RACK_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_RSeq.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_RSeq.h
index 8eaf499f..c23c79c2 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_RSeq.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_RSeq.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_RSEQ_H_
 #define _TSIP_HEADER_RSEQ_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Reason.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Reason.h
index 16e379e6..8dd5556a 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Reason.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Reason.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_REASON_H_
 #define _TSIP_HEADER_REASON_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Record_Route.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Record_Route.h
index dce97212..5a9e2c97 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Record_Route.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Record_Route.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_RECORD_ROUTE_H_
 #define _TSIP_HEADER_RECORD_ROUTE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Refer_Sub.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Refer_Sub.h
index c92112b2..0f402a29 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Refer_Sub.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Refer_Sub.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_REFER_SUB_H_
 #define _TSIP_HEADER_REFER_SUB_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Refer_To.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Refer_To.h
index e47c4d70..248551cf 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Refer_To.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Refer_To.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_REFER_TO_H_
 #define _TSIP_HEADER_REFER_TO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Referred_By.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Referred_By.h
index 8e8cada3..bf6bbc92 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Referred_By.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Referred_By.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_REFERRED_BY_H_
 #define _TSIP_HEADER_REFERRED_BY_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Reject_Contact.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Reject_Contact.h
index 4597e6b3..57bfb031 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Reject_Contact.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Reject_Contact.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_REJECT_CONTACT_H_
 #define _TSIP_HEADER_REJECT_CONTACT_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Replaces.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Replaces.h
index bbf61c1f..c04f8719 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Replaces.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Replaces.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_REPLACES_H_
 #define _TSIP_HEADER_REPLACES_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Reply_To.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Reply_To.h
index cc8b856e..3564667b 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Reply_To.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Reply_To.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_REPLY_TO_H_
 #define _TSIP_HEADER_REPLY_TO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Request_Disposition.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Request_Disposition.h
index b7861f7b..66fb4614 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Request_Disposition.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Request_Disposition.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_REQUEST_DISPOSITION_H_
 #define _TSIP_HEADER_REQUEST_DISPOSITION_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Require.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Require.h
index 87ae9765..f3ae1ff7 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Require.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Require.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_REQUIRE_H_
 #define _TSIP_HEADER_REQUIRE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Resource_Priority.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Resource_Priority.h
index 59feb8a2..d3562d81 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Resource_Priority.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Resource_Priority.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_RESOURCE_PRIORITY_H_
 #define _TSIP_HEADER_RESOURCE_PRIORITY_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Retry_After.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Retry_After.h
index 3e17a094..96565176 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Retry_After.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Retry_After.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_RETRY_AFTER_H_
 #define _TSIP_HEADER_RETRY_AFTER_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Route.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Route.h
index fe078dfb..9fc8517b 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Route.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Route.h
@@ -30,10 +30,10 @@
 #ifndef _TSIP_HEADER_ROUTE_H_
 #define _TSIP_HEADER_ROUTE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
-#include "tinysip/tsip_uri.h"
+#include "tinySIP/tsip_uri.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.h
index 8a6a78fb..d6486df7 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_SIP_ETAG_H_
 #define _TSIP_HEADER_SIP_ETAG_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.h
index dfeb917b..5883a95d 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_SIP_IF_MATCH_H_
 #define _TSIP_HEADER_SIP_IF_MATCH_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Client.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Client.h
index 55a4fe94..05b1cb34 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Client.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Client.h
@@ -28,8 +28,8 @@
 #ifndef _TSIP_HEADER_SECURITY_CLIENT_H_
 #define _TSIP_HEADER_SECURITY_CLIENT_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 #include "tnet_types.h"
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Server.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Server.h
index f17d2276..23133d8d 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Server.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Server.h
@@ -28,8 +28,8 @@
 #ifndef _TSIP_HEADER_SECURITY_SERVER_H_
 #define _TSIP_HEADER_SECURITY_SERVER_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 #include "tnet_types.h"
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Verify.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Verify.h
index 0b4602d3..379e489f 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Verify.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Security_Verify.h
@@ -28,8 +28,8 @@
 #ifndef _TSIP_HEADER_SECURITY_VERIFY_H_
 #define _TSIP_HEADER_SECURITY_VERIFY_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 #include "tnet_types.h"
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Server.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Server.h
index 0b5b0f1e..5034c5ba 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Server.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Server.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_SERVER_H_
 #define _TSIP_HEADER_SERVER_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Service_Route.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Service_Route.h
index 3467e825..37cc3512 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Service_Route.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Service_Route.h
@@ -30,10 +30,10 @@
 #ifndef _TSIP_HEADER_SERVICE_ROUTE_H_
 #define _TSIP_HEADER_SERVICE_ROUTE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
-#include "tinysip/tsip_uri.h"
+#include "tinySIP/tsip_uri.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Session_Expires.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Session_Expires.h
index 31c1b12d..9e8634f4 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Session_Expires.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Session_Expires.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_SESSION_EXPIRES_H_
 #define _TSIP_HEADER_SESSION_EXPIRES_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Subject.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Subject.h
index 59cc6642..6fcef32c 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Subject.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Subject.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_SUBJECT_H_
 #define _TSIP_HEADER_SUBJECT_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Subscription_State.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Subscription_State.h
index b3a9b88b..f4489bc6 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Subscription_State.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Subscription_State.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_SUBSCRIPTION_STATE_H_
 #define _TSIP_HEADER_SUBSCRIPTION_STATE_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Supported.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Supported.h
index 4ef8351a..609e3649 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Supported.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Supported.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_SUPPORTED_H_
 #define _TSIP_HEADER_SUPPORTED_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Target_Dialog.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Target_Dialog.h
index 8815ecc1..d602eee1 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Target_Dialog.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Target_Dialog.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_TARGET_DIALOG_H_
 #define _TSIP_HEADER_TARGET_DIALOG_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Timestamp.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Timestamp.h
index 886f8a65..3aaa9855 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Timestamp.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Timestamp.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_TIMESTAMP_H_
 #define _TSIP_HEADER_TIMESTAMP_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_To.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_To.h
index dc9238cf..2b793b5d 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_To.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_To.h
@@ -30,9 +30,9 @@
 #ifndef _TSIP_HEADER_TO_H_
 #define _TSIP_HEADER_TO_H_
 
-#include "tinysip_config.h"
-#include "tinysip/tsip_uri.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/tsip_uri.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Unsupported.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Unsupported.h
index 861455a9..14e14e76 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Unsupported.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Unsupported.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_UNSUPPORTED_H_
 #define _TSIP_HEADER_UNSUPPORTED_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_User_Agent.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_User_Agent.h
index a31d5ac2..f1fe9f8e 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_User_Agent.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_User_Agent.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_USER_AGENT_H_
 #define _TSIP_HEADER_USER_AGENT_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Via.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Via.h
index 1ce88978..2e18b6e6 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Via.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Via.h
@@ -30,8 +30,8 @@
 #ifndef TINYSIP_HEADER_VIA_H
 #define TINYSIP_HEADER_VIA_H
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 #include "tsk_object.h"
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_WWW_Authenticate.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_WWW_Authenticate.h
index 3844fdd5..957dfe2d 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_WWW_Authenticate.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_WWW_Authenticate.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_WWW_Authenticate_H_
 #define _TSIP_HEADER_WWW_Authenticate_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_Warning.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_Warning.h
index 0f7beb54..61fcf4a7 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_Warning.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_Warning.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_WARNING_H_
 #define _TSIP_HEADER_WARNING_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_header_accept.h b/trunk/tinySIP/include/tinysip/headers/tsip_header_accept.h
index 6aa764ab..3fb629d9 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_header_accept.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_header_accept.h
@@ -30,8 +30,8 @@
 #ifndef _TSIP_HEADER_ACCEPT_H_
 #define _TSIP_HEADER_ACCEPT_H_
 
-#include "tinysip_config.h"
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP_config.h"
+#include "tinySIP/headers/tsip_header.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/headers/tsip_headers.h b/trunk/tinySIP/include/tinysip/headers/tsip_headers.h
index a2091180..8a3a42b4 100644
--- a/trunk/tinySIP/include/tinysip/headers/tsip_headers.h
+++ b/trunk/tinySIP/include/tinysip/headers/tsip_headers.h
@@ -30,9 +30,9 @@
 #ifndef TINYSIP_HEADERS_H
 #define TINYSIP_HEADERS_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/headers/tsip_header_accept.h"
+#include "tinySIP/headers/tsip_header_accept.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/parsers/tsip_parser_header.h b/trunk/tinySIP/include/tinysip/parsers/tsip_parser_header.h
index a9d28c0a..0a317a28 100644
--- a/trunk/tinySIP/include/tinysip/parsers/tsip_parser_header.h
+++ b/trunk/tinySIP/include/tinysip/parsers/tsip_parser_header.h
@@ -30,8 +30,8 @@
 #ifndef TINYSIP_PARSER_HEADERS_H
 #define TINYSIP_PARSER_HEADERS_H
 
-#include "tinysip_config.h"
-#include "tinysip/tsip_message.h"
+#include "tinySIP_config.h"
+#include "tinySIP/tsip_message.h"
 #include "tsk_ragel_state.h"
 
 TSIP_BEGIN_DECLS
diff --git a/trunk/tinySIP/include/tinysip/parsers/tsip_parser_message.h b/trunk/tinySIP/include/tinysip/parsers/tsip_parser_message.h
index 0c572f88..4d3cdca3 100644
--- a/trunk/tinySIP/include/tinysip/parsers/tsip_parser_message.h
+++ b/trunk/tinySIP/include/tinysip/parsers/tsip_parser_message.h
@@ -30,8 +30,8 @@
 #ifndef TINYSIP_PARSER_MESSAGE_H
 #define TINYSIP_PARSER_MESSAGE_H
 
-#include "tinysip_config.h"
-#include "tinysip/tsip_message.h"
+#include "tinySIP_config.h"
+#include "tinySIP/tsip_message.h"
 #include "tsk_ragel_state.h"
 
 TSIP_BEGIN_DECLS
diff --git a/trunk/tinySIP/include/tinysip/parsers/tsip_parser_uri.h b/trunk/tinySIP/include/tinysip/parsers/tsip_parser_uri.h
index 78e54c6b..3ea91f72 100644
--- a/trunk/tinySIP/include/tinysip/parsers/tsip_parser_uri.h
+++ b/trunk/tinySIP/include/tinysip/parsers/tsip_parser_uri.h
@@ -30,8 +30,8 @@
 #ifndef TINYSIP_PARSER_URI_H
 #define TINYSIP_PARSER_URI_H
 
-#include "tinysip_config.h"
-#include "tinysip/tsip_uri.h"
+#include "tinySIP_config.h"
+#include "tinySIP/tsip_uri.h"
 
 #include "tsk_ragel_state.h"
 
diff --git a/trunk/tinySIP/include/tinysip/transactions/tsip_transac.h b/trunk/tinySIP/include/tinysip/transactions/tsip_transac.h
index e1e1a00d..bb94c631 100644
--- a/trunk/tinySIP/include/tinysip/transactions/tsip_transac.h
+++ b/trunk/tinySIP/include/tinysip/transactions/tsip_transac.h
@@ -30,13 +30,13 @@
 #ifndef TINYSIP_TRANSAC_H
 #define TINYSIP_TRANSAC_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 #include "tsip.h"
-#include "tinysip/tsip_timers.h"
-#include "tinysip/tsip_message.h"
+#include "tinySIP/tsip_timers.h"
+#include "tinySIP/tsip_message.h"
 
-#include "tinysip/dialogs/tsip_dialog.h"
+#include "tinySIP/dialogs/tsip_dialog.h"
 
 #include "tsk_safeobj.h"
 #include "tsk_list.h"
diff --git a/trunk/tinySIP/include/tinysip/transactions/tsip_transac_ict.h b/trunk/tinySIP/include/tinysip/transactions/tsip_transac_ict.h
index 038436b9..b7eed5c4 100644
--- a/trunk/tinySIP/include/tinysip/transactions/tsip_transac_ict.h
+++ b/trunk/tinySIP/include/tinysip/transactions/tsip_transac_ict.h
@@ -30,8 +30,8 @@
 #ifndef TINYSIP_TRANSAC_ICT_H
 #define TINYSIP_TRANSAC_ICT_H
 
-#include "tinysip_config.h"
-#include "tinysip/transactions/tsip_transac.h"
+#include "tinySIP_config.h"
+#include "tinySIP/transactions/tsip_transac.h"
 
 #include "tsk_fsm.h"
 
diff --git a/trunk/tinySIP/include/tinysip/transactions/tsip_transac_ist.h b/trunk/tinySIP/include/tinysip/transactions/tsip_transac_ist.h
index 21dc4037..08540cbb 100644
--- a/trunk/tinySIP/include/tinysip/transactions/tsip_transac_ist.h
+++ b/trunk/tinySIP/include/tinysip/transactions/tsip_transac_ist.h
@@ -30,8 +30,8 @@
 #ifndef TINYSIP_TRANSAC_IST_H
 #define TINYSIP_TRANSAC_IST_H
 
-#include "tinysip_config.h"
-#include "tinysip/transactions/tsip_transac.h"
+#include "tinySIP_config.h"
+#include "tinySIP/transactions/tsip_transac.h"
 
 #include "tsk_fsm.h"
 
diff --git a/trunk/tinySIP/include/tinysip/transactions/tsip_transac_layer.h b/trunk/tinySIP/include/tinysip/transactions/tsip_transac_layer.h
index f86de7f0..515cbf12 100644
--- a/trunk/tinySIP/include/tinysip/transactions/tsip_transac_layer.h
+++ b/trunk/tinySIP/include/tinysip/transactions/tsip_transac_layer.h
@@ -30,10 +30,10 @@
 #ifndef TINYSIP_TRANSAC_LAYER_H
 #define TINYSIP_TRANSAC_LAYER_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 #include "tsip.h"
-#include "tinysip/transactions/tsip_transac.h"
+#include "tinySIP/transactions/tsip_transac.h"
 
 #include "tsk_safeobj.h"
 #include "tsk_list.h"
diff --git a/trunk/tinySIP/include/tinysip/transactions/tsip_transac_nict.h b/trunk/tinySIP/include/tinysip/transactions/tsip_transac_nict.h
index 835edcee..cfd10782 100644
--- a/trunk/tinySIP/include/tinysip/transactions/tsip_transac_nict.h
+++ b/trunk/tinySIP/include/tinysip/transactions/tsip_transac_nict.h
@@ -30,10 +30,10 @@
 #ifndef TINYSIP_TRANSAC_NICT_H
 #define TINYSIP_TRANSAC_NICT_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/transactions/tsip_transac.h"
-#include "tinysip/tsip_message.h"
+#include "tinySIP/transactions/tsip_transac.h"
+#include "tinySIP/tsip_message.h"
 
 #include "tsk_fsm.h"
 
diff --git a/trunk/tinySIP/include/tinysip/transactions/tsip_transac_nist.h b/trunk/tinySIP/include/tinysip/transactions/tsip_transac_nist.h
index 76e7b264..6be77492 100644
--- a/trunk/tinySIP/include/tinysip/transactions/tsip_transac_nist.h
+++ b/trunk/tinySIP/include/tinysip/transactions/tsip_transac_nist.h
@@ -30,10 +30,10 @@
 #ifndef TINYSIP_TRANSAC_NIST_H
 #define TINYSIP_TRANSAC_NIST_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/transactions/tsip_transac.h"
-#include "tinysip/tsip_message.h"
+#include "tinySIP/transactions/tsip_transac.h"
+#include "tinySIP/tsip_message.h"
 
 #include "tsk_fsm.h"
 
diff --git a/trunk/tinySIP/include/tinysip/transports/tsip_transport.h b/trunk/tinySIP/include/tinysip/transports/tsip_transport.h
index a36d2282..fd0c41f6 100644
--- a/trunk/tinySIP/include/tinysip/transports/tsip_transport.h
+++ b/trunk/tinySIP/include/tinysip/transports/tsip_transport.h
@@ -30,11 +30,11 @@
 #ifndef TINYSIP_TRANSPORT_H
 #define TINYSIP_TRANSPORT_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 #include "tsip.h"
 
-#include "tinysip/tsip_message.h"
+#include "tinySIP/tsip_message.h"
 
 #include "tnet_transport.h"
 
diff --git a/trunk/tinySIP/include/tinysip/transports/tsip_transport_ipsec.h b/trunk/tinySIP/include/tinysip/transports/tsip_transport_ipsec.h
index 2203be47..4e43f8e3 100644
--- a/trunk/tinySIP/include/tinysip/transports/tsip_transport_ipsec.h
+++ b/trunk/tinySIP/include/tinysip/transports/tsip_transport_ipsec.h
@@ -30,11 +30,11 @@
 #ifndef TINYSIP_TRANSPORT_IPSEC_H
 #define TINYSIP_TRANSPORT_IPSEC_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/transports/tsip_transport.h"
+#include "tinySIP/transports/tsip_transport.h"
 
-#include "tinysip/headers/tsip_header_Security_Verify.h"
+#include "tinySIP/headers/tsip_header_Security_Verify.h"
 
 #include "tipsec.h"
 
diff --git a/trunk/tinySIP/include/tinysip/transports/tsip_transport_layer.h b/trunk/tinySIP/include/tinysip/transports/tsip_transport_layer.h
index 05b30abf..1226da83 100644
--- a/trunk/tinySIP/include/tinysip/transports/tsip_transport_layer.h
+++ b/trunk/tinySIP/include/tinysip/transports/tsip_transport_layer.h
@@ -30,10 +30,10 @@
 #ifndef TINYSIP_TRANSPORT_LAYER_H
 #define TINYSIP_TRANSPORT_LAYER_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/transports/tsip_transport.h"
-#include "tinysip/tsip_message.h"
+#include "tinySIP/transports/tsip_transport.h"
+#include "tinySIP/tsip_message.h"
 #include "tsip.h"
 
 #include "tipsec.h"
diff --git a/trunk/tinySIP/include/tinysip/transports/tsip_transport_tls.h b/trunk/tinySIP/include/tinysip/transports/tsip_transport_tls.h
index 0797ba96..f3273862 100644
--- a/trunk/tinySIP/include/tinysip/transports/tsip_transport_tls.h
+++ b/trunk/tinySIP/include/tinysip/transports/tsip_transport_tls.h
@@ -30,9 +30,9 @@
 #ifndef TINYSIP_TRANSPORT_TLS_H
 #define TINYSIP_TRANSPORT_TLS_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/transports/tsip_transport.h"
+#include "tinySIP/transports/tsip_transport.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/tsip_event.h b/trunk/tinySIP/include/tinysip/tsip_event.h
index afcc6034..416836d1 100644
--- a/trunk/tinySIP/include/tinysip/tsip_event.h
+++ b/trunk/tinySIP/include/tinysip/tsip_event.h
@@ -30,9 +30,9 @@
 #ifndef TINYSIP_TSIP_EVENT_H
 #define TINYSIP_TSIP_EVENT_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/tsip_operation.h"
+#include "tinySIP/tsip_operation.h"
 
 TSIP_BEGIN_DECLS
 
diff --git a/trunk/tinySIP/include/tinysip/tsip_message.h b/trunk/tinySIP/include/tinysip/tsip_message.h
index 58a0e7cc..795e4b10 100644
--- a/trunk/tinySIP/include/tinysip/tsip_message.h
+++ b/trunk/tinySIP/include/tinysip/tsip_message.h
@@ -31,18 +31,18 @@
 #ifndef TSIP_MESSAGE_H
 #define TSIP_MESSAGE_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/headers/tsip_header_Call_ID.h"
-#include "tinysip/headers/tsip_header_Contact.h"
-#include "tinysip/headers/tsip_header_Content_Length.h"
-#include "tinysip/headers/tsip_header_Content_Type.h"
-#include "tinysip/headers/tsip_header_CSeq.h"
-#include "tinysip/headers/tsip_header_Expires.h"
-#include "tinysip/headers/tsip_header_From.h"
-#include "tinysip/headers/tsip_header_P_Access_Network_Info.h"
-#include "tinysip/headers/tsip_header_To.h"
-#include "tinysip/headers/tsip_header_Via.h"
+#include "tinySIP/headers/tsip_header_Call_ID.h"
+#include "tinySIP/headers/tsip_header_Contact.h"
+#include "tinySIP/headers/tsip_header_Content_Length.h"
+#include "tinySIP/headers/tsip_header_Content_Type.h"
+#include "tinySIP/headers/tsip_header_CSeq.h"
+#include "tinySIP/headers/tsip_header_Expires.h"
+#include "tinySIP/headers/tsip_header_From.h"
+#include "tinySIP/headers/tsip_header_P_Access_Network_Info.h"
+#include "tinySIP/headers/tsip_header_To.h"
+#include "tinySIP/headers/tsip_header_Via.h"
 
 #include "tnet_types.h"
 
diff --git a/trunk/tinySIP/include/tinysip/tsip_operation.h b/trunk/tinySIP/include/tinysip/tsip_operation.h
index e1241b53..a78356e3 100644
--- a/trunk/tinySIP/include/tinysip/tsip_operation.h
+++ b/trunk/tinySIP/include/tinysip/tsip_operation.h
@@ -30,7 +30,7 @@
 #ifndef TSIP_OPERATION_H
 #define TSIP_OPERATION_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 #include "tsk_object.h"
 #include "tsk_list.h"
diff --git a/trunk/tinySIP/include/tinysip/tsip_timers.h b/trunk/tinySIP/include/tinysip/tsip_timers.h
index 6fd86f35..55c319a3 100644
--- a/trunk/tinySIP/include/tinysip/tsip_timers.h
+++ b/trunk/tinySIP/include/tinysip/tsip_timers.h
@@ -30,7 +30,7 @@
 #ifndef TINYSIP_TIMERS_H
 #define TINYSIP_TIMERS_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 #include "tsk_timer.h"
 
diff --git a/trunk/tinySIP/include/tinysip/tsip_uri.h b/trunk/tinySIP/include/tinysip/tsip_uri.h
index 7fcf7e68..5a4bd6f2 100644
--- a/trunk/tinySIP/include/tinysip/tsip_uri.h
+++ b/trunk/tinySIP/include/tinysip/tsip_uri.h
@@ -30,7 +30,7 @@
 #ifndef TINYSIP_URI_H
 #define TINYSIP_URI_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
 #include "tsk_object.h"
 #include "tsk_params.h"
diff --git a/trunk/tinySIP/include/tsip.h b/trunk/tinySIP/include/tsip.h
index 02bbb0f6..42603c93 100644
--- a/trunk/tinySIP/include/tsip.h
+++ b/trunk/tinySIP/include/tsip.h
@@ -30,13 +30,13 @@
 #ifndef TINYSIP_TSIP_H
 #define TINYSIP_TSIP_H
 
-#include "tinysip_config.h"
+#include "tinySIP_config.h"
 
-#include "tinysip/tsip_operation.h"
-#include "tinysip/tsip_timers.h"
-#include "tinysip/tsip_event.h"
+#include "tinySIP/tsip_operation.h"
+#include "tinySIP/tsip_timers.h"
+#include "tinySIP/tsip_event.h"
 
-#include "tinysip/tsip_uri.h"
+#include "tinySIP/tsip_uri.h"
 
 #include "tnet_socket.h"
 #include "dns/tnet_dns.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header.rl b/trunk/tinySIP/ragel/tsip_parser_header.rl
index 08cce51e..6c35cdc6 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header.rl
@@ -27,47 +27,47 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/parsers/tsip_parser_header.h"
+#include "tinySIP/parsers/tsip_parser_header.h"
 
-#include "tinysip/headers/tsip_header_Allow.h"
-#include "tinysip/headers/tsip_header_Allow_Events.h"
-#include "tinysip/headers/tsip_header_Authorization.h"
-#include "tinysip/headers/tsip_header_Call_ID.h"
-#include "tinysip/headers/tsip_header_Contact.h"
-#include "tinysip/headers/tsip_header_CSeq.h"
-#include "tinysip/headers/tsip_header_Dummy.h"
-#include "tinysip/headers/tsip_header_Event.h"
-#include "tinysip/headers/tsip_header_Expires.h"
-#include "tinysip/headers/tsip_header_From.h"
-#include "tinysip/headers/tsip_header_Max_Forwards.h"
-#include "tinysip/headers/tsip_header_Min_Expires.h"
-#include "tinysip/headers/tsip_header_Path.h"
-#include "tinysip/headers/tsip_header_P_Access_Network_Info.h" 
-#include "tinysip/headers/tsip_header_P_Asserted_Identity.h"
-#include "tinysip/headers/tsip_header_P_Associated_URI.h"
-#include "tinysip/headers/tsip_header_P_Charging_Function_Addresses.h"
-#include "tinysip/headers/tsip_header_P_Preferred_Identity.h"
-#include "tinysip/headers/tsip_header_Privacy.h"
-#include "tinysip/headers/tsip_header_Proxy_Authenticate.h"
-#include "tinysip/headers/tsip_header_Proxy_Authorization.h"
-#include "tinysip/headers/tsip_header_Proxy_Require.h"
-#include "tinysip/headers/tsip_header_Record_Route.h"
-#include "tinysip/headers/tsip_header_Require.h"
-#include "tinysip/headers/tsip_header_Route.h"
-#include "tinysip/headers/tsip_header_Security_Client.h"
-#include "tinysip/headers/tsip_header_Security_Server.h"
-#include "tinysip/headers/tsip_header_Security_Verify.h"
-#include "tinysip/headers/tsip_header_Server.h"
-#include "tinysip/headers/tsip_header_Service_Route.h"
-#include "tinysip/headers/tsip_header_SIP_ETag.h"
-#include "tinysip/headers/tsip_header_SIP_If_Match.h"
-#include "tinysip/headers/tsip_header_Subscription_State.h"
-#include "tinysip/headers/tsip_header_Supported.h"
-#include "tinysip/headers/tsip_header_To.h"
-#include "tinysip/headers/tsip_header_User_Agent.h"
-#include "tinysip/headers/tsip_header_Via.h"
-#include "tinysip/headers/tsip_header_Warning.h"
-#include "tinysip/headers/tsip_header_WWW_Authenticate.h"
+#include "tinySIP/headers/tsip_header_Allow.h"
+#include "tinySIP/headers/tsip_header_Allow_Events.h"
+#include "tinySIP/headers/tsip_header_Authorization.h"
+#include "tinySIP/headers/tsip_header_Call_ID.h"
+#include "tinySIP/headers/tsip_header_Contact.h"
+#include "tinySIP/headers/tsip_header_CSeq.h"
+#include "tinySIP/headers/tsip_header_Dummy.h"
+#include "tinySIP/headers/tsip_header_Event.h"
+#include "tinySIP/headers/tsip_header_Expires.h"
+#include "tinySIP/headers/tsip_header_From.h"
+#include "tinySIP/headers/tsip_header_Max_Forwards.h"
+#include "tinySIP/headers/tsip_header_Min_Expires.h"
+#include "tinySIP/headers/tsip_header_Path.h"
+#include "tinySIP/headers/tsip_header_P_Access_Network_Info.h" 
+#include "tinySIP/headers/tsip_header_P_Asserted_Identity.h"
+#include "tinySIP/headers/tsip_header_P_Associated_URI.h"
+#include "tinySIP/headers/tsip_header_P_Charging_Function_Addresses.h"
+#include "tinySIP/headers/tsip_header_P_Preferred_Identity.h"
+#include "tinySIP/headers/tsip_header_Privacy.h"
+#include "tinySIP/headers/tsip_header_Proxy_Authenticate.h"
+#include "tinySIP/headers/tsip_header_Proxy_Authorization.h"
+#include "tinySIP/headers/tsip_header_Proxy_Require.h"
+#include "tinySIP/headers/tsip_header_Record_Route.h"
+#include "tinySIP/headers/tsip_header_Require.h"
+#include "tinySIP/headers/tsip_header_Route.h"
+#include "tinySIP/headers/tsip_header_Security_Client.h"
+#include "tinySIP/headers/tsip_header_Security_Server.h"
+#include "tinySIP/headers/tsip_header_Security_Verify.h"
+#include "tinySIP/headers/tsip_header_Server.h"
+#include "tinySIP/headers/tsip_header_Service_Route.h"
+#include "tinySIP/headers/tsip_header_SIP_ETag.h"
+#include "tinySIP/headers/tsip_header_SIP_If_Match.h"
+#include "tinySIP/headers/tsip_header_Subscription_State.h"
+#include "tinySIP/headers/tsip_header_Supported.h"
+#include "tinySIP/headers/tsip_header_To.h"
+#include "tinySIP/headers/tsip_header_User_Agent.h"
+#include "tinySIP/headers/tsip_header_Via.h"
+#include "tinySIP/headers/tsip_header_Warning.h"
+#include "tinySIP/headers/tsip_header_WWW_Authenticate.h"
 
 #include "tsk_debug.h"
 
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Allow.rl b/trunk/tinySIP/ragel/tsip_parser_header_Allow.rl
index b99e3cdc..0efc9068 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Allow.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Allow.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Allow.h"
+#include "tinySIP/headers/tsip_header_Allow.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Allow_Events.rl b/trunk/tinySIP/ragel/tsip_parser_header_Allow_Events.rl
index 34565006..44fe501d 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Allow_Events.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Allow_Events.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Allow_events.h"
+#include "tinySIP/headers/tsip_header_Allow_events.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Authorization.rl b/trunk/tinySIP/ragel/tsip_parser_header_Authorization.rl
index db477e45..3430cb46 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Authorization.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Authorization.rl
@@ -27,9 +27,9 @@
 // *
 // * @date Created: Sat Nov 8 16:54:58 2009 mdiop
 // */
-//#include "tinysip/headers/tsip_header_Authorization.h"
+//#include "tinySIP/headers/tsip_header_Authorization.h"
 //
-//#include "tinysip/parsers/tsip_parser_uri.h"
+//#include "tinySIP/parsers/tsip_parser_uri.h"
 //
 //#include "tsk_debug.h"
 //#include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_CSeq.rl b/trunk/tinySIP/ragel/tsip_parser_header_CSeq.rl
index 4ded31e2..e2b86b66 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_CSeq.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_CSeq.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_CSeq.h"
+#include "tinySIP/headers/tsip_header_CSeq.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Call_ID.rl b/trunk/tinySIP/ragel/tsip_parser_header_Call_ID.rl
index 0634e1d2..009d70b6 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Call_ID.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Call_ID.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Call_ID.h"
+#include "tinySIP/headers/tsip_header_Call_ID.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Contact.rl b/trunk/tinySIP/ragel/tsip_parser_header_Contact.rl
index 21c998c1..13ec96a1 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Contact.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Contact.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Contact.h"
+#include "tinySIP/headers/tsip_header_Contact.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Content_Length.rl b/trunk/tinySIP/ragel/tsip_parser_header_Content_Length.rl
index 7edf522f..7880c064 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Content_Length.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Content_Length.rl
@@ -27,7 +27,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Content_Length.h"
+#include "tinySIP/headers/tsip_header_Content_Length.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Content_Type.rl b/trunk/tinySIP/ragel/tsip_parser_header_Content_Type.rl
index 7f6ef1fe..667110ac 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Content_Type.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Content_Type.rl
@@ -27,7 +27,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Content_Type.h"
+#include "tinySIP/headers/tsip_header_Content_Type.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Dummy.rl b/trunk/tinySIP/ragel/tsip_parser_header_Dummy.rl
index f460e910..b703da10 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Dummy.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Dummy.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Dummy.h"
+#include "tinySIP/headers/tsip_header_Dummy.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Event.rl b/trunk/tinySIP/ragel/tsip_parser_header_Event.rl
index e7d68140..4a2fa9c2 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Event.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Event.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Event.h"
+#include "tinySIP/headers/tsip_header_Event.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Expires.rl b/trunk/tinySIP/ragel/tsip_parser_header_Expires.rl
index 2228099d..b172a3da 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Expires.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Expires.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Expires.h"
+#include "tinySIP/headers/tsip_header_Expires.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_From.rl b/trunk/tinySIP/ragel/tsip_parser_header_From.rl
index 64a1d696..f101d8e2 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_From.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_From.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_From.h"
+#include "tinySIP/headers/tsip_header_From.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Max_Forwards.rl b/trunk/tinySIP/ragel/tsip_parser_header_Max_Forwards.rl
index 4422f120..9675cf70 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Max_Forwards.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Max_Forwards.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Max_Forwards.h"
+#include "tinySIP/headers/tsip_header_Max_Forwards.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Min_Expires.rl b/trunk/tinySIP/ragel/tsip_parser_header_Min_Expires.rl
index 21d13860..e29e980e 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Min_Expires.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Min_Expires.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Min_Expires.h"
+#include "tinySIP/headers/tsip_header_Min_Expires.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_P_Access_Network_Info.rl b/trunk/tinySIP/ragel/tsip_parser_header_P_Access_Network_Info.rl
index 79f5d3bb..971f1e46 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_P_Access_Network_Info.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_P_Access_Network_Info.rl
@@ -35,9 +35,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_P_Access_Network_Info.h"
+#include "tinySIP/headers/tsip_header_P_Access_Network_Info.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_P_Asserted_Identity.rl b/trunk/tinySIP/ragel/tsip_parser_header_P_Asserted_Identity.rl
index 59b0b6a5..6437d681 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_P_Asserted_Identity.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_P_Asserted_Identity.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_P_Asserted_Identity.h"
+#include "tinySIP/headers/tsip_header_P_Asserted_Identity.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_P_Associated_URI.rl b/trunk/tinySIP/ragel/tsip_parser_header_P_Associated_URI.rl
index e902192b..622f49e0 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_P_Associated_URI.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_P_Associated_URI.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_P_Associated_URI.h"
+#include "tinySIP/headers/tsip_header_P_Associated_URI.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_P_Charging_Function_Addresses.rl b/trunk/tinySIP/ragel/tsip_parser_header_P_Charging_Function_Addresses.rl
index 6f0bdcac..85b40fba 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_P_Charging_Function_Addresses.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_P_Charging_Function_Addresses.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_P_Charging_Function_Addresses.h"
+#include "tinySIP/headers/tsip_header_P_Charging_Function_Addresses.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_P_Preferred_Identity.rl b/trunk/tinySIP/ragel/tsip_parser_header_P_Preferred_Identity.rl
index e1600768..57d306cb 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_P_Preferred_Identity.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_P_Preferred_Identity.rl
@@ -35,9 +35,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_P_Preferred_Identity.h"
+#include "tinySIP/headers/tsip_header_P_Preferred_Identity.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Path.rl b/trunk/tinySIP/ragel/tsip_parser_header_Path.rl
index 733bcc7e..c5b5eaa3 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Path.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Path.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Path.h"
+#include "tinySIP/headers/tsip_header_Path.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Privacy.rl b/trunk/tinySIP/ragel/tsip_parser_header_Privacy.rl
index e81d3898..33ee8462 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Privacy.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Privacy.rl
@@ -35,9 +35,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Privacy.h"
+#include "tinySIP/headers/tsip_header_Privacy.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authenticate.rl b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authenticate.rl
index 8fe6f2c0..ecd35414 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authenticate.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authenticate.rl
@@ -27,9 +27,9 @@
 // *
 // * @date Created: Sat Nov 8 16:54:58 2009 mdiop
 // */
-//#include "tinysip/headers/tsip_header_Proxy_Authenticate.h"
+//#include "tinySIP/headers/tsip_header_Proxy_Authenticate.h"
 //
-//#include "tinysip/parsers/tsip_parser_uri.h"
+//#include "tinySIP/parsers/tsip_parser_uri.h"
 //
 //#include "tsk_debug.h"
 //#include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authorization.rl b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authorization.rl
index 9dafaeb9..7de05bab 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authorization.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Authorization.rl
@@ -27,9 +27,9 @@
 // *
 // * @date Created: Sat Nov 8 16:54:58 2009 mdiop
 // */
-//#include "tinysip/headers/tsip_header_Proxy_Authorization.h"
+//#include "tinySIP/headers/tsip_header_Proxy_Authorization.h"
 //
-//#include "tinysip/parsers/tsip_parser_uri.h"
+//#include "tinySIP/parsers/tsip_parser_uri.h"
 //
 //#include "tsk_debug.h"
 //#include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Require.rl b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Require.rl
index bdcf9700..d10ddc77 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Require.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Proxy_Require.rl
@@ -28,9 +28,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Proxy_Require.h"
+#include "tinySIP/headers/tsip_header_Proxy_Require.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Record_Route.rl b/trunk/tinySIP/ragel/tsip_parser_header_Record_Route.rl
index 66de5009..5248666c 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Record_Route.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Record_Route.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Record_Route.h"
+#include "tinySIP/headers/tsip_header_Record_Route.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Require.rl b/trunk/tinySIP/ragel/tsip_parser_header_Require.rl
index 61943f1f..d9ea090a 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Require.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Require.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Require.h"
+#include "tinySIP/headers/tsip_header_Require.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Route.rl b/trunk/tinySIP/ragel/tsip_parser_header_Route.rl
index 4a9a29b4..fc4db51b 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Route.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Route.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Route.h"
+#include "tinySIP/headers/tsip_header_Route.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_SIP_ETag.rl b/trunk/tinySIP/ragel/tsip_parser_header_SIP_ETag.rl
index de0c41cf..a7a0a095 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_SIP_ETag.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_SIP_ETag.rl
@@ -28,9 +28,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_SIP_ETag.h"
+#include "tinySIP/headers/tsip_header_SIP_ETag.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_SIP_If_Match.rl b/trunk/tinySIP/ragel/tsip_parser_header_SIP_If_Match.rl
index cf775fb6..5cf247d9 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_SIP_If_Match.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_SIP_If_Match.rl
@@ -28,9 +28,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_SIP_If_Match.h"
+#include "tinySIP/headers/tsip_header_SIP_If_Match.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Security_Client.rl b/trunk/tinySIP/ragel/tsip_parser_header_Security_Client.rl
index a125fb1a..1c7f510f 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Security_Client.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Security_Client.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Security_Client.h"
+#include "tinySIP/headers/tsip_header_Security_Client.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Security_Server.rl b/trunk/tinySIP/ragel/tsip_parser_header_Security_Server.rl
index 9c83c430..41dbf98a 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Security_Server.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Security_Server.rl
@@ -28,9 +28,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Security_Server.h"
+#include "tinySIP/headers/tsip_header_Security_Server.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Security_Verify.rl b/trunk/tinySIP/ragel/tsip_parser_header_Security_Verify.rl
index a5848ae6..78a7f589 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Security_Verify.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Security_Verify.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Security_Verify.h"
+#include "tinySIP/headers/tsip_header_Security_Verify.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Server.rl b/trunk/tinySIP/ragel/tsip_parser_header_Server.rl
index 96b08f0c..7a4209be 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Server.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Server.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Server.h"
+#include "tinySIP/headers/tsip_header_Server.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Service_Route.rl b/trunk/tinySIP/ragel/tsip_parser_header_Service_Route.rl
index 5a1d00fd..17a29114 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Service_Route.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Service_Route.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Service_Route.h"
+#include "tinySIP/headers/tsip_header_Service_Route.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Subscription_State.rl b/trunk/tinySIP/ragel/tsip_parser_header_Subscription_State.rl
index 03623cb9..b15ded11 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Subscription_State.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Subscription_State.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Subscription_State.h"
+#include "tinySIP/headers/tsip_header_Subscription_State.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Supported.rl b/trunk/tinySIP/ragel/tsip_parser_header_Supported.rl
index 7def960a..0a3aa592 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Supported.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Supported.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Supported.h"
+#include "tinySIP/headers/tsip_header_Supported.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_To.rl b/trunk/tinySIP/ragel/tsip_parser_header_To.rl
index 4d84e07f..c2ae5791 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_To.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_To.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_To.h"
+#include "tinySIP/headers/tsip_header_To.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_User_Agent.rl b/trunk/tinySIP/ragel/tsip_parser_header_User_Agent.rl
index dc29c8ad..b46fbc65 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_User_Agent.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_User_Agent.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_User_Agent.h"
+#include "tinySIP/headers/tsip_header_User_Agent.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Via.rl b/trunk/tinySIP/ragel/tsip_parser_header_Via.rl
index ffb4536e..4c6d20ba 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Via.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Via.rl
@@ -27,7 +27,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Via.h"
+#include "tinySIP/headers/tsip_header_Via.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_WWW_Authenticate.rl b/trunk/tinySIP/ragel/tsip_parser_header_WWW_Authenticate.rl
index dbd80f4f..fe60b08d 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_WWW_Authenticate.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_WWW_Authenticate.rl
@@ -27,9 +27,9 @@
 // *
 // * @date Created: Sat Nov 8 16:54:58 2009 mdiop
 // */
-//#include "tinysip/headers/tsip_header_WWW_Authenticate.h"
+//#include "tinySIP/headers/tsip_header_WWW_Authenticate.h"
 //
-//#include "tinysip/parsers/tsip_parser_uri.h"
+//#include "tinySIP/parsers/tsip_parser_uri.h"
 //
 //#include "tsk_debug.h"
 //#include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_header_Warning.rl b/trunk/tinySIP/ragel/tsip_parser_header_Warning.rl
index c95a9003..6b74d843 100644
--- a/trunk/tinySIP/ragel/tsip_parser_header_Warning.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_header_Warning.rl
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Warning.h"
+#include "tinySIP/headers/tsip_header_Warning.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_message.rl b/trunk/tinySIP/ragel/tsip_parser_message.rl
index b107942e..31fd4e84 100644
--- a/trunk/tinySIP/ragel/tsip_parser_message.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_message.rl
@@ -27,10 +27,10 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/parsers/tsip_parser_message.h"
-#include "tinysip/parsers/tsip_parser_header.h"
+#include "tinySIP/parsers/tsip_parser_message.h"
+#include "tinySIP/parsers/tsip_parser_header.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/ragel/tsip_parser_uri.rl b/trunk/tinySIP/ragel/tsip_parser_uri.rl
index 968d38d8..f92a66fa 100644
--- a/trunk/tinySIP/ragel/tsip_parser_uri.rl
+++ b/trunk/tinySIP/ragel/tsip_parser_uri.rl
@@ -27,7 +27,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_string.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/api/tsip_api_message.c b/trunk/tinySIP/src/api/tsip_api_message.c
index 7493a56a..a7dde2f0 100644
--- a/trunk/tinySIP/src/api/tsip_api_message.c
+++ b/trunk/tinySIP/src/api/tsip_api_message.c
@@ -27,10 +27,10 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/api/tsip_api_message.h"
+#include "tinySIP/api/tsip_api_message.h"
 
-#include "tinysip/dialogs/tsip_dialog_layer.h"
-#include "tinysip/dialogs/tsip_dialog_message.h"
+#include "tinySIP/dialogs/tsip_dialog_layer.h"
+#include "tinySIP/dialogs/tsip_dialog_message.h"
 
 #include "tsip.h"
 
diff --git a/trunk/tinySIP/src/api/tsip_api_publish.c b/trunk/tinySIP/src/api/tsip_api_publish.c
index 9318d0fe..f921ecde 100644
--- a/trunk/tinySIP/src/api/tsip_api_publish.c
+++ b/trunk/tinySIP/src/api/tsip_api_publish.c
@@ -27,10 +27,10 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/api/tsip_api_publish.h"
+#include "tinySIP/api/tsip_api_publish.h"
 
-#include "tinysip/dialogs/tsip_dialog_layer.h"
-#include "tinysip/dialogs/tsip_dialog_publish.h"
+#include "tinySIP/dialogs/tsip_dialog_layer.h"
+#include "tinySIP/dialogs/tsip_dialog_publish.h"
 
 #include "tsip.h"
 
diff --git a/trunk/tinySIP/src/api/tsip_api_register.c b/trunk/tinySIP/src/api/tsip_api_register.c
index 1d26da9f..a1d0b9ba 100644
--- a/trunk/tinySIP/src/api/tsip_api_register.c
+++ b/trunk/tinySIP/src/api/tsip_api_register.c
@@ -27,10 +27,10 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/api/tsip_api_register.h"
+#include "tinySIP/api/tsip_api_register.h"
 
-#include "tinysip/dialogs/tsip_dialog_layer.h"
-#include "tinysip/dialogs/tsip_dialog_register.h"
+#include "tinySIP/dialogs/tsip_dialog_layer.h"
+#include "tinySIP/dialogs/tsip_dialog_register.h"
 
 #include "tsip.h"
 
diff --git a/trunk/tinySIP/src/api/tsip_api_subscribe.c b/trunk/tinySIP/src/api/tsip_api_subscribe.c
index faccdbdc..6ae0e247 100644
--- a/trunk/tinySIP/src/api/tsip_api_subscribe.c
+++ b/trunk/tinySIP/src/api/tsip_api_subscribe.c
@@ -27,10 +27,10 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/api/tsip_api_subscribe.h"
+#include "tinySIP/api/tsip_api_subscribe.h"
 
-#include "tinysip/dialogs/tsip_dialog_layer.h"
-#include "tinysip/dialogs/tsip_dialog_subscribe.h"
+#include "tinySIP/dialogs/tsip_dialog_layer.h"
+#include "tinySIP/dialogs/tsip_dialog_subscribe.h"
 
 #include "tsip.h"
 
diff --git a/trunk/tinySIP/src/authentication/tsip_challenge.c b/trunk/tinySIP/src/authentication/tsip_challenge.c
index e69e201b..ade85c0f 100644
--- a/trunk/tinySIP/src/authentication/tsip_challenge.c
+++ b/trunk/tinySIP/src/authentication/tsip_challenge.c
@@ -27,10 +27,10 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/authentication/tsip_challenge.h"
+#include "tinySIP/authentication/tsip_challenge.h"
 
-#include "tinysip/headers/tsip_header_Authorization.h"
-#include "tinysip/headers/tsip_header_Proxy_Authorization.h"
+#include "tinySIP/headers/tsip_header_Authorization.h"
+#include "tinySIP/headers/tsip_header_Proxy_Authorization.h"
 
 #include "tsk_string.h"
 #include "tsk_debug.h"
diff --git a/trunk/tinySIP/src/authentication/tsip_milenage.c b/trunk/tinySIP/src/authentication/tsip_milenage.c
index ec4756ba..9e8ab0f5 100644
--- a/trunk/tinySIP/src/authentication/tsip_milenage.c
+++ b/trunk/tinySIP/src/authentication/tsip_milenage.c
@@ -53,8 +53,8 @@
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
 
-#include "tinysip/authentication/tsip_milenage.h"
-#include "tinysip/authentication/tsip_rijndael.h"
+#include "tinySIP/authentication/tsip_milenage.h"
+#include "tinySIP/authentication/tsip_rijndael.h"
 
 /*--------- Operator Variant Algorithm Configuration Field --------*/
 
diff --git a/trunk/tinySIP/src/authentication/tsip_rijndael.c b/trunk/tinySIP/src/authentication/tsip_rijndael.c
index 55436ad3..05779192 100644
--- a/trunk/tinySIP/src/authentication/tsip_rijndael.c
+++ b/trunk/tinySIP/src/authentication/tsip_rijndael.c
@@ -56,7 +56,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/authentication/tsip_rijndael.h"
+#include "tinySIP/authentication/tsip_rijndael.h"
 
 #if TSIP_UNDER_WINDOWS || defined(__SYMBIAN32__) || defined(__LITTLE_ENDIAN__)
 #	define LITTLE_ENDIAN	/* For INTEL architecture */
diff --git a/trunk/tinySIP/src/dialogs/tsip_dialog.c b/trunk/tinySIP/src/dialogs/tsip_dialog.c
index 9d6a7de6..c4b793c5 100644
--- a/trunk/tinySIP/src/dialogs/tsip_dialog.c
+++ b/trunk/tinySIP/src/dialogs/tsip_dialog.c
@@ -27,25 +27,25 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/dialogs/tsip_dialog.h"
+#include "tinySIP/dialogs/tsip_dialog.h"
 
-#include "tinysip/dialogs/tsip_dialog_layer.h"
-#include "tinysip/transactions/tsip_transac_layer.h"
+#include "tinySIP/dialogs/tsip_dialog_layer.h"
+#include "tinySIP/transactions/tsip_transac_layer.h"
 
-#include "tinysip/transactions/tsip_transac_nict.h"
+#include "tinySIP/transactions/tsip_transac_nict.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
-#include "tinysip/headers/tsip_header_Authorization.h"
-#include "tinysip/headers/tsip_header_Contact.h"
-#include "tinysip/headers/tsip_header_Dummy.h"
-#include "tinysip/headers/tsip_header_Expires.h"
-#include "tinysip/headers/tsip_header_P_Preferred_Identity.h"
-#include "tinysip/headers/tsip_header_Proxy_Authenticate.h"
-#include "tinysip/headers/tsip_header_Proxy_Authorization.h"
-#include "tinysip/headers/tsip_header_Route.h"
-#include "tinysip/headers/tsip_header_Subscription_State.h"
-#include "tinysip/headers/tsip_header_WWW_Authenticate.h"
+#include "tinySIP/headers/tsip_header_Authorization.h"
+#include "tinySIP/headers/tsip_header_Contact.h"
+#include "tinySIP/headers/tsip_header_Dummy.h"
+#include "tinySIP/headers/tsip_header_Expires.h"
+#include "tinySIP/headers/tsip_header_P_Preferred_Identity.h"
+#include "tinySIP/headers/tsip_header_Proxy_Authenticate.h"
+#include "tinySIP/headers/tsip_header_Proxy_Authorization.h"
+#include "tinySIP/headers/tsip_header_Route.h"
+#include "tinySIP/headers/tsip_header_Subscription_State.h"
+#include "tinySIP/headers/tsip_header_WWW_Authenticate.h"
 
 #include "tsk_debug.h"
 #include "tsk_time.h"
diff --git a/trunk/tinySIP/src/dialogs/tsip_dialog_layer.c b/trunk/tinySIP/src/dialogs/tsip_dialog_layer.c
index cdc016f3..7ac6c941 100644
--- a/trunk/tinySIP/src/dialogs/tsip_dialog_layer.c
+++ b/trunk/tinySIP/src/dialogs/tsip_dialog_layer.c
@@ -27,13 +27,13 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/dialogs/tsip_dialog_layer.h"
+#include "tinySIP/dialogs/tsip_dialog_layer.h"
 
-#include "tinysip/dialogs/tsip_dialog_register.h"
-#include "tinysip/dialogs/tsip_dialog_message.h"
+#include "tinySIP/dialogs/tsip_dialog_register.h"
+#include "tinySIP/dialogs/tsip_dialog_message.h"
 
-#include "tinysip/transactions/tsip_transac_layer.h"
-#include "tinysip/transports/tsip_transport_layer.h"
+#include "tinySIP/transactions/tsip_transac_layer.h"
+#include "tinySIP/transports/tsip_transport_layer.h"
 
 tsip_dialog_t* tsip_dialog_layer_find_by_op(tsip_dialog_layer_t *self, const tsip_operation_handle_t *operation)
 {
diff --git a/trunk/tinySIP/src/dialogs/tsip_dialog_message.c b/trunk/tinySIP/src/dialogs/tsip_dialog_message.c
index 33ce561c..d51f844b 100644
--- a/trunk/tinySIP/src/dialogs/tsip_dialog_message.c
+++ b/trunk/tinySIP/src/dialogs/tsip_dialog_message.c
@@ -27,12 +27,12 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/dialogs/tsip_dialog_message.h"
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/dialogs/tsip_dialog_message.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
-#include "tinysip/api/tsip_api_message.h"
+#include "tinySIP/api/tsip_api_message.h"
 
-#include "tinysip/headers/tsip_header_Min_Expires.h"
+#include "tinySIP/headers/tsip_header_Min_Expires.h"
 
 #include "tsk_memory.h"
 #include "tsk_debug.h"
diff --git a/trunk/tinySIP/src/dialogs/tsip_dialog_publish.client.c b/trunk/tinySIP/src/dialogs/tsip_dialog_publish.client.c
index e6daf783..563f3fac 100644
--- a/trunk/tinySIP/src/dialogs/tsip_dialog_publish.client.c
+++ b/trunk/tinySIP/src/dialogs/tsip_dialog_publish.client.c
@@ -27,15 +27,15 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/dialogs/tsip_dialog_publish.h"
+#include "tinySIP/dialogs/tsip_dialog_publish.h"
 
-#include "tinysip/headers/tsip_header_Min_Expires.h"
-#include "tinysip/headers/tsip_header_SIP_ETag.h"
-#include "tinysip/headers/tsip_header_SIP_If_Match.h"
+#include "tinySIP/headers/tsip_header_Min_Expires.h"
+#include "tinySIP/headers/tsip_header_SIP_ETag.h"
+#include "tinySIP/headers/tsip_header_SIP_If_Match.h"
 
-#include "tinysip/tsip_message.h"
+#include "tinySIP/tsip_message.h"
 
-#include "tinysip/api/tsip_api_publish.h"
+#include "tinySIP/api/tsip_api_publish.h"
 
 #include "tsk_debug.h"
 #include "tsk_time.h"
diff --git a/trunk/tinySIP/src/dialogs/tsip_dialog_register.client.c b/trunk/tinySIP/src/dialogs/tsip_dialog_register.client.c
index 13ef35da..b287e079 100644
--- a/trunk/tinySIP/src/dialogs/tsip_dialog_register.client.c
+++ b/trunk/tinySIP/src/dialogs/tsip_dialog_register.client.c
@@ -27,18 +27,18 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/dialogs/tsip_dialog_register.h"
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/dialogs/tsip_dialog_register.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
-#include "tinysip/transports/tsip_transport_layer.h"
+#include "tinySIP/transports/tsip_transport_layer.h"
 
-#include "tinysip/headers/tsip_header_Path.h"
-#include "tinysip/headers/tsip_header_P_Associated_URI.h"
-#include "tinysip/headers/tsip_header_Min_Expires.h"
-#include "tinysip/headers/tsip_header_Service_Route.h"
-#include "tinysip/headers/tsip_header_Supported.h"
+#include "tinySIP/headers/tsip_header_Path.h"
+#include "tinySIP/headers/tsip_header_P_Associated_URI.h"
+#include "tinySIP/headers/tsip_header_Min_Expires.h"
+#include "tinySIP/headers/tsip_header_Service_Route.h"
+#include "tinySIP/headers/tsip_header_Supported.h"
 
-#include "tinysip/api/tsip_api_register.h"
+#include "tinySIP/api/tsip_api_register.h"
 
 #include "tsk_memory.h"
 #include "tsk_debug.h"
diff --git a/trunk/tinySIP/src/dialogs/tsip_dialog_subscribe.client.c b/trunk/tinySIP/src/dialogs/tsip_dialog_subscribe.client.c
index 3f760851..b09862f1 100644
--- a/trunk/tinySIP/src/dialogs/tsip_dialog_subscribe.client.c
+++ b/trunk/tinySIP/src/dialogs/tsip_dialog_subscribe.client.c
@@ -27,13 +27,13 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/dialogs/tsip_dialog_subscribe.h"
+#include "tinySIP/dialogs/tsip_dialog_subscribe.h"
 
-#include "tinysip/headers/tsip_header_Event.h"
-#include "tinysip/headers/tsip_header_Min_Expires.h"
-#include "tinysip/headers/tsip_header_Subscription_State.h"
+#include "tinySIP/headers/tsip_header_Event.h"
+#include "tinySIP/headers/tsip_header_Min_Expires.h"
+#include "tinySIP/headers/tsip_header_Subscription_State.h"
 
-#include "tinysip/api/tsip_api_subscribe.h"
+#include "tinySIP/api/tsip_api_subscribe.h"
 
 #include "tsk_debug.h"
 #include "tsk_time.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header.c b/trunk/tinySIP/src/headers/tsip_header.c
index ca7177e1..7aa8943c 100644
--- a/trunk/tinySIP/src/headers/tsip_header.c
+++ b/trunk/tinySIP/src/headers/tsip_header.c
@@ -27,22 +27,15 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header.h"
+#include "tinySIP/headers/tsip_header.h"
 
-#include "tinysip/headers/tsip_header_Dummy.h"
+#include "tinySIP/headers/tsip_header_Dummy.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-/// @fn	const char *tsip_header_get_name(tsip_header_type_t type)
-///
-/// @brief	Retrieves a header name by type. 
-///
-/// @author	Mamadou
-/// @date	12/2/2009
-///
-/// @param	type	The type of the headers. 
-///
-/// @return	The name of the header. 
-////////////////////////////////////////////////////////////////////////////////////////////////////
+/** Gets the name of the SIP header with a type equal to @a type. 
+ * @param	type	The @a type of the header for which to retrieve the name. 
+ *
+ * @return	The name of the header.
+**/
 const char *tsip_header_get_name(tsip_header_type_t type)
 {
 	switch(type)
diff --git a/trunk/tinySIP/src/headers/tsip_header_Allow.c b/trunk/tinySIP/src/headers/tsip_header_Allow.c
index e3c26c61..d47ed431 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Allow.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Allow.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Allow.h"
+#include "tinySIP/headers/tsip_header_Allow.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Allow_Events.c b/trunk/tinySIP/src/headers/tsip_header_Allow_Events.c
index ce5de39b..e85ea033 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Allow_Events.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Allow_Events.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Allow_events.h"
+#include "tinySIP/headers/tsip_header_Allow_events.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Authorization.c b/trunk/tinySIP/src/headers/tsip_header_Authorization.c
index f75c6b89..00bbe2bf 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Authorization.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Authorization.c
@@ -29,7 +29,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Authorization.h"
+#include "tinySIP/headers/tsip_header_Authorization.h"
 
 #include "tinyhttp/headers/thttp_header_Authorization.h"
 
diff --git a/trunk/tinySIP/src/headers/tsip_header_CSeq.c b/trunk/tinySIP/src/headers/tsip_header_CSeq.c
index 89550bc7..330111c9 100644
--- a/trunk/tinySIP/src/headers/tsip_header_CSeq.c
+++ b/trunk/tinySIP/src/headers/tsip_header_CSeq.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_CSeq.h"
+#include "tinySIP/headers/tsip_header_CSeq.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Call_ID.c b/trunk/tinySIP/src/headers/tsip_header_Call_ID.c
index f038dd2c..d4d5c800 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Call_ID.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Call_ID.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Call_ID.h"
+#include "tinySIP/headers/tsip_header_Call_ID.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Contact.c b/trunk/tinySIP/src/headers/tsip_header_Contact.c
index 7d1c0d7a..ea9c4f9d 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Contact.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Contact.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Contact.h"
+#include "tinySIP/headers/tsip_header_Contact.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Content_Length.c b/trunk/tinySIP/src/headers/tsip_header_Content_Length.c
index f8a23ac0..816ffd15 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Content_Length.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Content_Length.c
@@ -29,7 +29,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Content_Length.h"
+#include "tinySIP/headers/tsip_header_Content_Length.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Content_Type.c b/trunk/tinySIP/src/headers/tsip_header_Content_Type.c
index 58890125..a9061a59 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Content_Type.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Content_Type.c
@@ -29,7 +29,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Content_Type.h"
+#include "tinySIP/headers/tsip_header_Content_Type.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Dummy.c b/trunk/tinySIP/src/headers/tsip_header_Dummy.c
index 8b16888b..21132b3f 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Dummy.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Dummy.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Dummy.h"
+#include "tinySIP/headers/tsip_header_Dummy.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Event.c b/trunk/tinySIP/src/headers/tsip_header_Event.c
index b29ebc05..728faf07 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Event.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Event.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Event.h"
+#include "tinySIP/headers/tsip_header_Event.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Expires.c b/trunk/tinySIP/src/headers/tsip_header_Expires.c
index c727885c..fc6dbd3a 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Expires.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Expires.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Expires.h"
+#include "tinySIP/headers/tsip_header_Expires.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_From.c b/trunk/tinySIP/src/headers/tsip_header_From.c
index 49082d00..53a3e08b 100644
--- a/trunk/tinySIP/src/headers/tsip_header_From.c
+++ b/trunk/tinySIP/src/headers/tsip_header_From.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_From.h"
+#include "tinySIP/headers/tsip_header_From.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Max_Forwards.c b/trunk/tinySIP/src/headers/tsip_header_Max_Forwards.c
index 0dce4a3c..98b2bb0c 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Max_Forwards.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Max_Forwards.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Max_Forwards.h"
+#include "tinySIP/headers/tsip_header_Max_Forwards.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Min_Expires.c b/trunk/tinySIP/src/headers/tsip_header_Min_Expires.c
index 91fe9bf9..52fa375f 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Min_Expires.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Min_Expires.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Min_Expires.h"
+#include "tinySIP/headers/tsip_header_Min_Expires.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_P_Access_Network_Info.c b/trunk/tinySIP/src/headers/tsip_header_P_Access_Network_Info.c
index 9fc6fff3..7c6f7db5 100644
--- a/trunk/tinySIP/src/headers/tsip_header_P_Access_Network_Info.c
+++ b/trunk/tinySIP/src/headers/tsip_header_P_Access_Network_Info.c
@@ -37,9 +37,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_P_Access_Network_Info.h"
+#include "tinySIP/headers/tsip_header_P_Access_Network_Info.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_P_Asserted_Identity.c b/trunk/tinySIP/src/headers/tsip_header_P_Asserted_Identity.c
index c5616684..be47704d 100644
--- a/trunk/tinySIP/src/headers/tsip_header_P_Asserted_Identity.c
+++ b/trunk/tinySIP/src/headers/tsip_header_P_Asserted_Identity.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_P_Asserted_Identity.h"
+#include "tinySIP/headers/tsip_header_P_Asserted_Identity.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_P_Associated_URI.c b/trunk/tinySIP/src/headers/tsip_header_P_Associated_URI.c
index 74030d0d..fd2845b3 100644
--- a/trunk/tinySIP/src/headers/tsip_header_P_Associated_URI.c
+++ b/trunk/tinySIP/src/headers/tsip_header_P_Associated_URI.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_P_Associated_URI.h"
+#include "tinySIP/headers/tsip_header_P_Associated_URI.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_P_Charging_Function_Addresses.c b/trunk/tinySIP/src/headers/tsip_header_P_Charging_Function_Addresses.c
index a37a2103..21c30e17 100644
--- a/trunk/tinySIP/src/headers/tsip_header_P_Charging_Function_Addresses.c
+++ b/trunk/tinySIP/src/headers/tsip_header_P_Charging_Function_Addresses.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_P_Charging_Function_Addresses.h"
+#include "tinySIP/headers/tsip_header_P_Charging_Function_Addresses.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_P_Preferred_Identity.c b/trunk/tinySIP/src/headers/tsip_header_P_Preferred_Identity.c
index 426575d7..641e238e 100644
--- a/trunk/tinySIP/src/headers/tsip_header_P_Preferred_Identity.c
+++ b/trunk/tinySIP/src/headers/tsip_header_P_Preferred_Identity.c
@@ -37,9 +37,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_P_Preferred_Identity.h"
+#include "tinySIP/headers/tsip_header_P_Preferred_Identity.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Path.c b/trunk/tinySIP/src/headers/tsip_header_Path.c
index f2b72ee8..2d223161 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Path.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Path.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Path.h"
+#include "tinySIP/headers/tsip_header_Path.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Privacy.c b/trunk/tinySIP/src/headers/tsip_header_Privacy.c
index 784f24e8..28f36569 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Privacy.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Privacy.c
@@ -37,9 +37,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Privacy.h"
+#include "tinySIP/headers/tsip_header_Privacy.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Proxy_Authenticate.c b/trunk/tinySIP/src/headers/tsip_header_Proxy_Authenticate.c
index b6059eba..9497cd47 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Proxy_Authenticate.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Proxy_Authenticate.c
@@ -29,7 +29,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Proxy_Authenticate.h"
+#include "tinySIP/headers/tsip_header_Proxy_Authenticate.h"
 
 #include "tinyhttp/headers/thttp_header_WWW_Authenticate.h"
 
diff --git a/trunk/tinySIP/src/headers/tsip_header_Proxy_Authorization.c b/trunk/tinySIP/src/headers/tsip_header_Proxy_Authorization.c
index f29ad9f2..471ec0b9 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Proxy_Authorization.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Proxy_Authorization.c
@@ -29,7 +29,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Proxy_Authorization.h"
+#include "tinySIP/headers/tsip_header_Proxy_Authorization.h"
 
 #include "tinyhttp/headers/thttp_header_Authorization.h"
 
diff --git a/trunk/tinySIP/src/headers/tsip_header_Proxy_Require.c b/trunk/tinySIP/src/headers/tsip_header_Proxy_Require.c
index da92db00..aa35afd8 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Proxy_Require.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Proxy_Require.c
@@ -30,9 +30,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Proxy_Require.h"
+#include "tinySIP/headers/tsip_header_Proxy_Require.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Record_Route.c b/trunk/tinySIP/src/headers/tsip_header_Record_Route.c
index 57a9c998..ca4790dd 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Record_Route.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Record_Route.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Record_Route.h"
+#include "tinySIP/headers/tsip_header_Record_Route.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Require.c b/trunk/tinySIP/src/headers/tsip_header_Require.c
index 1396fbe7..8156352d 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Require.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Require.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Require.h"
+#include "tinySIP/headers/tsip_header_Require.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Route.c b/trunk/tinySIP/src/headers/tsip_header_Route.c
index c52fd72a..683a4dd6 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Route.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Route.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Route.h"
+#include "tinySIP/headers/tsip_header_Route.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_SIP_ETag.c b/trunk/tinySIP/src/headers/tsip_header_SIP_ETag.c
index ea5c7813..ac7983ba 100644
--- a/trunk/tinySIP/src/headers/tsip_header_SIP_ETag.c
+++ b/trunk/tinySIP/src/headers/tsip_header_SIP_ETag.c
@@ -30,9 +30,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_SIP_ETag.h"
+#include "tinySIP/headers/tsip_header_SIP_ETag.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_SIP_If_Match.c b/trunk/tinySIP/src/headers/tsip_header_SIP_If_Match.c
index a064a4d3..ece9ee4f 100644
--- a/trunk/tinySIP/src/headers/tsip_header_SIP_If_Match.c
+++ b/trunk/tinySIP/src/headers/tsip_header_SIP_If_Match.c
@@ -30,9 +30,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_SIP_If_Match.h"
+#include "tinySIP/headers/tsip_header_SIP_If_Match.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Security_Client.c b/trunk/tinySIP/src/headers/tsip_header_Security_Client.c
index 6d31e4dd..168a78c9 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Security_Client.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Security_Client.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Security_Client.h"
+#include "tinySIP/headers/tsip_header_Security_Client.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Security_Server.c b/trunk/tinySIP/src/headers/tsip_header_Security_Server.c
index e1f806e0..43ae23a1 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Security_Server.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Security_Server.c
@@ -30,9 +30,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Security_Server.h"
+#include "tinySIP/headers/tsip_header_Security_Server.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Security_Verify.c b/trunk/tinySIP/src/headers/tsip_header_Security_Verify.c
index 4ea8cd2c..fc27d39b 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Security_Verify.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Security_Verify.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Security_Verify.h"
+#include "tinySIP/headers/tsip_header_Security_Verify.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Server.c b/trunk/tinySIP/src/headers/tsip_header_Server.c
index 779abb95..ea28297a 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Server.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Server.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Server.h"
+#include "tinySIP/headers/tsip_header_Server.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Service_Route.c b/trunk/tinySIP/src/headers/tsip_header_Service_Route.c
index 8eb9237f..8db600b9 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Service_Route.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Service_Route.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Service_Route.h"
+#include "tinySIP/headers/tsip_header_Service_Route.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Subscription_State.c b/trunk/tinySIP/src/headers/tsip_header_Subscription_State.c
index f3f8f06f..f6c19df6 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Subscription_State.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Subscription_State.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Subscription_State.h"
+#include "tinySIP/headers/tsip_header_Subscription_State.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Supported.c b/trunk/tinySIP/src/headers/tsip_header_Supported.c
index de2b59da..fdc89425 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Supported.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Supported.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Supported.h"
+#include "tinySIP/headers/tsip_header_Supported.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_To.c b/trunk/tinySIP/src/headers/tsip_header_To.c
index f47a258f..98222848 100644
--- a/trunk/tinySIP/src/headers/tsip_header_To.c
+++ b/trunk/tinySIP/src/headers/tsip_header_To.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_To.h"
+#include "tinySIP/headers/tsip_header_To.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_User_Agent.c b/trunk/tinySIP/src/headers/tsip_header_User_Agent.c
index d7fbb623..d4974f4e 100644
--- a/trunk/tinySIP/src/headers/tsip_header_User_Agent.c
+++ b/trunk/tinySIP/src/headers/tsip_header_User_Agent.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_User_Agent.h"
+#include "tinySIP/headers/tsip_header_User_Agent.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_Via.c b/trunk/tinySIP/src/headers/tsip_header_Via.c
index 4693689c..df3a153a 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Via.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Via.c
@@ -29,7 +29,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Via.h"
+#include "tinySIP/headers/tsip_header_Via.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_WWW_Authenticate.c b/trunk/tinySIP/src/headers/tsip_header_WWW_Authenticate.c
index dcb2cc64..631f1c42 100644
--- a/trunk/tinySIP/src/headers/tsip_header_WWW_Authenticate.c
+++ b/trunk/tinySIP/src/headers/tsip_header_WWW_Authenticate.c
@@ -29,7 +29,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_WWW_Authenticate.h"
+#include "tinySIP/headers/tsip_header_WWW_Authenticate.h"
 
 #include "tinyhttp/headers/thttp_header_WWW_Authenticate.h"
 
diff --git a/trunk/tinySIP/src/headers/tsip_header_Warning.c b/trunk/tinySIP/src/headers/tsip_header_Warning.c
index 1085b1cd..76951639 100644
--- a/trunk/tinySIP/src/headers/tsip_header_Warning.c
+++ b/trunk/tinySIP/src/headers/tsip_header_Warning.c
@@ -29,9 +29,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_Warning.h"
+#include "tinySIP/headers/tsip_header_Warning.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/headers/tsip_header_accept.c b/trunk/tinySIP/src/headers/tsip_header_accept.c
index f166f651..e0bc1f39 100644
--- a/trunk/tinySIP/src/headers/tsip_header_accept.c
+++ b/trunk/tinySIP/src/headers/tsip_header_accept.c
@@ -27,4 +27,4 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/headers/tsip_header_accept.h"
+#include "tinySIP/headers/tsip_header_accept.h"
diff --git a/trunk/tinySIP/src/parsers/tsip_parser_header.c b/trunk/tinySIP/src/parsers/tsip_parser_header.c
index 3f3dc910..b57e9531 100644
--- a/trunk/tinySIP/src/parsers/tsip_parser_header.c
+++ b/trunk/tinySIP/src/parsers/tsip_parser_header.c
@@ -29,47 +29,47 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/parsers/tsip_parser_header.h"
+#include "tinySIP/parsers/tsip_parser_header.h"
 
-#include "tinysip/headers/tsip_header_Allow.h"
-#include "tinysip/headers/tsip_header_Allow_Events.h"
-#include "tinysip/headers/tsip_header_Authorization.h"
-#include "tinysip/headers/tsip_header_Call_ID.h"
-#include "tinysip/headers/tsip_header_Contact.h"
-#include "tinysip/headers/tsip_header_CSeq.h"
-#include "tinysip/headers/tsip_header_Dummy.h"
-#include "tinysip/headers/tsip_header_Event.h"
-#include "tinysip/headers/tsip_header_Expires.h"
-#include "tinysip/headers/tsip_header_From.h"
-#include "tinysip/headers/tsip_header_Max_Forwards.h"
-#include "tinysip/headers/tsip_header_Min_Expires.h"
-#include "tinysip/headers/tsip_header_Path.h"
-#include "tinysip/headers/tsip_header_P_Access_Network_Info.h" 
-#include "tinysip/headers/tsip_header_P_Asserted_Identity.h"
-#include "tinysip/headers/tsip_header_P_Associated_URI.h"
-#include "tinysip/headers/tsip_header_P_Charging_Function_Addresses.h"
-#include "tinysip/headers/tsip_header_P_Preferred_Identity.h"
-#include "tinysip/headers/tsip_header_Privacy.h"
-#include "tinysip/headers/tsip_header_Proxy_Authenticate.h"
-#include "tinysip/headers/tsip_header_Proxy_Authorization.h"
-#include "tinysip/headers/tsip_header_Proxy_Require.h"
-#include "tinysip/headers/tsip_header_Record_Route.h"
-#include "tinysip/headers/tsip_header_Require.h"
-#include "tinysip/headers/tsip_header_Route.h"
-#include "tinysip/headers/tsip_header_Security_Client.h"
-#include "tinysip/headers/tsip_header_Security_Server.h"
-#include "tinysip/headers/tsip_header_Security_Verify.h"
-#include "tinysip/headers/tsip_header_Server.h"
-#include "tinysip/headers/tsip_header_Service_Route.h"
-#include "tinysip/headers/tsip_header_SIP_ETag.h"
-#include "tinysip/headers/tsip_header_SIP_If_Match.h"
-#include "tinysip/headers/tsip_header_Subscription_State.h"
-#include "tinysip/headers/tsip_header_Supported.h"
-#include "tinysip/headers/tsip_header_To.h"
-#include "tinysip/headers/tsip_header_User_Agent.h"
-#include "tinysip/headers/tsip_header_Via.h"
-#include "tinysip/headers/tsip_header_Warning.h"
-#include "tinysip/headers/tsip_header_WWW_Authenticate.h"
+#include "tinySIP/headers/tsip_header_Allow.h"
+#include "tinySIP/headers/tsip_header_Allow_Events.h"
+#include "tinySIP/headers/tsip_header_Authorization.h"
+#include "tinySIP/headers/tsip_header_Call_ID.h"
+#include "tinySIP/headers/tsip_header_Contact.h"
+#include "tinySIP/headers/tsip_header_CSeq.h"
+#include "tinySIP/headers/tsip_header_Dummy.h"
+#include "tinySIP/headers/tsip_header_Event.h"
+#include "tinySIP/headers/tsip_header_Expires.h"
+#include "tinySIP/headers/tsip_header_From.h"
+#include "tinySIP/headers/tsip_header_Max_Forwards.h"
+#include "tinySIP/headers/tsip_header_Min_Expires.h"
+#include "tinySIP/headers/tsip_header_Path.h"
+#include "tinySIP/headers/tsip_header_P_Access_Network_Info.h" 
+#include "tinySIP/headers/tsip_header_P_Asserted_Identity.h"
+#include "tinySIP/headers/tsip_header_P_Associated_URI.h"
+#include "tinySIP/headers/tsip_header_P_Charging_Function_Addresses.h"
+#include "tinySIP/headers/tsip_header_P_Preferred_Identity.h"
+#include "tinySIP/headers/tsip_header_Privacy.h"
+#include "tinySIP/headers/tsip_header_Proxy_Authenticate.h"
+#include "tinySIP/headers/tsip_header_Proxy_Authorization.h"
+#include "tinySIP/headers/tsip_header_Proxy_Require.h"
+#include "tinySIP/headers/tsip_header_Record_Route.h"
+#include "tinySIP/headers/tsip_header_Require.h"
+#include "tinySIP/headers/tsip_header_Route.h"
+#include "tinySIP/headers/tsip_header_Security_Client.h"
+#include "tinySIP/headers/tsip_header_Security_Server.h"
+#include "tinySIP/headers/tsip_header_Security_Verify.h"
+#include "tinySIP/headers/tsip_header_Server.h"
+#include "tinySIP/headers/tsip_header_Service_Route.h"
+#include "tinySIP/headers/tsip_header_SIP_ETag.h"
+#include "tinySIP/headers/tsip_header_SIP_If_Match.h"
+#include "tinySIP/headers/tsip_header_Subscription_State.h"
+#include "tinySIP/headers/tsip_header_Supported.h"
+#include "tinySIP/headers/tsip_header_To.h"
+#include "tinySIP/headers/tsip_header_User_Agent.h"
+#include "tinySIP/headers/tsip_header_Via.h"
+#include "tinySIP/headers/tsip_header_Warning.h"
+#include "tinySIP/headers/tsip_header_WWW_Authenticate.h"
 
 #include "tsk_debug.h"
 
diff --git a/trunk/tinySIP/src/parsers/tsip_parser_message.c b/trunk/tinySIP/src/parsers/tsip_parser_message.c
index 1a6c7f15..7d1faf4c 100644
--- a/trunk/tinySIP/src/parsers/tsip_parser_message.c
+++ b/trunk/tinySIP/src/parsers/tsip_parser_message.c
@@ -29,10 +29,10 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/parsers/tsip_parser_message.h"
-#include "tinysip/parsers/tsip_parser_header.h"
+#include "tinySIP/parsers/tsip_parser_message.h"
+#include "tinySIP/parsers/tsip_parser_header.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/parsers/tsip_parser_uri.c b/trunk/tinySIP/src/parsers/tsip_parser_uri.c
index 0b837b8c..ef6921f2 100644
--- a/trunk/tinySIP/src/parsers/tsip_parser_uri.c
+++ b/trunk/tinySIP/src/parsers/tsip_parser_uri.c
@@ -29,7 +29,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_string.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/transactions/tsip_transac.c b/trunk/tinySIP/src/transactions/tsip_transac.c
index 1510730b..832c2965 100644
--- a/trunk/tinySIP/src/transactions/tsip_transac.c
+++ b/trunk/tinySIP/src/transactions/tsip_transac.c
@@ -27,13 +27,13 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/transactions/tsip_transac.h"
+#include "tinySIP/transactions/tsip_transac.h"
 
-#include "tinysip/transports/tsip_transport_layer.h"
-#include "tinysip/transactions/tsip_transac_layer.h"
+#include "tinySIP/transports/tsip_transport_layer.h"
+#include "tinySIP/transactions/tsip_transac_layer.h"
 
-#include "tinysip/transactions/tsip_transac_nist.h"
-#include "tinysip/transactions/tsip_transac_nict.h"
+#include "tinySIP/transactions/tsip_transac_nist.h"
+#include "tinySIP/transactions/tsip_transac_nict.h"
 
 #include "tsk_string.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/transactions/tsip_transac_ict.c b/trunk/tinySIP/src/transactions/tsip_transac_ict.c
index 73e1ff50..50eea0e0 100644
--- a/trunk/tinySIP/src/transactions/tsip_transac_ict.c
+++ b/trunk/tinySIP/src/transactions/tsip_transac_ict.c
@@ -27,7 +27,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/transactions/tsip_transac_ict.h"
+#include "tinySIP/transactions/tsip_transac_ict.h"
 
 int tsip_transac_ict_init(tsip_transac_ict_t *self)
 {
diff --git a/trunk/tinySIP/src/transactions/tsip_transac_ist.c b/trunk/tinySIP/src/transactions/tsip_transac_ist.c
index d8cf249b..642982bd 100644
--- a/trunk/tinySIP/src/transactions/tsip_transac_ist.c
+++ b/trunk/tinySIP/src/transactions/tsip_transac_ist.c
@@ -27,7 +27,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/transactions/tsip_transac_ist.h"
+#include "tinySIP/transactions/tsip_transac_ist.h"
 
 int tsip_transac_ist_init(tsip_transac_ist_t *self)
 {
diff --git a/trunk/tinySIP/src/transactions/tsip_transac_layer.c b/trunk/tinySIP/src/transactions/tsip_transac_layer.c
index 52ede969..c43e816a 100644
--- a/trunk/tinySIP/src/transactions/tsip_transac_layer.c
+++ b/trunk/tinySIP/src/transactions/tsip_transac_layer.c
@@ -27,12 +27,12 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/transactions/tsip_transac_layer.h"
+#include "tinySIP/transactions/tsip_transac_layer.h"
 
-#include "tinysip/transactions/tsip_transac_ict.h"
-#include "tinysip/transactions/tsip_transac_ist.h"
-#include "tinysip/transactions/tsip_transac_nict.h"
-#include "tinysip/transactions/tsip_transac_nist.h"
+#include "tinySIP/transactions/tsip_transac_ict.h"
+#include "tinySIP/transactions/tsip_transac_ist.h"
+#include "tinySIP/transactions/tsip_transac_nict.h"
+#include "tinySIP/transactions/tsip_transac_nist.h"
 
 #include "tsk_string.h"
 #include "tsk_debug.h"
diff --git a/trunk/tinySIP/src/transactions/tsip_transac_nict.c b/trunk/tinySIP/src/transactions/tsip_transac_nict.c
index 53367f46..297fcadb 100644
--- a/trunk/tinySIP/src/transactions/tsip_transac_nict.c
+++ b/trunk/tinySIP/src/transactions/tsip_transac_nict.c
@@ -71,7 +71,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/transactions/tsip_transac_nict.h"
+#include "tinySIP/transactions/tsip_transac_nict.h"
 
 #include "tsk_debug.h"
 
diff --git a/trunk/tinySIP/src/transactions/tsip_transac_nist.c b/trunk/tinySIP/src/transactions/tsip_transac_nist.c
index 17ac7582..7d87d321 100644
--- a/trunk/tinySIP/src/transactions/tsip_transac_nist.c
+++ b/trunk/tinySIP/src/transactions/tsip_transac_nist.c
@@ -71,7 +71,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/transactions/tsip_transac_nist.h"
+#include "tinySIP/transactions/tsip_transac_nist.h"
 
 #include "tsk_debug.h"
 
diff --git a/trunk/tinySIP/src/transports/tsip_transport.c b/trunk/tinySIP/src/transports/tsip_transport.c
index f4b92c51..01c668a8 100644
--- a/trunk/tinySIP/src/transports/tsip_transport.c
+++ b/trunk/tinySIP/src/transports/tsip_transport.c
@@ -27,11 +27,11 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/transports/tsip_transport.h"
+#include "tinySIP/transports/tsip_transport.h"
 
-#include "tinysip/transports/tsip_transport_ipsec.h"
+#include "tinySIP/transports/tsip_transport_ipsec.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_string.h"
 #include "tsk_buffer.h"
diff --git a/trunk/tinySIP/src/transports/tsip_transport_ipsec.c b/trunk/tinySIP/src/transports/tsip_transport_ipsec.c
index 1402edd8..ff727519 100644
--- a/trunk/tinySIP/src/transports/tsip_transport_ipsec.c
+++ b/trunk/tinySIP/src/transports/tsip_transport_ipsec.c
@@ -27,14 +27,14 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/transports/tsip_transport_ipsec.h"
+#include "tinySIP/transports/tsip_transport_ipsec.h"
 
-#include "tinysip/transports/tsip_transport.h"
+#include "tinySIP/transports/tsip_transport.h"
 
-#include "tinysip/headers/tsip_header_Proxy_Require.h"
-#include "tinysip/headers/tsip_header_Require.h"
-#include "tinysip/headers/tsip_header_Security_Client.h"
-#include "tinysip/headers/tsip_header_Security_Server.h"
+#include "tinySIP/headers/tsip_header_Proxy_Require.h"
+#include "tinySIP/headers/tsip_header_Require.h"
+#include "tinySIP/headers/tsip_header_Security_Client.h"
+#include "tinySIP/headers/tsip_header_Security_Server.h"
 
 #include "tnet_socket.h"
 
diff --git a/trunk/tinySIP/src/transports/tsip_transport_layer.c b/trunk/tinySIP/src/transports/tsip_transport_layer.c
index 1215a399..4861935a 100644
--- a/trunk/tinySIP/src/transports/tsip_transport_layer.c
+++ b/trunk/tinySIP/src/transports/tsip_transport_layer.c
@@ -27,14 +27,14 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/transports/tsip_transport_layer.h"
+#include "tinySIP/transports/tsip_transport_layer.h"
 
-#include "tinysip/transports/tsip_transport_ipsec.h"
+#include "tinySIP/transports/tsip_transport_ipsec.h"
 
-#include "tinysip/transactions/tsip_transac_layer.h"
-#include "tinysip/dialogs/tsip_dialog_layer.h"
+#include "tinySIP/transactions/tsip_transac_layer.h"
+#include "tinySIP/dialogs/tsip_dialog_layer.h"
 
-#include "tinysip/parsers/tsip_parser_message.h"
+#include "tinySIP/parsers/tsip_parser_message.h"
 
 #include "tsk_thread.h"
 #include "tsk_debug.h"
diff --git a/trunk/tinySIP/src/tsip.c b/trunk/tinySIP/src/tsip.c
index 6aae7a2b..799c9f64 100644
--- a/trunk/tinySIP/src/tsip.c
+++ b/trunk/tinySIP/src/tsip.c
@@ -29,15 +29,15 @@
  */
 #include "tsip.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
-#include "tinysip/transactions/tsip_transac_layer.h"
-#include "tinysip/dialogs/tsip_dialog_layer.h"
-#include "tinysip/transports/tsip_transport_layer.h"
+#include "tinySIP/transactions/tsip_transac_layer.h"
+#include "tinySIP/dialogs/tsip_dialog_layer.h"
+#include "tinySIP/transports/tsip_transport_layer.h"
 
-#include "tinysip/api/tsip_api_register.h"
-#include "tinysip/api/tsip_api_subscribe.h"
-#include "tinysip/api/tsip_api_message.h"
+#include "tinySIP/api/tsip_api_register.h"
+#include "tinySIP/api/tsip_api_subscribe.h"
+#include "tinySIP/api/tsip_api_message.h"
 
 #include "tnet.h"
 
diff --git a/trunk/tinySIP/src/tsip_event.c b/trunk/tinySIP/src/tsip_event.c
index 0f145f59..00fc2057 100644
--- a/trunk/tinySIP/src/tsip_event.c
+++ b/trunk/tinySIP/src/tsip_event.c
@@ -27,11 +27,11 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/tsip_event.h"
+#include "tinySIP/tsip_event.h"
 
 #include "tsip.h"
 
-#include "tinysip/tsip_message.h"
+#include "tinySIP/tsip_message.h"
 
 #include "tsk_string.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/src/tsip_message.c b/trunk/tinySIP/src/tsip_message.c
index 71b04d80..411dda82 100644
--- a/trunk/tinySIP/src/tsip_message.c
+++ b/trunk/tinySIP/src/tsip_message.c
@@ -28,14 +28,14 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/tsip_message.h"
+#include "tinySIP/tsip_message.h"
 
-#include "tinysip/headers/tsip_header_Allow.h"
-#include "tinysip/headers/tsip_header_Contact.h"
-#include "tinysip/headers/tsip_header_Max_Forwards.h"
-#include "tinysip/headers/tsip_header_Require.h"
-#include "tinysip/headers/tsip_header_Supported.h"
-#include "tinysip/headers/tsip_header_User_Agent.h"
+#include "tinySIP/headers/tsip_header_Allow.h"
+#include "tinySIP/headers/tsip_header_Contact.h"
+#include "tinySIP/headers/tsip_header_Max_Forwards.h"
+#include "tinySIP/headers/tsip_header_Require.h"
+#include "tinySIP/headers/tsip_header_Supported.h"
+#include "tinySIP/headers/tsip_header_User_Agent.h"
 
 
 #include "tsk_debug.h"
@@ -312,7 +312,7 @@ uint32_t tsip_message_getContent_length(const tsip_message_t *self)
 
 int tsip_message_tostring(const tsip_message_t *self, tsk_buffer_t *output)
 {
-	if(!self){
+	if(!self || !output){
 		return -1;
 	}
 
diff --git a/trunk/tinySIP/src/tsip_operation.c b/trunk/tinySIP/src/tsip_operation.c
index ec8b8a02..b152e0c9 100644
--- a/trunk/tinySIP/src/tsip_operation.c
+++ b/trunk/tinySIP/src/tsip_operation.c
@@ -27,11 +27,11 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/tsip_operation.h"
+#include "tinySIP/tsip_operation.h"
 #include "tsip.h"
 
-#include "tinysip/dialogs/tsip_dialog_layer.h"
-#include "tinysip/tsip_message.h"
+#include "tinySIP/dialogs/tsip_dialog_layer.h"
+#include "tinySIP/tsip_message.h"
 
 #include "tsk_debug.h"
 
diff --git a/trunk/tinySIP/src/tsip_timers.c b/trunk/tinySIP/src/tsip_timers.c
index 2a9031af..cec1c954 100644
--- a/trunk/tinySIP/src/tsip_timers.c
+++ b/trunk/tinySIP/src/tsip_timers.c
@@ -27,7 +27,7 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/tsip_timers.h"
+#include "tinySIP/tsip_timers.h"
 
 /*
 	Timer    Value            Section               Meaning
diff --git a/trunk/tinySIP/src/tsip_uri.c b/trunk/tinySIP/src/tsip_uri.c
index 48632f02..50c613c5 100644
--- a/trunk/tinySIP/src/tsip_uri.c
+++ b/trunk/tinySIP/src/tsip_uri.c
@@ -27,9 +27,9 @@
  *
  * @date Created: Sat Nov 8 16:54:58 2009 mdiop
  */
-#include "tinysip/tsip_uri.h"
+#include "tinySIP/tsip_uri.h"
 
-#include "tinysip/parsers/tsip_parser_uri.h"
+#include "tinySIP/parsers/tsip_parser_uri.h"
 
 #include "tsk_debug.h"
 #include "tsk_memory.h"
diff --git a/trunk/tinySIP/test/test/test.c b/trunk/tinySIP/test/test/test.c
index de972a19..ac129d3d 100644
--- a/trunk/tinySIP/test/test/test.c
+++ b/trunk/tinySIP/test/test/test.c
@@ -60,7 +60,7 @@ int main()
 #endif
 	{
 		/* Print copyright information */
-		printf("Doubango Project\nCopyright (C) 2009 Mamadou Diop \n\n");
+		printf("Doubango Project\nCopyright (C) 2009 - 2010 Mamadou Diop \n\n");
 	
 #if RUN_TEST_ALL  || RUN_TEST_MESSAGES
 		test_messages();
diff --git a/trunk/tinySIP/tinySIP.vcproj b/trunk/tinySIP/tinySIP.vcproj
index 1aef4e52..6a28a75f 100644
--- a/trunk/tinySIP/tinySIP.vcproj
+++ b/trunk/tinySIP/tinySIP.vcproj
@@ -338,7 +338,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="src"
+			Name="source(*.c)"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
@@ -900,7 +900,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="include"
+			Name="include(*.h)"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
@@ -1454,7 +1454,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="ragel"
+			Name="ragel(*.rl)"
 			>
 			<File
 				RelativePath=".\ragel\tsip_machine_header.rl"
@@ -1850,7 +1850,7 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="abnf"
+			Name="abnf(*.abnf)"
 			>
 			<File
 				RelativePath=".\abnf\core.abnf"