diff --git a/MongoDB/include/Poco/MongoDB/MessageHeader.h b/MongoDB/include/Poco/MongoDB/MessageHeader.h
index 1f86612aa..0f56d9e83 100644
--- a/MongoDB/include/Poco/MongoDB/MessageHeader.h
+++ b/MongoDB/include/Poco/MongoDB/MessageHeader.h
@@ -26,8 +26,11 @@ namespace Poco {
 namespace MongoDB {
 
 
+class Message; // Required to disambiguate friend declaration in MessageHeader.
+
+
 class MongoDB_API MessageHeader
-	/// Represents the message header which is always prepended to a 
+	/// Represents the message header which is always prepended to a
 	/// MongoDB request or response message.
 {
 public:
@@ -70,7 +73,7 @@ public:
 		/// Sets the request ID of the current message.
 
 	Int32 responseTo() const;
-		/// Returns the request id from the original request. 
+		/// Returns the request id from the original request.
 
 private:
 	void setMessageLength(Int32 length);