Add missing includes

    * TAO/tao/Adapter_Registry.cpp:
    * TAO/tao/AnyTypeCode/Enum_TypeCode.cpp:
    * TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
    * TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp:
    * TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp:
    * TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp:
    * TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
    * TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
    * TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp:
    * TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp:
    * TAO/tao/AnyTypeCode/Value_TypeCode.cpp:
    * TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp:
    * TAO/tao/DynamicAny/DynCommon.cpp:
    * TAO/tao/IIOP_Acceptor.cpp:
    * TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp:
    * TAO/tao/ImR_Client/ImR_Client.cpp:
    * TAO/tao/Object_KeyC.cpp:
    * TAO/tao/PortableServer/Var_Size_SArgument_T.cpp:
    * TAO/tao/PortableServer/Vector_SArgument_T.cpp:
    * TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp:
    * TAO/tao/Strategies/DIOP_Acceptor.cpp:
    * TAO/tao/Strategies/DIOP_Profile.cpp:
    * TAO/tao/Strategies/SHMIOP_Profile.cpp:
    * TAO/tao/Strategies/UIOP_Profile.cpp:
    * TAO/tao/Var_Size_Argument_T.cpp:
    * TAO/tao/Vector_Argument_T.cpp:
    * TAO/tao/WrongTransactionC.cpp:
    * TAO/tao/WrongTransactionC.h:

28 files changed, 57 insertions, 78 deletions

diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp
index 49372c7bc62..9a53767886b 100644
--- a/TAO/tao/Adapter_Registry.cpp
+++ b/TAO/tao/Adapter_Registry.cpp
@@ -9,6 +9,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 #include "ace/CORBA_macros.h"
+#include <cstring>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
index 9748e6b7c46..104275c6bf4 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -8,6 +8,7 @@
 #include "tao/CDR.h"
 
 #include "ace/Dynamic_Service.h"
+#include <cstring>
 
 #ifndef __ACE_INLINE__
 # include "tao/AnyTypeCode/Enum_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
index 60d7e465f3b..394c5dc02f1 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -7,6 +7,7 @@
 #include "tao/SystemException.h"
 
 #include "ace/Dynamic_Service.h"
+#include <cstring>
 
 #ifndef __ACE_INLINE__
 # include "tao/AnyTypeCode/Enum_TypeCode_Static.inl"
@@ -73,8 +74,7 @@ CORBA::Boolean
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // This call shouldn't throw since CORBA::TypeCode::equal() verified
   // that the TCKind is the same as our's prior to invoking this
@@ -105,8 +105,7 @@ CORBA::Boolean
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
@@ -123,8 +122,7 @@ TAO::TypeCode::Enum<char const *,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
-                    TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ) const
+                    TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
 {
   ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
 
@@ -160,8 +158,7 @@ TAO::TypeCode::Enum<char const *,
 char const *
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
-                    TAO::Null_RefCount_Policy>::id_i (
-  ) const
+                    TAO::Null_RefCount_Policy>::id_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -171,8 +168,7 @@ TAO::TypeCode::Enum<char const *,
 char const *
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
-                    TAO::Null_RefCount_Policy>::name_i (
-  ) const
+                    TAO::Null_RefCount_Policy>::name_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -182,8 +178,7 @@ TAO::TypeCode::Enum<char const *,
 CORBA::ULong
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
-                    TAO::Null_RefCount_Policy>::member_count_i (
-  ) const
+                    TAO::Null_RefCount_Policy>::member_count_i () const
 {
   return this->nenumerators_;
 }
@@ -192,8 +187,7 @@ char const *
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
index 9022c9ce878..c3edfaa1ab3 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -115,8 +115,7 @@ TAO::TypeCode::Objref<char const *,
 }
 
 char const *
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
-  ) const
+TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -124,8 +123,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
 }
 
 char const *
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i (
-  ) const
+TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
index ebba0d9ea31..dd9782fba95 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
@@ -61,8 +61,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 CORBA::Boolean
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // The following calls won't throw since CORBA::TypeCode::equal()
   // has already established the kind of tc is the same as our kind.
@@ -82,8 +81,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 CORBA::Boolean
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // The following calls won't throw since CORBA::TypeCode::equal()
   // has already established the kind of tc is the same as our kind.
@@ -102,8 +100,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 
 CORBA::TypeCode_ptr
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ) const
+                        TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
 {
   // Already compact since tk_sequence and tk_array TypeCodes have no
   // name or member names, meaning that we can simply call
@@ -122,16 +119,14 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 
 CORBA::ULong
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::length_i (
-  ) const
+                        TAO::Null_RefCount_Policy>::length_i () const
 {
   return this->length_;
 }
 
 CORBA::TypeCode_ptr
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::content_type_i (
-  ) const
+                        TAO::Null_RefCount_Policy>::content_type_i () const
 {
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
index 83f28c3add9..47d0eaacbd3 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
@@ -46,8 +46,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i (
 
 CORBA::Boolean
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // Since TCKind comparisons must be performed before equal_i() is
   // called, we can also call it to determine equivalence of
@@ -56,8 +55,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i (
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ) const
+TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
 {
   // Already compact since tk_string and tk_wstring TypeCodes have no
   // name or member names, meaning that we can simply call
@@ -70,8 +68,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
 }
 
 CORBA::ULong
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i (
-  ) const
+TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i () const
 {
   return this->length_;
 }
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
index 99455427d9e..dc4a18a18b7 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -13,6 +13,7 @@
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Truncate.h"
+#include <cstring>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -180,8 +181,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ) const
+                      TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
 {
   ACE_Array_Base<Struct_Field<CORBA::String_var,
                               CORBA::TypeCode_var> >
@@ -228,8 +228,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::id_i (
-  ) const
+                      TAO::Null_RefCount_Policy>::id_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index 1926cbafca8..3b8c0110947 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -27,6 +27,7 @@
 
 #include "ace/Array_Base.h"
 #include "ace/Value_Ptr.h"
+#include <cstring>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
index 9e5215d71fd..76bd27168bb 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -3,6 +3,7 @@
 
 #include "tao/AnyTypeCode/TypeCode_Case_Base_T.h"
 #include "ace/OS_NS_string.h"
+#include <cstring>
 
 #ifndef __ACE_INLINE__
 # include "tao/AnyTypeCode/TypeCode_Case_Base_T.inl"
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
index c267a8f0dd8..bdbe062ff12 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -97,8 +97,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // These calls shouldn't throw since CORBA::TypeCode::equal()
   // verified that the TCKind is the same as our's prior to invoking
@@ -197,8 +196,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ) const
+                     TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
 {
 //   typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
 //                                              CORBA::TypeCode_var> > elem_type;
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
index 47cb3168c52..32e79789204 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
@@ -145,8 +145,7 @@ TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
                      RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // None of these calls should throw since CORBA::TypeCode::equal()
   // verified that the TCKind is the same as our's prior to invoking
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
index 6a73ea9519f..8745c4ffb63 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -9,6 +9,7 @@
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Truncate.h"
+#include <cstring>
 
 #ifndef __ACE_INLINE__
 # include "tao/AnyTypeCode/Value_TypeCode_Static.inl"
@@ -223,8 +224,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ) const
+                     TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
 {
   ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
     tc_fields (this->nfields_);
@@ -364,8 +364,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::concrete_base_type_i (
-  ) const
+                     TAO::Null_RefCount_Policy>::concrete_base_type_i () const
 {
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 5ce12d65364..a9b0606205a 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -20,6 +20,7 @@
 
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
+#include <cstring>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 1954e3e9f61..682bbf03b0b 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -17,6 +17,7 @@
 
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
+#include <cstring>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
index 30bab855615..0e1df9788a3 100644
--- a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
+++ b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
@@ -6,6 +6,7 @@
 #include "tao/IIOP_Profile.h"
 #include "tao/MProfile.h"
 #include "tao/CDR.h"
+#include <cstring>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index 11c8f071360..a2c429cb4a3 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -10,6 +10,7 @@
 #include "tao/ImR_Client/ServerObject_i.h"
 #include "tao/ImR_Client/ImplRepoC.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
+#include <cstring>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index dc5d0c9cd05..6b147b6bb59 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -34,6 +34,7 @@
 #include "ace/Truncate.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
+#include <cstring>
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
index bd8aadcc542..285f609dc9d 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
@@ -27,8 +27,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 void
 TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
   Insert_Policy<S>::any_insert (any, this->x_);
 }
@@ -59,8 +58,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 void
 TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
   Insert_Policy<S>::any_insert (any, this->x_);
 }
diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.cpp b/TAO/tao/PortableServer/Vector_SArgument_T.cpp
index c813f99ed9e..b429071c296 100644
--- a/TAO/tao/PortableServer/Vector_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Vector_SArgument_T.cpp
@@ -25,8 +25,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 void
 TAO::In_Vector_SArgument_T<S,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
   Insert_Policy<S>::any_insert (any, this->x_);
 }
@@ -57,8 +56,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 void
 TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
   Insert_Policy<S>::any_insert (any, this->x_);
 }
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
index 0316299507a..3ce86837710 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
@@ -68,8 +68,7 @@ namespace TAO
   template<>
   ::CORBA::Boolean
   Any_Impl_T<RTCORBA::ProtocolProperties>::to_object (
-      ::CORBA::Object_ptr &_tao_elem
-    ) const
+      ::CORBA::Object_ptr &_tao_elem) const
   {
     _tao_elem = ::CORBA::Object::_duplicate (this->value_);
     return true;
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 476094e5cb9..39574a53fbe 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -19,6 +19,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/os_include/os_netdb.h"
+#include <cstring>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 86a4f4effcb..d8566303445 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -13,6 +13,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
 #include "ace/Truncate.h"
+#include <cstring>
 
 static const char the_prefix[] = "diop";
 
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index f823527eb35..eb01ce6655b 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -13,6 +13,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
 #include "ace/Truncate.h"
+#include <cstring>
 
 static const char prefix_[] = "shmiop";
 
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index aff67a65bf8..3179089b4ec 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -13,6 +13,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_ctype.h"
+#include <cstring>
 
 static const char prefix_[] = "uiop";
 
@@ -21,7 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 const char TAO_UIOP_Profile::object_key_delimiter_ = '|';
 
 char
-TAO_UIOP_Profile::object_key_delimiter (void) const
+TAO_UIOP_Profile::object_key_delimiter () const
 {
   return TAO_UIOP_Profile::object_key_delimiter_;
 }
@@ -79,13 +80,13 @@ TAO_UIOP_Profile::~TAO_UIOP_Profile (void)
 }
 
 TAO_Endpoint*
-TAO_UIOP_Profile::endpoint (void)
+TAO_UIOP_Profile::endpoint ()
 {
   return &this->endpoint_;
 }
 
 CORBA::ULong
-TAO_UIOP_Profile::endpoint_count (void) const
+TAO_UIOP_Profile::endpoint_count () const
 {
   return this->count_;
 }
@@ -237,7 +238,7 @@ TAO_UIOP_Profile::add_endpoint (TAO_UIOP_Endpoint *endp)
 
 
 char *
-TAO_UIOP_Profile::to_string (void) const
+TAO_UIOP_Profile::to_string () const
 {
   CORBA::String_var key;
   TAO::ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
index bc349533182..a2bf18ce09a 100644
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ b/TAO/tao/Var_Size_Argument_T.cpp
@@ -24,8 +24,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 void
 TAO::In_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
   Insert_Policy<S>::any_insert (any, *this->x_);
 }
@@ -83,8 +82,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 void
 TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
   Insert_Policy<S>::any_insert (any, *this->x_);
 }
@@ -114,8 +112,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 void
 TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
   Insert_Policy<S>::any_insert (any, *this->x_);
 }
@@ -145,8 +142,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 void
 TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
   Insert_Policy<S>::any_insert (any, this->x_.in ());
 }
diff --git a/TAO/tao/Vector_Argument_T.cpp b/TAO/tao/Vector_Argument_T.cpp
index 2e6b2bc35bd..18ea19ca6c5 100644
--- a/TAO/tao/Vector_Argument_T.cpp
+++ b/TAO/tao/Vector_Argument_T.cpp
@@ -23,8 +23,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 void
 TAO::In_Vector_Argument_T<S,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
   Insert_Policy<S>::any_insert (any, this->x_);
 }
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index a2f1be23a7b..614703f33db 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -119,8 +119,7 @@ void CORBA::WrongTransaction::_raise () const
 }
 
 void CORBA::WrongTransaction::_tao_encode (
-    TAO_OutputCDR &cdr
-  ) const
+    TAO_OutputCDR &cdr) const
 {
   if (cdr << *this)
     {
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index 11ce0f2f73a..43a1f850746 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -81,12 +81,10 @@ namespace CORBA
     virtual void _raise () const;
 
     virtual void _tao_encode (
-        TAO_OutputCDR &
-      ) const;
+        TAO_OutputCDR &) const;
 
     virtual void _tao_decode (
-        TAO_InputCDR &
-      );
+        TAO_InputCDR &);
 
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129