diff --git a/library/debug.c b/library/debug.c
index 7aa36c4..6b05d45 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -1,5 +1,5 @@
 /*
- * $Id: debug.c,v 1.5 2006-09-22 09:02:51 obarthel Exp $
+ * $Id: debug.c,v 1.6 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=8
  *
@@ -273,7 +273,7 @@ _DPRINTF(const char *fmt,...)
 		va_list args;
 
 		va_start(args,fmt);
-		KPutFmt((char *)fmt,args);
+		KPutFmt(fmt,args);
 		va_end(args);
 
 		KPrintF("\n");
@@ -288,7 +288,7 @@ _DLOG(const char *fmt,...)
 		va_list args;
 
 		va_start(args,fmt);
-		KPutFmt((char *)fmt,args);
+		KPutFmt(fmt,args);
 		va_end(args);
 	}
 }
diff --git a/library/dirent_readdir.c b/library/dirent_readdir.c
index 24c14d0..4bfa17a 100644
--- a/library/dirent_readdir.c
+++ b/library/dirent_readdir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dirent_readdir.c,v 1.9 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: dirent_readdir.c,v 1.10 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -88,7 +88,7 @@ readdir(DIR * directory_pointer)
 			{
 				D_S(struct FileInfoBlock,fib);
 				D_S(struct bcpl_name,bcpl_name);
-				UBYTE * name = bcpl_name->name;
+				char * name = (char *)bcpl_name->name;
 				BPTR dir_lock;
 
 				assert( (((ULONG)name) & 3) == 0 );
@@ -96,7 +96,7 @@ readdir(DIR * directory_pointer)
 				if(dh->dh_VolumeNode == NULL && NOT IsListEmpty((struct List *)&dh->dh_VolumeList))
 					dh->dh_VolumeNode = (struct Node *)dh->dh_VolumeList.mlh_Head;
 
-				strcpy((char *)name,"\1:"); /* BSTR for ":" */
+				strcpy(name,"\1:"); /* BSTR for ":" */
 
 				while(result == NULL && dh->dh_VolumeNode != NULL && dh->dh_VolumeNode->ln_Succ != NULL)
 				{
diff --git a/library/include/dos.h b/library/include/dos.h
index 0482d96..774ba15 100644
--- a/library/include/dos.h
+++ b/library/include/dos.h
@@ -1,5 +1,5 @@
 /*
- * $Id: dos.h,v 1.26 2006-09-22 07:54:25 obarthel Exp $
+ * $Id: dos.h,v 1.27 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -509,8 +509,8 @@ extern BOOL (*__expand_wildcard_args_check)(void);
  * ("/gcc/bin:/SDK/C:/SDK/Local/C:/C:.") as used by the execvp()
  * function.
  */
-extern char * __default_path_delimiter;
-extern char * __default_path;
+extern const char * __default_path_delimiter;
+extern const char * __default_path;
 
 /****************************************************************************/
 
diff --git a/library/locale_localeconv.c b/library/locale_localeconv.c
index 5764ddb..c7452a9 100644
--- a/library/locale_localeconv.c
+++ b/library/locale_localeconv.c
@@ -1,5 +1,5 @@
 /*
- * $Id: locale_localeconv.c,v 1.6 2006-09-22 09:02:51 obarthel Exp $
+ * $Id: locale_localeconv.c,v 1.7 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -54,18 +54,18 @@ localeconv(void)
 	monetary_locale	= __locale_table[LC_MONETARY];
 
 	/* This makes up the current locale settings from the various
-	 * components in use.
-	 */
-	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 *)"";
+	   components in use. */
+	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/stdio_record_locking.c b/library/stdio_record_locking.c
index 72740eb..0f7d623 100644
--- a/library/stdio_record_locking.c
+++ b/library/stdio_record_locking.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_record_locking.c,v 1.16 2006-04-05 08:39:45 obarthel Exp $
+ * $Id: stdio_record_locking.c,v 1.17 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -75,7 +75,7 @@ struct FileLockNode
 	struct MinList	fln_LockedRegionList;	/* List of locked regions */
 
 	BPTR			fln_FileParentDir;		/* Refers to the file's parent directory */
-	UBYTE			fln_FileName[1];		/* Name of the file; together with the
+	char 			fln_FileName[1];		/* Name of the file; together with the
 											 * parent directory, this should uniquely
 											 * identify the file.
 											 */
@@ -462,7 +462,7 @@ create_file_lock_node(struct fd * fd,struct FileLockNode ** result_ptr)
 		goto out;
 	}
 
-	strcpy((char *)fln->fln_FileName,fib->fib_FileName);
+	strcpy(fln->fln_FileName,fib->fib_FileName);
 
 	NewList((struct List *)&fln->fln_LockedRegionList);
 
diff --git a/library/stdio_vfprintf.c b/library/stdio_vfprintf.c
index 8007a38..7237227 100644
--- a/library/stdio_vfprintf.c
+++ b/library/stdio_vfprintf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_vfprintf.c,v 1.23 2006-09-25 13:43:06 obarthel Exp $
+ * $Id: stdio_vfprintf.c,v 1.24 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -1329,12 +1329,18 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 			#if defined(NDEBUG)
 			{
 				if(output_buffer == NULL)
-					output_buffer = (char *)"";
+				{
+					output_buffer = buffer;
+					strcpy(output_buffer,"");
+				}
 			}
 			#else
 			{
 				if(output_buffer == NULL)
-					output_buffer = "*NULL POINTER*";
+				{
+					output_buffer = buffer;
+					strcpy(output_buffer,"*NULL POINTER*");
+				}
 			}
 			#endif /* NDEBUG */
 
diff --git a/library/stdio_vfscanf.c b/library/stdio_vfscanf.c
index 2d45d64..432003c 100644
--- a/library/stdio_vfscanf.c
+++ b/library/stdio_vfscanf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_vfscanf.c,v 1.20 2006-01-08 12:04:25 obarthel Exp $
+ * $Id: stdio_vfscanf.c,v 1.21 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -897,9 +897,9 @@ vfscanf(FILE *stream, const char *format, va_list arg)
 							 */
 							if(__locale_table[LC_NUMERIC] != NULL)
 							{
-								unsigned char * point;
+								const unsigned char * point;
 
-								point = (unsigned char *)__locale_table[LC_NUMERIC]->loc_DecimalPoint;
+								point = (const unsigned char *)__locale_table[LC_NUMERIC]->loc_DecimalPoint;
 
 								if(c == (*point) || c == '.')
 								{
diff --git a/library/stdlib_arg.c b/library/stdlib_arg.c
index 2bfc335..a68db89 100644
--- a/library/stdlib_arg.c
+++ b/library/stdlib_arg.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_arg.c,v 1.14 2006-09-22 09:02:51 obarthel Exp $
+ * $Id: stdlib_arg.c,v 1.15 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -121,12 +121,12 @@ ARG_CONSTRUCTOR(arg_init)
 	/* Shell startup? */
 	if(__WBenchMsg == NULL)
 	{
-		BOOL			expand_wildcard_args;
-		size_t			number_of_arguments;
-		unsigned char *	arg_str;
-		size_t			arg_len;
-		unsigned char *	command_line;
-		unsigned char *	str;
+		BOOL					expand_wildcard_args;
+		size_t					number_of_arguments;
+		const unsigned char *	arg_str;
+		size_t					arg_len;
+		unsigned char *			command_line;
+		unsigned char *			str;
 
 		/* Check if wildcard expansion of command line parameters
 		   should be enabled. Note that the callback function, if
@@ -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 = (unsigned char *)GetArgStr();
+		arg_str = (const unsigned char *)GetArgStr();
 
 		while(is_space(*arg_str))
 			arg_str++;
diff --git a/library/stdlib_main.c b/library/stdlib_main.c
index 97a48e9..692ba7b 100644
--- a/library/stdlib_main.c
+++ b/library/stdlib_main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_main.c,v 1.32 2006-09-22 09:19:07 obarthel Exp $
+ * $Id: stdlib_main.c,v 1.33 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -476,7 +476,7 @@ _main(void)
 	{
 		struct CommandLineInterface * cli = Cli();
 		struct TagItem tags[12];
-		UBYTE program_name[256];
+		TEXT program_name[256];
 		unsigned int stack_size;
 		int i;
 
@@ -492,7 +492,7 @@ _main(void)
 		if(stack_size < cli->cli_DefaultStack * sizeof(LONG))
 			stack_size = cli->cli_DefaultStack * sizeof(LONG);
 
-		GetProgramName(program_name,sizeof(program_name));
+		GetProgramName(program_name,(LONG)sizeof(program_name));
 
 		i = 0;
 
diff --git a/library/stdlib_strtod.c b/library/stdlib_strtod.c
index e2dd8c6..b36877f 100644
--- a/library/stdlib_strtod.c
+++ b/library/stdlib_strtod.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_strtod.c,v 1.11 2006-01-08 12:04:26 obarthel Exp $
+ * $Id: stdlib_strtod.c,v 1.12 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -210,9 +210,9 @@ strtod(const char *str, char ** ptr)
 
 		if(__locale_table[LC_NUMERIC] != NULL)
 		{
-			char * point;
+			const char * point;
 
-			point = (char *)__locale_table[LC_NUMERIC]->loc_DecimalPoint;
+			point = (const char *)__locale_table[LC_NUMERIC]->loc_DecimalPoint;
 			if((*point) == (*str))
 			{
 				decimal_point_matches = 1;
diff --git a/library/stdlib_strtof.c b/library/stdlib_strtof.c
index 330156d..ff41ea4 100644
--- a/library/stdlib_strtof.c
+++ b/library/stdlib_strtof.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_strtof.c,v 1.11 2006-01-08 12:04:26 obarthel Exp $
+ * $Id: stdlib_strtof.c,v 1.12 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -210,9 +210,9 @@ strtof(const char *str, char ** ptr)
 
 		if(__locale_table[LC_NUMERIC] != NULL)
 		{
-			char * point;
+			const char * point;
 
-			point = (char *)__locale_table[LC_NUMERIC]->loc_DecimalPoint;
+			point = (const char *)__locale_table[LC_NUMERIC]->loc_DecimalPoint;
 			if((*point) == (*str))
 			{
 				decimal_point_matches = 1;
diff --git a/library/stdlib_unsetenv.c b/library/stdlib_unsetenv.c
index 72f87de..a93834b 100644
--- a/library/stdlib_unsetenv.c
+++ b/library/stdlib_unsetenv.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_unsetenv.c,v 1.7 2006-01-08 12:04:26 obarthel Exp $
+ * $Id: stdlib_unsetenv.c,v 1.8 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -54,11 +54,10 @@
 /****************************************************************************/
 
 void
-unsetenv(const char *original_name)
+unsetenv(const char *name)
 {
-	char * name = (char *)original_name;
 	char * name_copy = NULL;
-	unsigned i;
+	size_t i;
 
 	if(__check_abort_enabled)
 		__check_abort();
@@ -92,7 +91,7 @@ unsetenv(const char *original_name)
 	}
 
 	PROFILE_OFF();
-	DeleteVar(name,0);
+	DeleteVar((STRPTR)name,0);
 	PROFILE_ON();
 
  out:
diff --git a/library/unistd_def_path.c b/library/unistd_def_path.c
index 1be4f61..b3bdef0 100644
--- a/library/unistd_def_path.c
+++ b/library/unistd_def_path.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_def_path.c,v 1.3 2006-09-22 09:02:51 obarthel Exp $
+ * $Id: unistd_def_path.c,v 1.4 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -37,4 +37,4 @@
 
 /****************************************************************************/
 
-char * __default_path = (char *)"/gcc/bin:/SDK/C:/SDK/Local/C:/C:.";
+const char * __default_path = "/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 bd32506..06cf601 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.3 2006-09-22 09:02:51 obarthel Exp $
+ * $Id: unistd_def_path_delimiter.c,v 1.4 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -37,4 +37,4 @@
 
 /****************************************************************************/
 
-char * __default_path_delimiter = (char *)":";
+const char * __default_path_delimiter = ":";
diff --git a/library/unistd_execvp.c b/library/unistd_execvp.c
index f2b4d42..fbee9f1 100644
--- a/library/unistd_execvp.c
+++ b/library/unistd_execvp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_execvp.c,v 1.6 2006-09-22 09:02:51 obarthel Exp $
+ * $Id: unistd_execvp.c,v 1.7 2006-09-25 14:51:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -131,9 +131,9 @@ execvp(const char *command,char * const argv[])
 	else
 	{
 		size_t command_buffer_size = 0;
-		char * path_delimiter;
+		const char * path_delimiter;
 		char * path;
-		char * search_prefix;
+		const char * search_prefix;
 		size_t search_prefix_len;
 		size_t complete_path_len;
 		int error;
@@ -143,7 +143,7 @@ execvp(const char *command,char * const argv[])
 		   lateron when we will be calling getenv() again. */
 		path = getenv("PATH");
 		if(path == NULL)
-			path = __default_path;
+			path = (char *)__default_path;
 
 		path_copy = strdup(path);
 		if(path_copy == NULL)
@@ -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 = (char *)".";
+				search_prefix = ".";
 
 			search_prefix_len = strlen(search_prefix);