diff --git a/reference/XmlRpcClient/XmlRpcClient.cpp b/reference/XmlRpcClient/XmlRpcClient.cpp
index 2c83a3ad3..45045aac2 100644
--- a/reference/XmlRpcClient/XmlRpcClient.cpp
+++ b/reference/XmlRpcClient/XmlRpcClient.cpp
@@ -1,3 +1,5 @@
+#include <Core/Core.h>
+// Note: Core.h needs to be included before Rpc.h because of Win32 rpc.h name clash problem
 #include <Core/Rpc/Rpc.h>
 
 using namespace Upp;
@@ -8,7 +10,7 @@ void Compute(double a, String op, double b)
 	Cout() << a << op << b << '=';
 	XmlRpcRequest call("127.0.0.1:1234");
 	if(call("compute", a, op, b) >> result)
-	   	Cout() << result;
+		Cout() << result;
 	else
 		Cout() << " error: " << call.GetError();
 	Cout() << '\n';
@@ -18,7 +20,7 @@ CONSOLE_APP_MAIN
 {
 	Time tm;
 	XmlRpcRequest("127.0.0.1:1234")("ping") >> tm;
-	Cout() << tm << '\n';	
+	Cout() << tm << '\n';
 
 	Compute(12, "+", 12);
 	Compute(12, "*", 12);
diff --git a/reference/XmlRpcServer/XmlRpcServer.cpp b/reference/XmlRpcServer/XmlRpcServer.cpp
index 9f0278bb5..01a1a9f18 100644
--- a/reference/XmlRpcServer/XmlRpcServer.cpp
+++ b/reference/XmlRpcServer/XmlRpcServer.cpp
@@ -1,3 +1,5 @@
+#include <Core/Core.h>
+// Note: Core.h needs to be included before Rpc.h because of Win32 rpc.h name clash problem
 #include <Core/Rpc/Rpc.h>
 
 using namespace Upp;