summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACEXML/common/AttributesImpl.i1
-rw-r--r--ACEXML/common/Encoding.cpp1
-rw-r--r--ACEXML/common/Exception.cpp1
-rw-r--r--ACEXML/common/HttpCharStream.cpp2
-rw-r--r--ACEXML/common/NamespaceSupport.cpp1
-rw-r--r--ACEXML/common/SAXExceptions.cpp1
-rw-r--r--ACEXML/common/StrCharStream.cpp1
-rw-r--r--ACEXML/common/StreamFactory.cpp2
-rw-r--r--ACEXML/common/Transcode.cpp1
-rw-r--r--ACEXML/common/URL_Addr.cpp1
-rw-r--r--ACEXML/common/URL_Addr.h1
-rw-r--r--ACEXML/common/URL_Addr.inl2
-rw-r--r--ACEXML/common/XML_Codecs.cpp2
-rw-r--r--ACEXML/parser/parser/Parser.cpp1
-rw-r--r--ACEXML/tests/ContentHandler_Test.cpp1
-rw-r--r--ACEXML/tests/HttpCharStream_Test.cpp1
-rw-r--r--ACEXML/tests/Transcoder_Test.cpp1
-rw-r--r--ChangeLog48
-rw-r--r--ace/Codeset_Registry.cpp2
-rw-r--r--ace/Connector.cpp3
-rw-r--r--ace/Local_Name_Space.cpp1
-rw-r--r--ace/Local_Name_Space_T.cpp1
-rw-r--r--ace/Module.i2
-rw-r--r--ace/Name_Space.cpp2
-rw-r--r--ace/Naming_Context.cpp1
-rw-r--r--ace/Obstack_T.cpp1
-rw-r--r--ace/Parse_Node.cpp1
-rw-r--r--ace/RMCast/RMCast_Partial_Message.cpp1
-rw-r--r--ace/RMCast/RMCast_Reordering.cpp1
-rw-r--r--ace/Remote_Name_Space.cpp1
-rw-r--r--ace/Service_Config.h1
-rw-r--r--ace/Service_Config.i1
-rw-r--r--ace/Service_Manager.cpp1
-rw-r--r--ace/Service_Types.cpp1
-rw-r--r--ace/Stream.cpp1
-rw-r--r--ace/Svc_Conf_y.cpp1
-rw-r--r--ace/UUID.cpp2
-rw-r--r--protocols/ace/RMCast/RMCast_Partial_Message.cpp1
-rw-r--r--protocols/ace/RMCast/RMCast_Reordering.cpp1
39 files changed, 95 insertions, 1 deletions
diff --git a/ACEXML/common/AttributesImpl.i b/ACEXML/common/AttributesImpl.i
index 87a905b3304..9749b46ba38 100644
--- a/ACEXML/common/AttributesImpl.i
+++ b/ACEXML/common/AttributesImpl.i
@@ -1,6 +1,7 @@
// -*- C++ -*- $Id$
#include "ace/ACE.h"
+#include "ace/OS_NS_string.h"
ACEXML_INLINE
ACEXML_Attribute::ACEXML_Attribute (void)
diff --git a/ACEXML/common/Encoding.cpp b/ACEXML/common/Encoding.cpp
index c47ded83051..4531fad20c3 100644
--- a/ACEXML/common/Encoding.cpp
+++ b/ACEXML/common/Encoding.cpp
@@ -1,6 +1,7 @@
// -*- C++ -*- $Id$
#include "ACEXML/common/Encoding.h"
+#include "ace/OS_NS_string.h"
const ACEXML_Char* ACEXML_Encoding::encoding_names_[8] = {
ACE_TEXT ("UCS-4BE"),
diff --git a/ACEXML/common/Exception.cpp b/ACEXML/common/Exception.cpp
index 88b2a5709a7..dc82c0a4c65 100644
--- a/ACEXML/common/Exception.cpp
+++ b/ACEXML/common/Exception.cpp
@@ -3,6 +3,7 @@
#include "ACEXML/common/Exception.h"
#include "ace/Log_Msg.h"
#include "ace/ACE.h"
+#include "ace/OS_NS_string.h"
static const ACEXML_Char ACEXML_Exception_name[] = {
'A', 'C', 'E', 'X', 'M', 'L',
diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp
index 716859d49c1..43ed73342ec 100644
--- a/ACEXML/common/HttpCharStream.cpp
+++ b/ACEXML/common/HttpCharStream.cpp
@@ -3,6 +3,8 @@
#include "ace/ACE.h"
#include "ace/ace_wchar.h"
#include "ace/Auto_Ptr.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
#include "ACEXML/common/HttpCharStream.h"
#include "ACEXML/common/Encoding.h"
diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp
index 04fdf6bfdfc..d89a02d8c51 100644
--- a/ACEXML/common/NamespaceSupport.cpp
+++ b/ACEXML/common/NamespaceSupport.cpp
@@ -1,6 +1,7 @@
// -*- C++ -*- $Id$
#include "ACEXML/common/NamespaceSupport.h"
+#include "ace/OS_NS_string.h"
#if !defined (__ACEXML_INLINE__)
# include "ACEXML/common/NamespaceSupport.i"
diff --git a/ACEXML/common/SAXExceptions.cpp b/ACEXML/common/SAXExceptions.cpp
index 4f56ed31d99..8ffa992d3b0 100644
--- a/ACEXML/common/SAXExceptions.cpp
+++ b/ACEXML/common/SAXExceptions.cpp
@@ -3,6 +3,7 @@
#include "ACEXML/common/SAXExceptions.h"
#include "ace/Log_Msg.h"
#include "ace/ACE.h"
+#include "ace/OS_NS_string.h"
static const ACEXML_Char ACEXML_SAXException_name[] = {
'A', 'C', 'E', 'X', 'M', 'L', '_',
diff --git a/ACEXML/common/StrCharStream.cpp b/ACEXML/common/StrCharStream.cpp
index e37bbb4f6d8..93528e452e0 100644
--- a/ACEXML/common/StrCharStream.cpp
+++ b/ACEXML/common/StrCharStream.cpp
@@ -4,6 +4,7 @@
#include "ACEXML/common/Encoding.h"
#include "ace/ACE.h"
#include "ace/Log_Msg.h"
+#include "ace/OS_NS_string.h"
ACEXML_StrCharStream::ACEXML_StrCharStream (void)
: start_ (0), ptr_ (0), end_ (0), encoding_ (0), name_ (0)
diff --git a/ACEXML/common/StreamFactory.cpp b/ACEXML/common/StreamFactory.cpp
index f97e8617bda..4d73b7de71a 100644
--- a/ACEXML/common/StreamFactory.cpp
+++ b/ACEXML/common/StreamFactory.cpp
@@ -1,5 +1,7 @@
// $Id$
+#include "ace/OS_NS_string.h"
+
#include "ACEXML/common/StreamFactory.h"
#include "ACEXML/common/FileCharStream.h"
#include "ACEXML/common/HttpCharStream.h"
diff --git a/ACEXML/common/Transcode.cpp b/ACEXML/common/Transcode.cpp
index bbc434e49d6..cf38a487af4 100644
--- a/ACEXML/common/Transcode.cpp
+++ b/ACEXML/common/Transcode.cpp
@@ -1,6 +1,7 @@
// -*- C++ -*- $Id$
#include "ACEXML/common/Transcode.h"
+#include "ace/OS_NS_string.h"
#if !defined (__ACEXML_INLINE__)
# include "ACEXML/common/Transcode.i"
diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp
index a1a9ea7aa40..3bbf40da0d9 100644
--- a/ACEXML/common/URL_Addr.cpp
+++ b/ACEXML/common/URL_Addr.cpp
@@ -11,6 +11,7 @@ ACE_RCSID(common, ACEXML_URL_Addr, "$Id$")
#include "ace/Log_Msg.h"
#include "ace/Auto_Ptr.h"
#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
ACEXML_URL_Addr::ACEXML_URL_Addr (void)
: path_name_ (0),
diff --git a/ACEXML/common/URL_Addr.h b/ACEXML/common/URL_Addr.h
index d877c946b14..2ec75461e61 100644
--- a/ACEXML/common/URL_Addr.h
+++ b/ACEXML/common/URL_Addr.h
@@ -19,6 +19,7 @@
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "ace/Default_Constants.h"
#include "ace/INET_Addr.h"
#include "ACEXML/common/XML_Types.h"
#include "ACEXML/common/ACEXML_Export.h"
diff --git a/ACEXML/common/URL_Addr.inl b/ACEXML/common/URL_Addr.inl
index cd0ff625d9c..ba6d34b5e4b 100644
--- a/ACEXML/common/URL_Addr.inl
+++ b/ACEXML/common/URL_Addr.inl
@@ -3,7 +3,7 @@
#include "ace/ACE.h"
#include "ace/INET_Addr.h"
#include "ace/Log_Msg.h"
-
+#include "ace/OS_NS_string.h"
ACE_INLINE size_t
ACEXML_URL_Addr::calculate_length (int ipaddr_format) const
diff --git a/ACEXML/common/XML_Codecs.cpp b/ACEXML/common/XML_Codecs.cpp
index 63230d8c6d7..737e23e6bc8 100644
--- a/ACEXML/common/XML_Codecs.cpp
+++ b/ACEXML/common/XML_Codecs.cpp
@@ -1,6 +1,8 @@
// -*- C++ -*- $Id$
#include "ace/Auto_Ptr.h"
+#include "ace/OS_Memory.h"
+#include "ace/OS_NS_string.h"
#include "ACEXML/common/XML_Codecs.h"
ACE_RCSID (common, XML_Codecs, "$Id$")
diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp
index 213b4beaae8..78b03be23ab 100644
--- a/ACEXML/parser/parser/Parser.cpp
+++ b/ACEXML/parser/parser/Parser.cpp
@@ -12,6 +12,7 @@
#include "ACEXML/common/StrCharStream.h"
#include "ACEXML/common/StreamFactory.h"
#include "ACEXML/parser/parser/ParserInternals.h"
+#include "ace/OS_NS_string.h"
#include "ace/OS_NS_strings.h"
static const ACEXML_Char default_attribute_type[] = ACE_TEXT ("CDATA");
diff --git a/ACEXML/tests/ContentHandler_Test.cpp b/ACEXML/tests/ContentHandler_Test.cpp
index 23eb3f96e23..604cf9873d3 100644
--- a/ACEXML/tests/ContentHandler_Test.cpp
+++ b/ACEXML/tests/ContentHandler_Test.cpp
@@ -12,6 +12,7 @@
#include "ACEXML/common/InputSource.h"
#include "ACEXML/common/StrCharStream.h"
#include "ACEXML/parser/parser/Parser.h"
+#include "ace/OS_NS_string.h"
#include "ace/OS_main.h"
class Basic_Content_Tester : public ACEXML_DefaultHandler
diff --git a/ACEXML/tests/HttpCharStream_Test.cpp b/ACEXML/tests/HttpCharStream_Test.cpp
index fd0bdc107c5..ba969753a3d 100644
--- a/ACEXML/tests/HttpCharStream_Test.cpp
+++ b/ACEXML/tests/HttpCharStream_Test.cpp
@@ -1,6 +1,7 @@
// $Id$
#include "ACEXML/common/HttpCharStream.h"
+#include "ace/OS_NS_stdio.h"
#include "ace/OS_main.h"
int ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/ACEXML/tests/Transcoder_Test.cpp b/ACEXML/tests/Transcoder_Test.cpp
index 746d4442e89..a1ac572327a 100644
--- a/ACEXML/tests/Transcoder_Test.cpp
+++ b/ACEXML/tests/Transcoder_Test.cpp
@@ -2,6 +2,7 @@
#include "ACEXML/common/Transcode.h"
#include "ace/Log_Msg.h"
+#include "ace/OS_NS_string.h"
#include "ace/OS_main.h"
void dump_utf16 (const ACEXML_UTF16 *data,
diff --git a/ChangeLog b/ChangeLog
index 6faab17c65c..9d5f20eb95f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+Fri Nov 7 15:21:49 2003 Steve Huston <shuston@riverace.com>
+
+ * ace/Connector.cpp: Added #include "ace/os_include/os_fcntl.h" to
+ get ACE_NONBLOCK, "ace/OS_NS_stdio.h" to get ACE_OS::sprintf(), and
+ "ace/OS_NS_string.h" to get ACE_OS::strdup().
+
+ * ace/Service_Config.h:
+ * ACEXML/common/URL_Addr.h: Added #include "ace/Default_Constants.h" to
+ see ACE_DEFAULT_SERVICE_REPOSITORY_SIZE.
+
+ * ace/Codeset_Registry.cpp:
+ * ace/Local_Name_Space.cpp:
+ * ace/Local_Name_Space_T.cpp:
+ * ace/Module.i:
+ * ace/Name_Space.cpp:
+ * ace/Naming_Context.cpp:
+ * ace/Obstack_T.cpp:
+ * ace/Parse_Node.cpp:
+ * ace/Remote_Name_Space.cpp:
+ * ace/Service_Config.i:
+ * ace/Service_Manager.cpp:
+ * ace/Service_Types.cpp:
+ * ace/Stream.cpp:
+ * ace/Svc_Conf_y.cpp:
+ * ace/UUID.cpp:
+ * ace/RMCast/RMCast_Partial_Message.cpp:
+ * ACEXML/common/AttributesImpl.i:
+ * ACEXML/common/Encoding.cpp:
+ * ACEXML/common/Exception.cpp:
+ * ACEXML/common/HttpCharStream.cpp:
+ * ACEXML/common/NamespaceSupport.cpp:
+ * ACEXML/common/SAXExceptions.cpp:
+ * ACEXML/common/StrCharStream.cpp:
+ * ACEXML/common/StreamFactory.cpp:
+ * ACEXML/common/Transcode.cpp:
+ * ACEXML/common/URL_Addr.{inl cpp}:
+ * ACEXML/common/XML_Codecs.cpp:
+ * ACEXML/parser/parser/Parser.cpp:
+ * ACEXML/tests/ContentHandler_Test.cpp:
+ * ACEXML/tests/Transcorder_Test.cpp: Add #include "ace/OS_NS_string.h"
+ to see ACE_OS::strcmp() and friends.
+
+ * ace/RMCast/RMCast_Reordering.cpp: Added #include "ace/Guard_T.h" to
+ see ACE_Guard.
+
+ * ACEXML/tests/HttpCharStream_Test.cpp:
+ Added #include "ace/OS_NS_stdio.h" to get ACE_OS::printf().
+
Fri Nov 7 11:21:57 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* ace/CDR_Stream.cpp:
diff --git a/ace/Codeset_Registry.cpp b/ace/Codeset_Registry.cpp
index be7df8bc8d9..f856e827fbd 100644
--- a/ace/Codeset_Registry.cpp
+++ b/ace/Codeset_Registry.cpp
@@ -12,6 +12,8 @@
//=============================================================================
#include "ace/Codeset_Registry.h"
+#include "ace/OS_Memory.h"
+#include "ace/OS_NS_string.h"
// $Id$
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index 60f343f0cad..6e179193662 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -5,6 +5,9 @@
#define ACE_CONNECTOR_C
#include "ace/Connector.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
+#include "ace/os_include/os_fcntl.h" /* Has ACE_NONBLOCK */
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/ace/Local_Name_Space.cpp b/ace/Local_Name_Space.cpp
index 98cf501b8c0..3511364182f 100644
--- a/ace/Local_Name_Space.cpp
+++ b/ace/Local_Name_Space.cpp
@@ -3,6 +3,7 @@
#include "ace/ACE.h"
#include "ace/Local_Name_Space.h"
+#include "ace/OS_NS_string.h"
#include "ace/RW_Process_Mutex.h"
ACE_RCSID (ace,
diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp
index 2335db81169..d70e581a0ca 100644
--- a/ace/Local_Name_Space_T.cpp
+++ b/ace/Local_Name_Space_T.cpp
@@ -11,6 +11,7 @@
#include "ace/Auto_Ptr.h"
#include "ace/Guard_T.h"
#include "ace/OS_NS_regex.h"
+#include "ace/OS_NS_string.h"
ACE_RCSID (ace,
Local_Name_Space_T,
diff --git a/ace/Module.i b/ace/Module.i
index f0ecad5881c..36f31627557 100644
--- a/ace/Module.i
+++ b/ace/Module.i
@@ -3,6 +3,8 @@
// Module.i
+#include "ace/OS_NS_string.h"
+
template <ACE_SYNCH_DECL> ACE_INLINE void *
ACE_Module<ACE_SYNCH_USE>::arg (void) const
{
diff --git a/ace/Name_Space.cpp b/ace/Name_Space.cpp
index b262bae826d..882fb2dbdc6 100644
--- a/ace/Name_Space.cpp
+++ b/ace/Name_Space.cpp
@@ -2,6 +2,8 @@
// $Id$
#include "ace/Name_Space.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdlib.h"
ACE_RCSID(ace, Name_Space, "$Id$")
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index 3a8dae76c1b..38d73eb3e9a 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -7,6 +7,7 @@
#include "ace/Registry_Name_Space.h"
#include "ace/Memory_Pool.h"
#include "ace/RW_Process_Mutex.h"
+#include "ace/OS_NS_string.h"
ACE_RCSID(ace, Naming_Context, "$Id$")
diff --git a/ace/Obstack_T.cpp b/ace/Obstack_T.cpp
index 1f9104bd002..fc734c7de01 100644
--- a/ace/Obstack_T.cpp
+++ b/ace/Obstack_T.cpp
@@ -4,6 +4,7 @@
#define ACE_OBSTACK_T_C
#include "ace/Obstack_T.h"
+#include "ace/OS_NS_string.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp
index 3b857855211..502b0efe639 100644
--- a/ace/Parse_Node.cpp
+++ b/ace/Parse_Node.cpp
@@ -12,6 +12,7 @@
#include "ace/Task.h"
#include "ace/DLL.h"
#include "ace/ACE.h"
+#include "ace/OS_NS_string.h"
ACE_RCSID (ace,
Parse_Node,
diff --git a/ace/RMCast/RMCast_Partial_Message.cpp b/ace/RMCast/RMCast_Partial_Message.cpp
index 3d7b85d8871..d6e5cff0f7b 100644
--- a/ace/RMCast/RMCast_Partial_Message.cpp
+++ b/ace/RMCast/RMCast_Partial_Message.cpp
@@ -1,6 +1,7 @@
// $Id$
#include "RMCast_Partial_Message.h"
+#include "ace/OS_NS_string.h"
#if !defined (__ACE_INLINE__)
#include "RMCast_Partial_Message.i"
diff --git a/ace/RMCast/RMCast_Reordering.cpp b/ace/RMCast/RMCast_Reordering.cpp
index 5a81a360783..755fa5c4a86 100644
--- a/ace/RMCast/RMCast_Reordering.cpp
+++ b/ace/RMCast/RMCast_Reordering.cpp
@@ -4,6 +4,7 @@
#include "RMCast_Reordering.h"
#include "RMCast_Proxy.h"
+#include "ace/Guard_T.h"
#include "ace/Message_Block.h"
#if !defined (__ACE_INLINE__)
diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp
index 003cda8858c..a8f91571ad7 100644
--- a/ace/Remote_Name_Space.cpp
+++ b/ace/Remote_Name_Space.cpp
@@ -1,6 +1,7 @@
#include "ace/Remote_Name_Space.h"
#include "ace/Auto_Ptr.h"
#include "ace/Log_Msg.h"
+#include "ace/OS_NS_string.h"
ACE_RCSID (ace,
Remote_Name_Space,
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index cc4f445a12c..809eb416d8e 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -16,6 +16,7 @@
#include /**/ "ace/pre.h"
#include "ace/config-all.h"
+#include "ace/Default_Constants.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/ace/Service_Config.i b/ace/Service_Config.i
index 42577cb1e04..1b004fcf24d 100644
--- a/ace/Service_Config.i
+++ b/ace/Service_Config.i
@@ -2,6 +2,7 @@
//
// $Id$
+#include "ace/OS_NS_string.h"
// This is the primary entry point into the ACE_Service_Config (the
// constructor just handles simple initializations).
diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index 3e8f90f0cae..3a795ba0ed8 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -12,6 +12,7 @@
#include "ace/Reactor.h"
#include "ace/WFMO_Reactor.h"
#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
ACE_RCSID (ace,
Service_Manager,
diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp
index 8218f26aa79..fe4d3c747ae 100644
--- a/ace/Service_Types.cpp
+++ b/ace/Service_Types.cpp
@@ -9,6 +9,7 @@
#include "ace/Stream_Modules.h"
#include "ace/Stream.h"
#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
ACE_RCSID(ace, Service_Types, "$Id$")
diff --git a/ace/Stream.cpp b/ace/Stream.cpp
index c49d0f4d568..56177403b3a 100644
--- a/ace/Stream.cpp
+++ b/ace/Stream.cpp
@@ -12,6 +12,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/Stream_Modules.h"
+#include "ace/OS_NS_string.h"
#if !defined (__ACE_INLINE__)
#include "ace/Stream.i"
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index c89c43fb9d9..96d83d8147e 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -22,6 +22,7 @@
// $Id$
#include "ace/Svc_Conf.h"
+#include "ace/OS_NS_string.h"
#if (ACE_USES_CLASSIC_SVC_CONF == 1)
diff --git a/ace/UUID.cpp b/ace/UUID.cpp
index 0a07e60fb12..f168596678b 100644
--- a/ace/UUID.cpp
+++ b/ace/UUID.cpp
@@ -9,8 +9,10 @@
#include "ace/Log_Msg.h"
#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
#include "ace/OS_NS_sys_time.h"
#include "ace/OS_NS_netdb.h"
+#include "ace/OS_NS_unistd.h"
ACE_RCSID (ace,
UUID,
diff --git a/protocols/ace/RMCast/RMCast_Partial_Message.cpp b/protocols/ace/RMCast/RMCast_Partial_Message.cpp
index 3d7b85d8871..d6e5cff0f7b 100644
--- a/protocols/ace/RMCast/RMCast_Partial_Message.cpp
+++ b/protocols/ace/RMCast/RMCast_Partial_Message.cpp
@@ -1,6 +1,7 @@
// $Id$
#include "RMCast_Partial_Message.h"
+#include "ace/OS_NS_string.h"
#if !defined (__ACE_INLINE__)
#include "RMCast_Partial_Message.i"
diff --git a/protocols/ace/RMCast/RMCast_Reordering.cpp b/protocols/ace/RMCast/RMCast_Reordering.cpp
index 5a81a360783..755fa5c4a86 100644
--- a/protocols/ace/RMCast/RMCast_Reordering.cpp
+++ b/protocols/ace/RMCast/RMCast_Reordering.cpp
@@ -4,6 +4,7 @@
#include "RMCast_Reordering.h"
#include "RMCast_Proxy.h"
+#include "ace/Guard_T.h"
#include "ace/Message_Block.h"
#if !defined (__ACE_INLINE__)