diff --git a/src/build/libbe/support/String.cpp b/src/build/libbe/support/String.cpp
index f81880c50e..0e9da6bd17 100644
--- a/src/build/libbe/support/String.cpp
+++ b/src/build/libbe/support/String.cpp
@@ -2118,7 +2118,7 @@ BString::_DoPrepend(const char *str, int32 count)
 int32
 BString::_FindAfter(const char *str, int32 offset, int32 strlen) const
 {
-	char *ptr = strstr(String() + offset, str);
+	const char *ptr = strstr(String() + offset, str);
 
 	if (ptr != NULL)
 		return ptr - String();
@@ -2130,7 +2130,7 @@ BString::_FindAfter(const char *str, int32 offset, int32 strlen) const
 int32
 BString::_IFindAfter(const char *str, int32 offset, int32 strlen) const
 {
-	char *ptr = strcasestr(String() + offset, str);
+	const char *ptr = strcasestr(String() + offset, str);
 
 	if (ptr != NULL)
 		return ptr - String();
@@ -2142,7 +2142,7 @@ BString::_IFindAfter(const char *str, int32 offset, int32 strlen) const
 int32
 BString::_ShortFindAfter(const char *str, int32 len) const
 {
-	char *ptr = strstr(String(), str);
+	const char *ptr = strstr(String(), str);
 
 	if (ptr != NULL)
 		return ptr - String();
diff --git a/src/build/libroot/fs.cpp b/src/build/libroot/fs.cpp
index c2a0c0e95c..0ed260befa 100644
--- a/src/build/libroot/fs.cpp
+++ b/src/build/libroot/fs.cpp
@@ -163,7 +163,7 @@ normalize_entry_path(const char *path, string &normalizedPath)
 	const char *leafName = NULL;
 	
 	string dirPathString;
-	if (char *lastSlash = strrchr(path, '/')) {
+	if (const char *lastSlash = strrchr(path, '/')) {
 		// found a slash: decompose into dir path and leaf name
 		leafName = lastSlash + 1;
 		if (leafName[0] == '\0') {