5 files changed, 7 insertions, 7 deletions
diff --git a/qpid/cpp/examples/messaging/drain.cpp b/qpid/cpp/examples/messaging/drain.cpp
index bfd9bdccbe..0c58cc25e6 100644
--- a/qpid/cpp/examples/messaging/drain.cpp
+++ b/qpid/cpp/examples/messaging/drain.cpp
@@ -21,7 +21,7 @@
 
 #include <qpid/messaging/Connection.h>
 #include <qpid/messaging/Message.h>
-#include <qpid/messaging/Message_ostream.h>
+#include <qpid/messaging/Message_io.h>
 #include <qpid/messaging/Receiver.h>
 #include <qpid/messaging/Session.h>
 
diff --git a/qpid/cpp/examples/messaging/spout.cpp b/qpid/cpp/examples/messaging/spout.cpp
index b2fc3aa40b..d11bb8bd03 100644
--- a/qpid/cpp/examples/messaging/spout.cpp
+++ b/qpid/cpp/examples/messaging/spout.cpp
@@ -22,7 +22,7 @@
 #include <qpid/messaging/Address.h>
 #include <qpid/messaging/Connection.h>
 #include <qpid/messaging/Message.h>
-#include <qpid/messaging/Message_ostream.h>
+#include <qpid/messaging/Message_io.h>
 #include <qpid/messaging/Sender.h>
 #include <qpid/messaging/Session.h>
 #include <qpid/types/Variant.h>
diff --git a/qpid/cpp/include/qpid/messaging/Message_ostream.h b/qpid/cpp/include/qpid/messaging/Message_io.h
index f5e36bda24..810c44810c 100644
--- a/qpid/cpp/include/qpid/messaging/Message_ostream.h
+++ b/qpid/cpp/include/qpid/messaging/Message_io.h
@@ -1,5 +1,5 @@
-#ifndef QPID_MESSAGING_MESSAGE_OSTREAM_H
-#define QPID_MESSAGING_MESSAGE_OSTREAM_H
+#ifndef QPID_MESSAGING_MESSAGE_IO_H
+#define QPID_MESSAGING_MESSAGE_IO_H
 
 /*
  *
@@ -31,4 +31,4 @@ QPID_MESSAGING_EXTERN std::ostream& operator<<(std::ostream&, const Message&);
 
 }} // namespace qpid::messaging
 
-#endif  /*!QPID_MESSAGING_MESSAGE_OSTREAM_H*/
+#endif  /*!QPID_MESSAGING_MESSAGE_IO_H*/
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index 43037ee2bf..70288c7661 100644
--- a/qpid/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
@@ -1064,7 +1064,7 @@ set (qpidmessaging_SOURCES
      qpid/messaging/ConnectionOptions.cpp
      qpid/messaging/MessageImpl.h
      qpid/messaging/MessageImpl.cpp
-     qpid/messaging/Message_ostream.cpp
+     qpid/messaging/Message_io.cpp
      qpid/messaging/ProtocolRegistry.cpp
      qpid/messaging/amqp/EncodedMessage.h
      qpid/messaging/amqp/EncodedMessage.cpp
diff --git a/qpid/cpp/src/qpid/messaging/Message_ostream.cpp b/qpid/cpp/src/qpid/messaging/Message_io.cpp
index 6adae12315..b6bc43a4e6 100644
--- a/qpid/cpp/src/qpid/messaging/Message_ostream.cpp
+++ b/qpid/cpp/src/qpid/messaging/Message_io.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "qpid/messaging/Message_ostream.h"
+#include "qpid/messaging/Message_io.h"
 #include <ostream>
 
 namespace qpid {