ChangeLogTag:Sat Nov 1 05:40:21 UTC 2003 Don Hinton <dhinton@dresystems.com>

15 files changed, 69 insertions, 49 deletions

diff --git a/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACEXML/apps/svcconf/Svcconf_Handler.cpp
index 5f335c42821..a37b8ed220f 100644
--- a/ACEXML/apps/svcconf/Svcconf_Handler.cpp
+++ b/ACEXML/apps/svcconf/Svcconf_Handler.cpp
@@ -52,7 +52,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
                                     const ACEXML_Char *qName ACEXML_ENV_ARG_DECL)
       ACE_THROW_SPEC ((ACEXML_SAXException))
 {
-  if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0)
+  if (ACE_OS::strcmp (qName, ACE_TEXT ("dynamic")) == 0)
     {
       ACE_Parsed_Info *active_info = (this->in_stream_def_ == 0 ?
                                       &this->parsed_info_ :
@@ -158,7 +158,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
           this->parsed_info_.reset ();
         }
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("static")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("static")) == 0)
     {
       if (this->in_stream_def_)
         {
@@ -188,11 +188,11 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
           this->parsed_info_.reset ();
         }
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("module")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("module")) == 0)
     {
       this->in_module_ = 0;
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("streamdef")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("streamdef")) == 0)
     {
 //       ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply stream %s of type %s\n"),
 //                   this->stream_info_.name (),
@@ -204,7 +204,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
       this->stream_svc_type_ = 0;
       this->stream_ = 0;
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("stream")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("stream")) == 0)
     {
 //       ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply stream %s of type %s\n"),
 //                   this->stream_info_.name (),
@@ -267,20 +267,20 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
                                       ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL)
       ACE_THROW_SPEC ((ACEXML_SAXException))
 {
-  if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0)
+  if (ACE_OS::strcmp (qName, ACE_TEXT ("dynamic")) == 0)
     {
       this->get_dynamic_attrs (alist ACEXML_ENV_ARG_PARAMETER);
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("initializer")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("initializer")) == 0)
     {
       this->get_initializer_attrs (alist ACEXML_ENV_ARG_PARAMETER);
 
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("static")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("static")) == 0)
     {
       this->get_static_attrs (alist ACEXML_ENV_ARG_PARAMETER);
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("stream")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("stream")) == 0)
     {
       this->get_stream_id (alist ACEXML_ENV_ARG_PARAMETER);
 
@@ -299,17 +299,17 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 //       ACE_DEBUG ((LM_INFO, ACE_TEXT ("Retrieve stream %s from repository\n"),
 //                   this->stream_info_.name ()));
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("streamdef")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("streamdef")) == 0)
     {
       this->in_stream_def_ = 1;
       // @@ Set up stream service object
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("module")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("module")) == 0)
     {
       this->in_stream_def_ = 0;
       this->in_module_ = 1;
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("resume")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("resume")) == 0)
     {
       this->get_id (alist ACEXML_ENV_ARG_PARAMETER);
       if (this->in_module_)
@@ -339,7 +339,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
         }
       this->parsed_info_.reset ();
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("suspend")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("suspend")) == 0)
     {
       this->get_id (alist ACEXML_ENV_ARG_PARAMETER);
       if (this->in_module_)
@@ -369,7 +369,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
         }
       this->parsed_info_.reset ();
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("remove")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("remove")) == 0)
     {
       this->get_id (alist ACEXML_ENV_ARG_PARAMETER);
       if (this->in_module_)
@@ -399,7 +399,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
         }
       this->parsed_info_.reset ();
     }
-  else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("ACE_Svc_Conf")) == 0)
+  else if (ACE_OS::strcmp (qName, ACE_TEXT ("ACE_Svc_Conf")) == 0)
     {
       // Main document tag. no-op.
 //       ACE_DEBUG ((LM_INFO, ACE_TEXT ("ACE_Svc_Conf tag\n")));
@@ -493,7 +493,7 @@ ACEXML_Svcconf_Handler::get_stream_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_D
   if (alist != 0)
     for (size_t i = 0; i < alist->getLength (); ++i)
       {
-        if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0)
+        if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0)
           {
             this->stream_info_.name (alist->getValue (i));
           }
@@ -512,7 +512,7 @@ ACEXML_Svcconf_Handler::get_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL)
   if (alist != 0)
     for (size_t i = 0; i < alist->getLength (); ++i)
       {
-        if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0)
+        if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0)
           {
             this->parsed_info_.name (alist->getValue (i));
           }
@@ -534,17 +534,17 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_A
                                &this->stream_info_);
       for (size_t i = 0; i < alist->getLength (); ++i)
         {
-          if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0)
+          if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0)
             {
               info->name (alist->getValue (i));
             }
-          else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("status")) == 0)
+          else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("status")) == 0)
             {
-              if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("inactive")) == 0)
+              if (ACE_OS::strcmp (alist->getValue (i), ACE_TEXT ("inactive")) == 0)
                 {
                   info->active (0);
                 }
-              else if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("active")) == 0)
+              else if (ACE_OS::strcmp (alist->getValue (i), ACE_TEXT ("active")) == 0)
                 {
                   info->active (1);
                 }
@@ -553,17 +553,17 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_A
                   ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid attribute value, expecting 'active' or 'inactive'\n")), -1);
                 }
             }
-          else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("type")) == 0)
+          else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("type")) == 0)
             {
-              if (ACE_OS_String::strcasecmp (alist->getValue (i), ACE_TEXT ("service_object")) == 0)
+              if (ACE_OS::strcasecmp (alist->getValue (i), ACE_TEXT ("service_object")) == 0)
                 {
                   info->service_type (ACE_Service_Type::SERVICE_OBJECT);
                 }
-              else if (ACE_OS_String::strcasecmp (alist->getValue (i), ACE_TEXT ("stream")) == 0)
+              else if (ACE_OS::strcasecmp (alist->getValue (i), ACE_TEXT ("stream")) == 0)
                 {
                   info->service_type (ACE_Service_Type::STREAM);
                 }
-              else if (ACE_OS_String::strcasecmp (alist->getValue (i), ACE_TEXT ("module")) == 0)
+              else if (ACE_OS::strcasecmp (alist->getValue (i), ACE_TEXT ("module")) == 0)
                 {
                   info->service_type (ACE_Service_Type::MODULE);
                 }
@@ -591,15 +591,15 @@ ACEXML_Svcconf_Handler::get_initializer_attrs (ACEXML_Attributes *alist ACEXML_E
                                &this->stream_info_);
       for (size_t i = 0; i < alist->getLength (); ++i)
         {
-          if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("init")) == 0)
+          if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("init")) == 0)
             {
               info->init_func (alist->getValue (i));
             }
-          else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("path")) == 0)
+          else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("path")) == 0)
             {
               info->path (alist->getValue (i));
             }
-          else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0)
+          else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0)
             {
               info->init_params (alist->getValue (i));
             }
@@ -622,11 +622,11 @@ ACEXML_Svcconf_Handler::get_static_attrs (ACEXML_Attributes *alist ACEXML_ENV_AR
                                &this->stream_info_);
       for (size_t i = 0; i < alist->getLength (); ++i)
         {
-          if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0)
+          if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0)
             {
               info->name (alist->getValue (i));
             }
-          else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0)
+          else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0)
             {
               info->init_params (alist->getValue (i));
             }
diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp
index cbee8018571..3a5694f120b 100644
--- a/ACEXML/common/FileCharStream.cpp
+++ b/ACEXML/common/FileCharStream.cpp
@@ -3,6 +3,8 @@
 #include "ACEXML/common/FileCharStream.h"
 #include "ace/ACE.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_sys_stat.h"
 
 ACEXML_FileCharStream::ACEXML_FileCharStream (void)
   : filename_ (0), encoding_ (0), size_ (0), infile_ (0), peek_ (0)
diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp
index ba4ff11eccf..04fdf6bfdfc 100644
--- a/ACEXML/common/NamespaceSupport.cpp
+++ b/ACEXML/common/NamespaceSupport.cpp
@@ -2,6 +2,10 @@
 
 #include "ACEXML/common/NamespaceSupport.h"
 
+#if !defined (__ACEXML_INLINE__)
+# include "ACEXML/common/NamespaceSupport.i"
+#endif /* __ACEXML_INLINE__ */
+
 static const ACEXML_Char ACEXML_XMLNS_PREFIX_name[] = ACE_TEXT ("xmlns");
 
 const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS_PREFIX = ACEXML_XMLNS_PREFIX_name;
@@ -13,10 +17,6 @@ static const ACEXML_Char ACEXML_TABOO_NS_PREFIX[] = ACE_TEXT ("xml");
 static const ACEXML_Char ACEXML_XMLNS_URI_name[] = ACE_TEXT ("http://www.w3.org/XML/1998/namespace");
 const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS = ACEXML_XMLNS_URI_name;
 
-#if !defined (__ACEXML_INLINE__)
-# include "ACEXML/common/NamespaceSupport.i"
-#endif /* __ACEXML_INLINE__ */
-
 ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack (void)
   : head_ (0)
 {
@@ -87,7 +87,7 @@ ACEXML_NamespaceSupport::declarePrefix (const ACEXML_Char *prefix,
 
   // Unless predefined by w3.org(?) NS prefix can never start with
   // "xml".
-  if (ACE_OS_String::strcmp (ACEXML_TABOO_NS_PREFIX, prefix) == 0)
+  if (ACE_OS::strcmp (ACEXML_TABOO_NS_PREFIX, prefix) == 0)
     return -1;
 
   ACEXML_String ns_prefix (prefix, 0, 0);
@@ -220,7 +220,7 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName,
                                       const ACEXML_Char *&name,
                                       int is_attribute) const
 {
-  int qlen = ACE_static_cast (int, ACE_OS_String::strlen (qName));
+  int qlen = ACE_static_cast (int, ACE_OS::strlen (qName));
   int len = -1;
   for (int i = 0; i < qlen; ++i)
     if (qName [i] == ':')
diff --git a/ACEXML/common/NamespaceSupport.h b/ACEXML/common/NamespaceSupport.h
index 04177308b63..3b906c37c44 100644
--- a/ACEXML/common/NamespaceSupport.h
+++ b/ACEXML/common/NamespaceSupport.h
@@ -25,7 +25,8 @@
 #include "ace/Functor.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Containers_T.h"
-#include "ace/Synch.h"
+#include "ace/Null_Mutex.h"
+
 
 typedef ACE_Hash_Map_Entry<ACEXML_String,
                            ACEXML_String> ACEXML_NS_CONTEXT_ENTRY;
diff --git a/ACEXML/common/StrCharStream.cpp b/ACEXML/common/StrCharStream.cpp
index db0c2c7761a..e37bbb4f6d8 100644
--- a/ACEXML/common/StrCharStream.cpp
+++ b/ACEXML/common/StrCharStream.cpp
@@ -25,7 +25,7 @@ ACEXML_StrCharStream::open (const ACEXML_Char *str, const ACEXML_Char* name)
       && (this->name_ = ACE::strnew (name)) != 0)
     {
       this->ptr_ = this->start_;
-      this->end_ = this->start_ + ACE_OS_String::strlen (this->start_);
+      this->end_ = this->start_ + ACE_OS::strlen (this->start_);
       return this->determine_encoding();
     }
   return -1;                // Invalid string passed.
@@ -97,7 +97,7 @@ ACEXML_StrCharStream::read (ACEXML_Char *str, size_t len)
     {
       if (len * sizeof (ACEXML_Char) > (size_t) (this->end_ - this->ptr_))
         len = this->end_ - this->ptr_;
-      ACE_OS_String::strncpy (str, this->ptr_, len);
+      ACE_OS::strncpy (str, this->ptr_, len);
       this->ptr_ += len;
       return ACE_static_cast (int, len);
     }
diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp
index 3f06e15f7be..a1a9ea7aa40 100644
--- a/ACEXML/common/URL_Addr.cpp
+++ b/ACEXML/common/URL_Addr.cpp
@@ -1,16 +1,17 @@
 // $Id$
 
-#include "ace/Log_Msg.h"
-#include "ace/Auto_Ptr.h"
 #include "ACEXML/common/URL_Addr.h"
 
-
 ACE_RCSID(common, ACEXML_URL_Addr, "$Id$")
 
 #if !defined (__ACEXML_INLINE__)
 #include "ACEXML/common/URL_Addr.inl"
 #endif /* __ACEXML_INLINE__ */
 
+#include "ace/Log_Msg.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/OS_NS_stdio.h"
+
 ACEXML_URL_Addr::ACEXML_URL_Addr (void)
   : path_name_ (0),
     addr_string_ (0),
diff --git a/ACEXML/common/XML_Types.h b/ACEXML/common/XML_Types.h
index 3cfb62efd99..7ed578366ff 100644
--- a/ACEXML/common/XML_Types.h
+++ b/ACEXML/common/XML_Types.h
@@ -17,7 +17,7 @@
 #define _ACEXML_XML_TYPES_H_
 
 #include /**/ "ace/pre.h"
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp
index 1b6cc2932fa..9a7b7930acd 100644
--- a/ACEXML/examples/SAXPrint/main.cpp
+++ b/ACEXML/examples/SAXPrint/main.cpp
@@ -10,6 +10,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_main.h"
 
 static const ACEXML_Char *test_string =
 ACE_TEXT ("<?xml version='1.0'?> <ACE_Svc_Conf> <static id=\"ACE_Service_Manager\" params='-d -p 4911'/> <dynamic id=\"Test_Task\" type=\"service_object\"> &#65; &quot; <initializer path=\"CCM_App\" init='_make_Test_Task' params='-p 3000'/> </dynamic> </ACE_Svc_Conf>");
diff --git a/ACEXML/parser/parser/Entity_Manager.h b/ACEXML/parser/parser/Entity_Manager.h
index e86f7747f03..5eec188a184 100644
--- a/ACEXML/parser/parser/Entity_Manager.h
+++ b/ACEXML/parser/parser/Entity_Manager.h
@@ -23,7 +23,7 @@
 
 #include "ACEXML/common/XML_Types.h"
 #include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
+#include "ace/Null_Mutex.h"
 
 typedef ACE_Hash_Map_Entry<ACEXML_String,
                            ACEXML_String> ACEXML_ENTITY_ENTRY;
diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp
index 65d4723b91a..213b4beaae8 100644
--- a/ACEXML/parser/parser/Parser.cpp
+++ b/ACEXML/parser/parser/Parser.cpp
@@ -1,16 +1,18 @@
 // $Id$
 
+#include "ACEXML/parser/parser/Parser.h"
+
+#if !defined (__ACEXML_INLINE__)
+# include "ACEXML/parser/parser/Parser.i"
+#endif /* __ACEXML_INLINE__ */
+
 #include "ace/ACE.h"
 #include "ACEXML/common/Transcode.h"
 #include "ACEXML/common/AttributesImpl.h"
 #include "ACEXML/common/StrCharStream.h"
 #include "ACEXML/common/StreamFactory.h"
-#include "ACEXML/parser/parser/Parser.h"
 #include "ACEXML/parser/parser/ParserInternals.h"
-
-#if !defined (__ACEXML_INLINE__)
-# include "ACEXML/parser/parser/Parser.i"
-#endif /* __ACEXML_INLINE__ */
+#include "ace/OS_NS_strings.h"
 
 static const ACEXML_Char default_attribute_type[] = ACE_TEXT ("CDATA");
 static const ACEXML_Char empty_string[] = { 0 };
diff --git a/ACEXML/parser/parser/ParserContext.cpp b/ACEXML/parser/parser/ParserContext.cpp
index fd0792677fb..77592dc13cb 100644
--- a/ACEXML/parser/parser/ParserContext.cpp
+++ b/ACEXML/parser/parser/ParserContext.cpp
@@ -13,3 +13,12 @@ ACEXML_Parser_Context::~ACEXML_Parser_Context()
   delete this->locator_;
   this->locator_ = 0;
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Swap <ACEXML_InputSource*>; 
+template class ACE_Swap <ACEXML_LocatorImpl*>; 
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate ACE_Swap <ACEXML_InputSource*>
+#  pragma instantiate ACE_Swap <ACEXML_LocatorImpl*>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/ACEXML/tests/ContentHandler_Test.cpp b/ACEXML/tests/ContentHandler_Test.cpp
index c1d9f765dfd..23eb3f96e23 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_main.h"
 
 class Basic_Content_Tester : public ACEXML_DefaultHandler
 {
diff --git a/ACEXML/tests/HttpCharStream_Test.cpp b/ACEXML/tests/HttpCharStream_Test.cpp
index b30dc7fa55a..fd0bdc107c5 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_main.h"
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
diff --git a/ACEXML/tests/NamespaceSupport_Test.cpp b/ACEXML/tests/NamespaceSupport_Test.cpp
index 418969d9c91..2632c6dc571 100644
--- a/ACEXML/tests/NamespaceSupport_Test.cpp
+++ b/ACEXML/tests/NamespaceSupport_Test.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ACEXML/common/NamespaceSupport.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 2e87a52a7e7..746d4442e89 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_main.h"
 
 void dump_utf16 (const ACEXML_UTF16 *data,
                  size_t len)