diff --git a/reactos/tools/rbuild_helper/rbuild_helper.cpp b/reactos/tools/rbuild_helper/rbuild_helper.cpp
index 33d59997da2..acf71f51986 100644
--- a/reactos/tools/rbuild_helper/rbuild_helper.cpp
+++ b/reactos/tools/rbuild_helper/rbuild_helper.cpp
@@ -27,6 +27,7 @@ int main() { return 1; }
 
 #else
 
+#include <algorithm>
 #include <functional>
 #include <iterator>
 #include <limits>
@@ -95,7 +96,7 @@ namespace
 		DWORD cchMessage = FormatMessageA
 		(
 			FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_STRING,
-			"msc_helper: %1!s!() failed: error %2!lu!\n",
+			"rbuild_helper: %1!s!() failed: error %2!lu!\n",
 			0,
 			0,
 			(LPSTR)&pszMessage,
@@ -135,7 +136,7 @@ namespace
 	DECLSPEC_NORETURN
 	void OutOfMemory()
 	{
-		DieMessage("msc_helper: out of memory\n");
+		DieMessage("rbuild_helper: out of memory\n");
 	}
 
 	template<class CharT>
@@ -156,7 +157,7 @@ namespace
 		void push_back(TCHAR x)
 		{
 			if(x > std::numeric_limits<CharT>::max() || x < std::numeric_limits<CharT>::min())
-				DieMessage("msc_helper: invalid character in command line\n");
+				DieMessage("rbuild_helper: invalid character in command line\n");
 
 			m_arg = static_cast<CharT *>(HeapReAlloc(GetProcessHeap(), 0, m_arg, (m_argLen + 1) * sizeof(CharT)));
 
@@ -304,7 +305,7 @@ namespace
 				DWORD cchPipeName = FormatMessage
 				(
 					FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_STRING,
-					TEXT("\\\\.\\pipe\\msc_helper-%1!08X!-%2!08X!"),
+					TEXT("\\\\.\\pipe\\rbuild_helper-%1!08X!-%2!08X!"),
 					0,
 					0,
 					(LPTSTR)&m_pszPipeName,