diff --git a/library/amiga_argarrayinit.c b/library/amiga_argarrayinit.c
index 0b2b517..1b3bae3 100644
--- a/library/amiga_argarrayinit.c
+++ b/library/amiga_argarrayinit.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_argarrayinit.c,v 1.5 2006-09-21 09:24:20 obarthel Exp $
+ * $Id: amiga_argarrayinit.c,v 1.6 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -75,7 +75,7 @@ ArgArrayInit(LONG argc, CONST_STRPTR * argv)
 			goto out;
 
 		for(i = 1 ; i < argc ; i++)
-			CXLIB_argarray[i-1] = argv[i];
+			CXLIB_argarray[i-1] = (unsigned char *)argv[i];
 
 		result = (STRPTR *)CXLIB_argarray;
 	}
diff --git a/library/amiga_rexxvars.c b/library/amiga_rexxvars.c
index 783a91b..4a98f51 100644
--- a/library/amiga_rexxvars.c
+++ b/library/amiga_rexxvars.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_rexxvars.c,v 1.7 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_rexxvars.c,v 1.8 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -154,7 +154,7 @@ CheckRexxMsg(struct RexxMsg *message)
 LONG
 GetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR *buffer_pointer)
 {
-	static UBYTE buffer[256];
+	static TEXT buffer[256];
 	LONG result;
 
 	/* The following uses a function which was added to rexxsyslib.library V45.
diff --git a/library/crtbegin.c b/library/crtbegin.c
index b08a9c8..3465519 100644
--- a/library/crtbegin.c
+++ b/library/crtbegin.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: crtbegin.c,v 1.10 2005-03-18 12:38:22 obarthel Exp $
+ * $Id: crtbegin.c,v 1.11 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -27,6 +27,11 @@ static void (*__DTOR_LIST__[1]) (void) __attribute__(( used, section(".dtors"),
 
 /****************************************************************************/
 
+void _init(void);
+void _fini(void);
+
+/****************************************************************************/
+
 void
 _init(void)
 {
diff --git a/library/debug.c b/library/debug.c
index b94e215..7aa36c4 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -1,5 +1,5 @@
 /*
- * $Id: debug.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: debug.c,v 1.5 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=8
  *
@@ -160,7 +160,7 @@ _SHOWVALUE(
 {
 	if(__debug_level >= DEBUGLEVEL_Reports)
 	{
-		char *fmt;
+		const char *fmt;
 
 		switch(size)
 		{
@@ -207,7 +207,7 @@ _SHOWPOINTER(
 {
 	if(__debug_level >= DEBUGLEVEL_Reports)
 	{
-		char *fmt;
+		const char *fmt;
 
 		_INDENT();
 
diff --git a/library/libgen_basename.c b/library/libgen_basename.c
index 4761738..1996b96 100644
--- a/library/libgen_basename.c
+++ b/library/libgen_basename.c
@@ -1,5 +1,5 @@
 /*
- * $Id: libgen_basename.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: libgen_basename.c,v 1.5 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -58,7 +58,7 @@ basename(char *path)
 
 	if(path == NULL || path[0] == '\0')
 	{
-		result = ".";
+		result = (char *)".";
 	}
 	else
 	{
@@ -86,7 +86,7 @@ basename(char *path)
 		}
 		else
 		{
-			result = "/";
+			result = (char *)"/";
 		}
 	}
 
diff --git a/library/libgen_dirname.c b/library/libgen_dirname.c
index c72c989..d76e915 100644
--- a/library/libgen_dirname.c
+++ b/library/libgen_dirname.c
@@ -1,5 +1,5 @@
 /*
- * $Id: libgen_dirname.c,v 1.4 2006-01-08 12:04:23 obarthel Exp $
+ * $Id: libgen_dirname.c,v 1.5 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -58,7 +58,7 @@ dirname(char *path)
 
 	if(path == NULL || path[0] == '\0')
 	{
-		result = ".";
+		result = (char *)".";
 	}
 	else
 	{
@@ -71,7 +71,7 @@ dirname(char *path)
 
 		if(len > 0)
 		{
-			result = ".";
+			result = (char *)".";
 
 			for(i = len-1 ; i >= 0 ; i--)
 			{
@@ -87,7 +87,7 @@ dirname(char *path)
 		}
 		else
 		{
-			result = "/";
+			result = (char *)"/";
 		}
 	}
 
diff --git a/library/locale_localeconv.c b/library/locale_localeconv.c
index b1d740e..5764ddb 100644
--- a/library/locale_localeconv.c
+++ b/library/locale_localeconv.c
@@ -1,5 +1,5 @@
 /*
- * $Id: locale_localeconv.c,v 1.5 2006-01-08 12:04:23 obarthel Exp $
+ * $Id: locale_localeconv.c,v 1.6 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -56,16 +56,16 @@ localeconv(void)
 	/* This makes up the current locale settings from the various
 	 * components in use.
 	 */
-	loc.decimal_point		= (numeric_locale != NULL) ? ((char *)numeric_locale->loc_DecimalPoint) : ".";
-	loc.thousands_sep		= (numeric_locale != NULL) ? ((char *)numeric_locale->loc_GroupSeparator) : "";
-	loc.grouping			= (numeric_locale != NULL) ? ((char *)numeric_locale->loc_Grouping) : "";
-	loc.int_curr_symbol		= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonIntCS) : "";
-	loc.currency_symbol		= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonCS) : "";
-	loc.mon_decimal_point	= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonDecimalPoint) : "";
-	loc.mon_thousands_sep	= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonGroupSeparator) : "";
-	loc.mon_grouping		= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonGrouping) : "";
-	loc.positive_sign		= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonPositiveSign) : "";
-	loc.negative_sign		= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonNegativeSign) : "";
+	loc.decimal_point		= (numeric_locale != NULL) ? ((char *)numeric_locale->loc_DecimalPoint) : (char *)".";
+	loc.thousands_sep		= (numeric_locale != NULL) ? ((char *)numeric_locale->loc_GroupSeparator) : (char *)"";
+	loc.grouping			= (numeric_locale != NULL) ? ((char *)numeric_locale->loc_Grouping) : (char *)"";
+	loc.int_curr_symbol		= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonIntCS) : (char *)"";
+	loc.currency_symbol		= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonCS) : (char *)"";
+	loc.mon_decimal_point	= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonDecimalPoint) : (char *)"";
+	loc.mon_thousands_sep	= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonGroupSeparator) : (char *)"";
+	loc.mon_grouping		= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonGrouping) : (char *)"";
+	loc.positive_sign		= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonPositiveSign) : (char *)"";
+	loc.negative_sign		= (monetary_locale != NULL) ? ((char *)monetary_locale->loc_MonNegativeSign) : (char *)"";
 	loc.int_frac_digits		= (monetary_locale != NULL) ? monetary_locale->loc_MonIntFracDigits : CHAR_MAX;
 	loc.frac_digits			= (monetary_locale != NULL) ? monetary_locale->loc_MonFracDigits : CHAR_MAX;
 	loc.p_cs_precedes		= (monetary_locale != NULL) ? monetary_locale->loc_MonPositiveCSPos : CHAR_MAX;
diff --git a/library/math_exp.c b/library/math_exp.c
index f9580b4..142f703 100644
--- a/library/math_exp.c
+++ b/library/math_exp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: math_exp.c,v 1.7 2006-09-22 07:54:24 obarthel Exp $
+ * $Id: math_exp.c,v 1.8 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -159,7 +159,7 @@ INLINE STATIC double
 __exp(double x)
 {
 	double y,hi=0,lo=0,c,t;
-	int k,xsb;
+	int k=0,xsb;
 	unsigned int hx;
 
 	GET_HIGH_WORD(hx,x);
diff --git a/library/stdio_filliobreadbuffer.c b/library/stdio_filliobreadbuffer.c
index eafc6eb..0c8ac74 100644
--- a/library/stdio_filliobreadbuffer.c
+++ b/library/stdio_filliobreadbuffer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_filliobreadbuffer.c,v 1.11 2006-01-08 12:04:24 obarthel Exp $
+ * $Id: stdio_filliobreadbuffer.c,v 1.12 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -66,7 +66,7 @@ __fill_iob_read_buffer(struct iob * file)
 	SHOWVALUE(file->iob_BufferSize);
 
 	fam.fam_Action	= file_action_read;
-	fam.fam_Data	= file->iob_Buffer;
+	fam.fam_Data	= (char *)file->iob_Buffer;
 	fam.fam_Size	= file->iob_BufferSize;
 
 	assert( file->iob_Action != NULL );
diff --git a/library/stdio_flushiobwritebuffer.c b/library/stdio_flushiobwritebuffer.c
index a32a877..79061a4 100644
--- a/library/stdio_flushiobwritebuffer.c
+++ b/library/stdio_flushiobwritebuffer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_flushiobwritebuffer.c,v 1.8 2006-01-08 12:04:24 obarthel Exp $
+ * $Id: stdio_flushiobwritebuffer.c,v 1.9 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -70,7 +70,7 @@ __flush_iob_write_buffer(struct iob * file)
 		SHOWMSG("calling the hook");
 
 		fam.fam_Action	= file_action_write;
-		fam.fam_Data	= file->iob_Buffer;
+		fam.fam_Data	= (char *)file->iob_Buffer;
 		fam.fam_Size	= file->iob_BufferWriteBytes;
 
 		assert( file->iob_Action != NULL );
diff --git a/library/stdio_initializeiob.c b/library/stdio_initializeiob.c
index e944980..f16c577 100644
--- a/library/stdio_initializeiob.c
+++ b/library/stdio_initializeiob.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_initializeiob.c,v 1.5 2006-01-08 12:04:24 obarthel Exp $
+ * $Id: stdio_initializeiob.c,v 1.6 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -54,7 +54,7 @@ __initialize_iob(
 	memset(iob,0,sizeof(*iob));
 
 	iob->iob_CustomBuffer	= custom_buffer;
-	iob->iob_Buffer			= buffer;
+	iob->iob_Buffer			= (UBYTE *)buffer;
 	iob->iob_BufferSize		= buffer_size;
 	iob->iob_Descriptor		= file_descriptor;
 	iob->iob_SlotNumber		= slot_number;
diff --git a/library/stdio_locksemaphorename.c b/library/stdio_locksemaphorename.c
index ca76750..3952903 100644
--- a/library/stdio_locksemaphorename.c
+++ b/library/stdio_locksemaphorename.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_locksemaphorename.c,v 1.4 2006-01-08 12:04:24 obarthel Exp $
+ * $Id: stdio_locksemaphorename.c,v 1.5 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -37,4 +37,4 @@
 
 /****************************************************************************/
 
-char * NOCOMMON __file_lock_semaphore_name = "Advisory File Locking";
+char * NOCOMMON __file_lock_semaphore_name = (char *)"Advisory File Locking";
diff --git a/library/stdio_setvbuf.c b/library/stdio_setvbuf.c
index d26d5e2..c8afaaf 100644
--- a/library/stdio_setvbuf.c
+++ b/library/stdio_setvbuf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_setvbuf.c,v 1.9 2006-01-08 12:04:25 obarthel Exp $
+ * $Id: stdio_setvbuf.c,v 1.10 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -154,7 +154,7 @@ setvbuf(FILE *stream,char *buf,int bufmode,size_t size)
 	if(bufmode == IOBF_BUFFER_MODE_NONE)
 	{
 		/* Use the default buffer, which is one byte in size. */
-		new_buffer	= &file->iob_SingleByte;
+		new_buffer	= (char *)&file->iob_SingleByte;
 		size		= 1;
 	}
 	else
@@ -162,7 +162,7 @@ setvbuf(FILE *stream,char *buf,int bufmode,size_t size)
 		/* Replace the old buffer. */
 		if(buf != NULL)
 		{
-			new_buffer = (UBYTE *)buf;
+			new_buffer = (char *)buf;
 		}
 		else
 		{
@@ -178,7 +178,7 @@ setvbuf(FILE *stream,char *buf,int bufmode,size_t size)
 	assert( file->iob_BufferReadBytes == 0 );
 	assert( file->iob_BufferWriteBytes == 0 );
 
-	file->iob_Buffer		= new_buffer;
+	file->iob_Buffer		= (UBYTE *)new_buffer;
 	file->iob_BufferSize	= size;
 
 	file->iob_Flags &= ~IOBF_BUFFER_MODE;
diff --git a/library/stdio_vfprintf.c b/library/stdio_vfprintf.c
index ff804eb..161e0df 100644
--- a/library/stdio_vfprintf.c
+++ b/library/stdio_vfprintf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_vfprintf.c,v 1.21 2006-01-08 12:04:25 obarthel Exp $
+ * $Id: stdio_vfprintf.c,v 1.22 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -1329,7 +1329,7 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 			#if defined(NDEBUG)
 			{
 				if(output_buffer == NULL)
-					output_buffer = "";
+					output_buffer = (char *)"";
 			}
 			#else
 			{
@@ -1504,13 +1504,13 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 
 		/* Get ready to prefix a sign character, if required. */
 		if(FLAG_IS_SET(format_flags,FORMATF_IsNegative))
-			prefix = "-";
+			prefix = (char *)"-";
 		else if (FLAG_IS_SET(format_flags,FORMATF_ProduceSign))
-			prefix = "+";
+			prefix = (char *)"+";
 		else if (FLAG_IS_SET(format_flags,FORMATF_ProduceSpace))
-			prefix = " ";
+			prefix = (char *)" ";
 		else if (FLAG_IS_SET(format_flags,FORMATF_ZeroPrefix))
-			prefix = "0";
+			prefix = (char *)"0";
 		else
 			prefix = NULL;
 
diff --git a/library/stdlib_arg.c b/library/stdlib_arg.c
index 3aa1ff3..2bfc335 100644
--- a/library/stdlib_arg.c
+++ b/library/stdlib_arg.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_arg.c,v 1.13 2006-09-22 07:54:25 obarthel Exp $
+ * $Id: stdlib_arg.c,v 1.14 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -146,7 +146,7 @@ ARG_CONSTRUCTOR(arg_init)
 		/* Get the shell parameter string and find out
 		   how long it is, stripping a trailing line
 		   feed and blank spaces if necessary. */
-		arg_str = GetArgStr();
+		arg_str = (unsigned char *)GetArgStr();
 
 		while(is_space(*arg_str))
 			arg_str++;
@@ -257,9 +257,9 @@ ARG_CONSTRUCTOR(arg_init)
 
 				str++;
 
-				__argv[__argc++] = str;
+				__argv[__argc++] = (char *)str;
 
-				arg = str;
+				arg = (char *)str;
 
 				/* Process the quoted string. */
 				while((*str) != '\0' && NOT is_final_quote_character(str))
@@ -314,7 +314,7 @@ ARG_CONSTRUCTOR(arg_init)
 			}
 			else
 			{
-				__argv[__argc++] = str;
+				__argv[__argc++] = (char *)str;
 
 				while((*str) != '\0' && NOT is_space(*str))
 					str++;
diff --git a/library/stdlib_main.c b/library/stdlib_main.c
index 8d7aad3..405c47c 100644
--- a/library/stdlib_main.c
+++ b/library/stdlib_main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_main.c,v 1.30 2006-01-08 12:04:25 obarthel Exp $
+ * $Id: stdlib_main.c,v 1.31 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -347,7 +347,7 @@ _main(void)
 	/* Try to open the libraries we need to proceed. */
 	if(CANNOT open_libraries())
 	{
-		char * error_message;
+		const char * error_message;
 
 		/* If available, use the error message provided by the client. */
 		error_message = __minimum_os_lib_error;
diff --git a/library/stdlib_setenv.c b/library/stdlib_setenv.c
index a92c4c4..00c9419 100644
--- a/library/stdlib_setenv.c
+++ b/library/stdlib_setenv.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_setenv.c,v 1.10 2006-01-08 12:04:26 obarthel Exp $
+ * $Id: stdlib_setenv.c,v 1.11 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -220,7 +220,7 @@ setenv(const char *original_name, const char *original_value, int overwrite)
 	}
 
 	if(value == NULL)
-		value = "";
+		value = (char *)"";
 
 	SHOWSTRING(name);
 	SHOWSTRING(value);
diff --git a/library/string_memcpy.c b/library/string_memcpy.c
index 947aad8..d90406d 100644
--- a/library/string_memcpy.c
+++ b/library/string_memcpy.c
@@ -1,5 +1,5 @@
 /*
- * $Id: string_memcpy.c,v 1.7 2006-01-08 12:04:26 obarthel Exp $
+ * $Id: string_memcpy.c,v 1.8 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -312,8 +312,8 @@ __memcpy(unsigned char * to,unsigned char * from,size_t len)
 				len -= sizeof(long);
 			}		
 
-			to		= (char *)_to;
-			from	= (char *)_from;
+			to		= (unsigned char *)_to;
+			from	= (unsigned char *)_from;
 		}
 	}
 
diff --git a/library/string_memmove.c b/library/string_memmove.c
index 67df679..037953f 100644
--- a/library/string_memmove.c
+++ b/library/string_memmove.c
@@ -1,5 +1,5 @@
 /*
- * $Id: string_memmove.c,v 1.6 2006-01-08 12:04:26 obarthel Exp $
+ * $Id: string_memmove.c,v 1.7 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -447,8 +447,8 @@ __memmove(unsigned char * to,unsigned char * from,size_t len)
 					len -= sizeof(long);
 				}		
 
-				to		= (char *)_to;
-				from	= (char *)_from;
+				to		= (unsigned char *)_to;
+				from	= (unsigned char *)_from;
 			}
 		}
 
@@ -549,8 +549,8 @@ __memmove(unsigned char * to,unsigned char * from,size_t len)
 					len -= sizeof(long);
 				}		
 
-				to		= (char *)_to;
-				from	= (char *)_from;
+				to		= (unsigned char *)_to;
+				from	= (unsigned char *)_from;
 			}
 		}
 
diff --git a/library/string_memset.c b/library/string_memset.c
index a444f02..bcda224 100644
--- a/library/string_memset.c
+++ b/library/string_memset.c
@@ -1,5 +1,5 @@
 /*
- * $Id: string_memset.c,v 1.7 2006-01-08 12:04:26 obarthel Exp $
+ * $Id: string_memset.c,v 1.8 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -116,7 +116,7 @@ __memset(unsigned char * to,unsigned char value,size_t len)
 				len -= sizeof(long);
 			}		
 
-			to = (char *)_to;
+			to = (unsigned char *)_to;
 		}
 	}
 
diff --git a/library/systeminfo_sysinfo.c b/library/systeminfo_sysinfo.c
index d52642c..496b6be 100644
--- a/library/systeminfo_sysinfo.c
+++ b/library/systeminfo_sysinfo.c
@@ -1,5 +1,5 @@
 /*
- * $Id: systeminfo_sysinfo.c,v 1.4 2006-09-21 09:24:20 obarthel Exp $
+ * $Id: systeminfo_sysinfo.c,v 1.5 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -136,8 +136,8 @@ sysinfo(int cmd,char *buf,long buflen)
 				/* Solaris uses "ppc" as the isa name, but gcc uses powerpc. "ppc+altivec" follows the
 				   convention of specifying isa+ext from Solaris on SPARC machines. This way of implementing
 				   SI_ISALIST seemed like a good idea at the time. */
+				const char * s;
 				uint32 vecu;
-				char * s;
 
 				GetCPUInfoTags(GCIT_VectorUnit,&vecu,TAG_DONE);
 
diff --git a/library/time_asctime_r.c b/library/time_asctime_r.c
index 971cfca..c94c8e6 100644
--- a/library/time_asctime_r.c
+++ b/library/time_asctime_r.c
@@ -1,5 +1,5 @@
 /*
- * $Id: time_asctime_r.c,v 1.8 2006-01-08 12:04:27 obarthel Exp $
+ * $Id: time_asctime_r.c,v 1.9 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -177,7 +177,7 @@ __asctime_r(const struct tm *tm,char * buffer,size_t buffer_size)
 	}
 	else
 	{
-		result = "";
+		result = (char *)"";
 	}
 
  out:
diff --git a/library/unistd_def_path.c b/library/unistd_def_path.c
index 3039617..1be4f61 100644
--- a/library/unistd_def_path.c
+++ b/library/unistd_def_path.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_def_path.c,v 1.2 2006-08-01 19:06:48 obarthel Exp $
+ * $Id: unistd_def_path.c,v 1.3 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -37,4 +37,4 @@
 
 /****************************************************************************/
 
-char * __default_path = "/gcc/bin:/SDK/C:/SDK/Local/C:/C:.";
+char * __default_path = (char *)"/gcc/bin:/SDK/C:/SDK/Local/C:/C:.";
diff --git a/library/unistd_def_path_delimiter.c b/library/unistd_def_path_delimiter.c
index 00c1305..bd32506 100644
--- a/library/unistd_def_path_delimiter.c
+++ b/library/unistd_def_path_delimiter.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_def_path_delimiter.c,v 1.2 2006-08-01 19:06:48 obarthel Exp $
+ * $Id: unistd_def_path_delimiter.c,v 1.3 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -37,4 +37,4 @@
 
 /****************************************************************************/
 
-char * __default_path_delimiter = ":";
+char * __default_path_delimiter = (char *)":";
diff --git a/library/unistd_execvp.c b/library/unistd_execvp.c
index 580fd9a..f2b4d42 100644
--- a/library/unistd_execvp.c
+++ b/library/unistd_execvp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_execvp.c,v 1.5 2006-08-02 14:44:01 obarthel Exp $
+ * $Id: unistd_execvp.c,v 1.6 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -161,7 +161,7 @@ execvp(const char *command,char * const argv[])
 		while((search_prefix = local_strsep(&path,path_delimiter)) != NULL)
 		{
 			if((*search_prefix) == '\0')
-				search_prefix = ".";
+				search_prefix = (char *)".";
 
 			search_prefix_len = strlen(search_prefix);
 
diff --git a/library/unistd_ttyname.c b/library/unistd_ttyname.c
index 0c2782e..f128a43 100755
--- a/library/unistd_ttyname.c
+++ b/library/unistd_ttyname.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_ttyname.c,v 1.3 2006-01-08 12:04:27 obarthel Exp $
+ * $Id: unistd_ttyname.c,v 1.4 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -136,7 +136,7 @@ ttyname(int file_descriptor)
 		goto out;
 	}
 
-	result = "CONSOLE:";
+	result = (char *)"CONSOLE:";
 
  out:
 
diff --git a/library/usergroup_crypt.c b/library/usergroup_crypt.c
index 48d3e5a..aaa5fb9 100644
--- a/library/usergroup_crypt.c
+++ b/library/usergroup_crypt.c
@@ -1,5 +1,5 @@
 /*
- * $Id: usergroup_crypt.c,v 1.4 2006-01-08 12:04:27 obarthel Exp $
+ * $Id: usergroup_crypt.c,v 1.5 2006-09-22 09:02:51 obarthel Exp $
  *
  * :ts=4
  *
@@ -79,7 +79,7 @@ crypt(const char *key,const char *salt)
 	#endif /* CHECK_FOR_NULL_POINTERS */
 
 	PROFILE_OFF();
-	result = __crypt((STRPTR)key,(STRPTR)salt);
+	result = (char *)__crypt((STRPTR)key,(STRPTR)salt);
 	PROFILE_ON();
 
 	SHOWSTRING(result);