*** empty log message ***

26 files changed, 70 insertions, 202 deletions

diff --git a/TAO/tao/any.cpp b/TAO/tao/any.cpp
index 23a61fefcf6..13bb7e9b23f 100644
--- a/TAO/tao/any.cpp
+++ b/TAO/tao/any.cpp
@@ -32,10 +32,6 @@
 // COM NOTE: Yes, this is a utility data type whose implementation is
 // fully exposed.  Factories for these are not normally used in C++.
 
-#include <assert.h>
-#include <limits.h>
-#include <string.h>
-
 #include "orb.h"
 #include "cdr.h"
 
@@ -325,7 +321,7 @@ CORBA_Any::CORBA_Any (const CORBA_Any &src)
 			  (CORBA_TypeCode::VisitRoutine) deep_copy, 
 			  0, 
 			  env);
-#endif // replaced by our optimizations
+#endif /* replaced by our optimizations */
 
   (void) DEEP_COPY(_type, src._value, _value, env);
 }
diff --git a/TAO/tao/boa.cpp b/TAO/tao/boa.cpp
index facd571aa53..2ef87713648 100644
--- a/TAO/tao/boa.cpp
+++ b/TAO/tao/boa.cpp
@@ -10,10 +10,6 @@
 // the modules knowing about IIOP.  In the future, a looser coupling
 // between OA initialiszation and protocol components is desired.
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "orb.h"
 #include "boa.h"
 
diff --git a/TAO/tao/corbacom.cpp b/TAO/tao/corbacom.cpp
index ba05cab6c44..f6a3f451a54 100644
--- a/TAO/tao/corbacom.cpp
+++ b/TAO/tao/corbacom.cpp
@@ -4,10 +4,7 @@
 //
 // ORB:		support for primitive data types
 
-#include	<assert.h>
-#include	<limits.h>
-#include	<string.h>
-#include	<orb.h>
+#include	"orb.h"
 
 #if	defined (HAVE_WIDEC_H)
 #	include <widec.h>
@@ -145,7 +142,7 @@ wscpy (CORBA_WChar *dest,
 	continue;
     return retval;
 }
-#endif	// HAVE_WIDEC_H
+#endif	/* HAVE_WIDEC_H */
 
 // Wide Character string utility support; this can need to be
 // integrated with the ORB's own memory allocation subsystem.
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
index a4bc03f9a49..539faa84fdc 100644
--- a/TAO/tao/debug.cpp
+++ b/TAO/tao/debug.cpp
@@ -11,31 +11,13 @@
 //
 // XXX on Windows, make it always use OutputDebugString () instead of stdio
 
-#include	<assert.h>
-#include	<limits.h>
-#include	<string.h>
-#include	<orb.h>
-
+#include	"orb.h"
 #include "debug.h"
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#if 0
-#if	unix
-#include <sys/types.h>
-
-#elif	defined (_WIN32)
-#	include	<windows.h>
-
-#endif
-#endif
-
-#ifndef	_POSIX_THREADS		// _POSIX_THREAD_SAFE_FUNCTIONS implied
+#if !defined (ACE_HAS_PTHREADS)		// _POSIX_THREAD_SAFE_FUNCTIONS implied
 #define	flockfile(f)
 #define funlockfile(f)
-#endif	// _POSIX_THREADS
+#endif /* ACE_HAS_PTHREADS */
 
 u_int ACE_Svc_Export TAO_debug_level	= 0;
 char * ACE_Svc_Export TAO_debug_filter	= "l";
@@ -59,7 +41,7 @@ static pid_t my_pid;
 
 #if defined (unix) || defined (VXWORKS)
 
-#ifdef	_POSIX_THREADS
+#if defined (ACE_HAS_PTHREADS)
 //
 // Use POSIX initialization support to initialize just once.
 //
@@ -81,7 +63,8 @@ emit_prefix (FILE *stream)
   ACE_OS::fprintf (stream, "p%ld t%ld:  ", (long) my_pid, (long) self);
 }
 
-#else	// !defined (_POSIX_THREADS)
+// !defined (ACE_HAS_PTHREADS)
+#else	
 
 // Without threads, guard initialization so it can be repeated,
 // and don't emit the thread ID in the messages.
@@ -96,8 +79,8 @@ setup (void)
     }
 }
 
-#define	emit_prefix (stream) fprintf (stream, "p%ld:  ", (long) my_pid)
-#endif	// !_POSIX_THREADS
+#define	emit_prefix(stream) fprintf (stream, "p%ld:  ", (long) my_pid)
+#endif	/* !ACE_HAS_PTHREADS */
 
 #elif	defined (_WIN32)
 
@@ -118,8 +101,7 @@ setup (void)
 #else
 
 #	error "unknown OS platform"
-#endif	// OS-specific initialization
-
+#endif /* OS-specific initialization */
 
 void ACE_Svc_Export
 dmsg_filter (const char *_FAR categories,
@@ -337,4 +319,4 @@ dmsg_opaque_full (char *_FAR label,
 #endif
 }
 
-#endif	// DEBUG && HAVE_VPRINTF
+#endif /* DEBUG && HAVE_VPRINTF */
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp
index 2ff63d31779..12e3c182122 100644
--- a/TAO/tao/decode.cpp
+++ b/TAO/tao/decode.cpp
@@ -20,10 +20,6 @@
 // 
 // ============================================================================
 
-#include <assert.h>
-#include <limits.h>
-#include <string.h>
-
 #include        "orb.h"
 #include	"cdr.h"
 #include	"giop.h"
@@ -280,7 +276,7 @@ TAO_Marshal_TypeCode::decode(
   CORBA_TypeCode_ptr parent = (CORBA_TypeCode_ptr) parent_typecode;
 
   // decode the "kind" field of the typecode
-  continue_decoding = stream->get_ulong ((CORBA_ULong) kind);
+  continue_decoding = stream->get_ulong (kind);
   if (continue_decoding == CORBA_B_TRUE)
     {
       tcp = (CORBA_TypeCode_ptr *) data;  // the data has to be a TypeCode_ptr
diff --git a/TAO/tao/deep_copy.cpp b/TAO/tao/deep_copy.cpp
index 4d4368d93c6..efb9125c8b4 100644
--- a/TAO/tao/deep_copy.cpp
+++ b/TAO/tao/deep_copy.cpp
@@ -26,10 +26,6 @@
 // 
 // ============================================================================
 
-#include <assert.h>
-#include <limits.h>
-#include <string.h>
-
 #include        "orb.h"
 #include	"cdr.h"
 #include	"giop.h"
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
index 8b01f5b64e1..272cf5647fd 100644
--- a/TAO/tao/deep_free.cpp
+++ b/TAO/tao/deep_free.cpp
@@ -28,10 +28,6 @@
 // 
 // ============================================================================
 
-#include <assert.h>
-#include <limits.h>
-#include <string.h>
-
 #include        "orb.h"
 #include	"cdr.h"
 #include	"giop.h"
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp
index 5f3c8030391..7af487697ae 100644
--- a/TAO/tao/encode.cpp
+++ b/TAO/tao/encode.cpp
@@ -20,10 +20,6 @@
 // 
 // ============================================================================
 
-#include <assert.h>
-#include <limits.h>
-#include <string.h>
-
 #include        "orb.h"
 #include	"cdr.h"
 #include        "giop.h"
diff --git a/TAO/tao/except.cpp b/TAO/tao/except.cpp
index 59c0aa0d299..57c7194d8cc 100644
--- a/TAO/tao/except.cpp
+++ b/TAO/tao/except.cpp
@@ -7,15 +7,8 @@
 // THREADING NOTE:  calling thread handles mutual exclusion policy
 // on all of these data structures.
 
-#include <assert.h>
-#include <limits.h>
-#include <string.h>
-#include <stdio.h>
-
+#include "orb.h"
 #include "ace/Log_Msg.h"
-
-#include <orb.h>
-
 #include "cdr.h"
 
 #include <initguid.h>
diff --git a/TAO/tao/giop.cpp b/TAO/tao/giop.cpp
index 8e531fe881f..e0ac6500cb2 100644
--- a/TAO/tao/giop.cpp
+++ b/TAO/tao/giop.cpp
@@ -40,20 +40,11 @@
 // error is detected when marshaling or unmarshaling, it should be
 // reported.
 
-#include <assert.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "orb.h"
 #include "ace/Log_Msg.h"
 #include "ace/SOCK_Stream.h"
-
-#include "orb.h"
-
 #include "orbobj.h"
 #include "factories.h"
-
 #include "cdr.h"
 #include "giop.h"
 
@@ -161,7 +152,7 @@ GIOP::send_message (CDR &stream,
       //      dmsg_filter (6, "wrote %d bytes to connection %d",
       //	   writelen, connection);
       dmsg_filter (6, "wrote %d bytes", writelen);
-#endif	// DEBUG
+#endif	/* DEBUG */
 
       assert ((writelen >= 0 
 	       && ((size_t)writelen) <= buflen) || writelen == -1);
@@ -660,7 +651,7 @@ GIOP::Invocation::start (CORBA_Environment &env)
       dexc (env, "invoke, lookup client endpoint");
       return;
     }
-#endif    
+#endif /* USE_OLD_CODE */
 
   // POLICY DECISION: If the client expects most agents to forward,
   // then it could try to make sure that it's been forwarded at least
@@ -1203,7 +1194,7 @@ GIOP::incoming_message (ACE_SOCK_Stream &peer,
 	    // NOTE: describe any service context, and how many bytes
 	    // of non-header data were sent.
 	  }
-#endif	// DEBUG
+#endif /* DEBUG */
 
 	// Verify that we're to dispatch the request within this
 	// particular process.
diff --git a/TAO/tao/iiopobj.cpp b/TAO/tao/iiopobj.cpp
index 571dc794563..26f3fe134b7 100644
--- a/TAO/tao/iiopobj.cpp
+++ b/TAO/tao/iiopobj.cpp
@@ -8,15 +8,10 @@
 // based implementation, and can neither be used by other kinds of
 // objref nor have a default implementation.
 
-#include	<assert.h>
-#include	<limits.h>
-#include	<orb.h>
-
+#include "orb.h"
 #include	<initguid.h>
-#include	<string.h>
-
-#include	<stub.h>
 
+#include	"stub.h"
 #include	"iiopobj.h"
 
 #if !defined(__ACE_INLINE__)
diff --git a/TAO/tao/iioporb.cpp b/TAO/tao/iioporb.cpp
index 2b67378bb70..f7576593a81 100644
--- a/TAO/tao/iioporb.cpp
+++ b/TAO/tao/iioporb.cpp
@@ -7,17 +7,9 @@
 // This includes objref stringification/destringification for IIOP
 // object references.
 
-#include	<assert.h>
-#include	<limits.h>
-#include	<string.h>
-#include	<orb.h>
-
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<ctype.h>
+#include	"orb.h"
 #include	<initguid.h>
-#include	<stub.h>
-
+#include	"stub.h"
 #include	"cdr.h"
 #include	"iioporb.h"
 #include	"iiopobj.h"
diff --git a/TAO/tao/interp.cpp b/TAO/tao/interp.cpp
index e3ddc3d6161..3827aaea3c7 100644
--- a/TAO/tao/interp.cpp
+++ b/TAO/tao/interp.cpp
@@ -66,10 +66,6 @@
 // only the data being fed to the interpreter must be protected
 // against concurrency.
 
-#include	<assert.h>
-#include	<limits.h>
-#include	<string.h>
-
 #include	"orb.h"
 #include	"cdr.h"
 
diff --git a/TAO/tao/invoke.cpp b/TAO/tao/invoke.cpp
index b0824d84c64..5aa2237114b 100644
--- a/TAO/tao/invoke.cpp
+++ b/TAO/tao/invoke.cpp
@@ -28,11 +28,6 @@
 // generate better code, which in some cases may be very hard to
 // unwind.
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-
 #include "orb.h"
 #include "cdr.h"
 #include "giop.h"
diff --git a/TAO/tao/marshal.cpp b/TAO/tao/marshal.cpp
index d39276bad39..d213ca7572c 100644
--- a/TAO/tao/marshal.cpp
+++ b/TAO/tao/marshal.cpp
@@ -19,10 +19,6 @@
 // 
 // ============================================================================
 
-#include <assert.h>
-#include <limits.h>
-#include <string.h>
-
 #include        "orb.h"
 #include        "align.h"
 #include	"cdr.h"
diff --git a/TAO/tao/nvlist.cpp b/TAO/tao/nvlist.cpp
index 52eb8c6379c..443d56a153d 100644
--- a/TAO/tao/nvlist.cpp
+++ b/TAO/tao/nvlist.cpp
@@ -4,11 +4,6 @@
 //
 // Implementation of Named Value List
 
-#include	<assert.h>
-#if !defined (VXWORKS)
-#include	<memory.h>
-#endif
-
 #include	"orb.h"
 #include        <initguid.h>
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index d341d29dc31..98735d3992c 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -18,8 +18,8 @@
 // Owen Rees (rtor), Guangxing Li (gxl) and Mike Beasley (mdrb).
 //
 
-#ifndef	_ORB_CONFIG_HH
-#define	_ORB_CONFIG_HH
+#if !defined (TAO_ORB_CONFIG_H)
+#define	TAO_ORB_CONFIG_H
 
 #include "ace/OS.h"
 
@@ -28,7 +28,7 @@
 //
 #if	defined (__WIN32__)
 #	define _WIN32
-#endif	// BC++ convention
+#endif	/* BC++ convention */
 
 /* Define if you have the <widec.h> header file.  */
 #if !defined(linux) && !defined(_WIN32) && !defined(VXWORKS)
@@ -105,14 +105,14 @@
 #if	!defined (_WINSOCKAPI_)
 	// Winsock added nonstandard APIs
 #	define	closesocket(s)		close(s)
-#endif	// _WINSOCKAPI_
+#endif	/* _WINSOCKAPI_ */
 #endif
 
 #ifdef	minor
 	// namespace pollution that's common on older UNIXes,
     // XXX this can't go here, "autoconf" wants to own #undef
 /* #	undef	minor */
-#endif	// minor
+#endif	/* minor */
 
 //
 // For Win16, near/far pointers reflect same/other segment addressing.
@@ -173,10 +173,4 @@ typedef	unsigned long pid_t;
 #	define SELECT_INT_STAR
 #endif
 
-#if !defined(ACE_INVALID_HANDLE)
-#  if !defined(HAVE_STRDUP)
-#    define strdup(s) strcpy ((char *)malloc (strlen (s) + 1), s)
-#  endif
-#endif
-
-#endif	// _ORB_CONFIG_HH
+#endif	/* TAO_ORB_CONFIG_H */
diff --git a/TAO/tao/orbobj.cpp b/TAO/tao/orbobj.cpp
index 4f77c2cff18..9ee14aefdda 100644
--- a/TAO/tao/orbobj.cpp
+++ b/TAO/tao/orbobj.cpp
@@ -9,11 +9,6 @@
 // component and have a loose table-driven coupling to ORB/protocol
 // library components.
 
-#include	<assert.h>
-#include	<limits.h>
-#include	<signal.h>
-#include	<string.h>
-
 #include	"orb.h"
 #include	"stub.h"
 #include	"iioporb.h"		// XXX
@@ -321,7 +316,7 @@ CORBA_BOA_ptr CORBA_ORB::BOA_init (int &argc,
   params->upcall (CORBA_BOA::dispatch);
   params->tablesize (tablesize);
 
-#if defined (ROA_NEED_REQ_KEY)
+#if defined (ROA_NEEDS_REQ_KEY)
  (void) ACE_Thread::keycreate (&req_key_);
 #endif
     
diff --git a/TAO/tao/principa.cpp b/TAO/tao/principa.cpp
index 6b6aaea4a3e..bcc05a9f4d0 100644
--- a/TAO/tao/principa.cpp
+++ b/TAO/tao/principa.cpp
@@ -5,11 +5,7 @@
 // ORB:		Principal identifier pseudo-objref
 //
 
-#include	<assert.h>
-#include	<limits.h>
-#include	<string.h>
-#include	<orb.h>
-
+#include	"orb.h"
 #include	<initguid.h>
 
 void
diff --git a/TAO/tao/roa.cpp b/TAO/tao/roa.cpp
index e0f4e4ca483..62f628b439e 100644
--- a/TAO/tao/roa.cpp
+++ b/TAO/tao/roa.cpp
@@ -9,7 +9,6 @@
 #include "params.h"
 #include "factories.h"
 #include "orbobj.h"
-
 #include <initguid.h>
 
 // Forward declarations...
@@ -38,9 +37,9 @@ ROA::init (CORBA_ORB_ptr parent,
       return 0;
     }
 
-#if defined (ROA_NEED_REQ_KEY)
+#if defined (ROA_NEEDS_REQ_KEY)
  (void) ACE_Thread::keycreate (&req_key_);
-#endif
+#endif /* ROA_NEEDS_REQ_KEY */
     
   ROA_ptr rp;
   ACE_NEW_RETURN (rp, ROA (parent, env), 0);
@@ -122,9 +121,9 @@ ROA::create (CORBA_OctetSeq &key,
   CORBA_String h = (char*)addr_.get_host_name ();
 
   data = new IIOP_Object (id, IIOP::ProfileBody (ver,
-                                                h,
-                                                addr_.get_port_number (),
-                                                key));
+						 h,
+						 addr_.get_port_number (),
+						 key));
   if (data != 0)
     env.clear ();
   else
@@ -155,7 +154,7 @@ ROA::get_key (CORBA_Object_ptr,
   return 0;
 }
 
-#if defined (ROA_NEED_REQ_KEY)
+#if defined (ROA_NEEDS_REQ_KEY)
 // return the target's key
 //
 // NOTE: as with all "in" parameters to a call, this memory is freed
@@ -181,7 +180,7 @@ ROA::get_client_principal (CORBA_Environment &env)
 
   return request_tsd->requesting_principal;
 }
-#endif
+#endif /* ROA_NEEd_REQ_KEY */
 
 // Used by method code to ask the OA to shut down.
 void
@@ -261,10 +260,6 @@ ROA::get_request (CORBA_BOA::dsi_handler handler,
 		  timeval *timeout,
 		  CORBA_Environment &env)
 {
-#if 0
-  server_endpoint *fd;
-#endif
-
   env.clear ();
 
   // Two bits of OA-private state need to be guarded by a critical
@@ -307,17 +302,19 @@ ROA::get_request (CORBA_BOA::dsi_handler handler,
     // Also, note that the underlying constraint of only allowing a
     // single thread to block_for_connection () call bubbles up here too.
 
-#ifdef	_POSIX_THREADS
-    static int		blocking;	// = 0
+#if defined (ACE_HAS_PTHREADS)
+    static int blocking;	// = 0
 
-    if (blocking) {
-      dmsg ("concurrent TCP_OA::get_request () calls");
-      env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO));
-      return;
-    } else
+    if (blocking) 
+      {
+	dmsg ("concurrent TCP_OA::get_request () calls");
+	env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO));
+	return;
+      } 
+    else
       blocking = 1;
 
-#endif	// _POSIX_THREADS
+#endif /* ACE_HAS_PTHREADS */
 
     // Get a connection and hand it to method code.
     //
@@ -360,13 +357,9 @@ ROA::get_request (CORBA_BOA::dsi_handler handler,
     // handle GIOP::CancelRequest messages.
     //
 
-#if 0
-    fd = endpoint->block_for_connection (do_thr_create, timeout, env);
-#endif
-
-#ifdef	_POSIX_THREADS
+#if defined (ACE_HAS_PTHREADS)
     blocking = 0;
-#endif	// _POSIX_THREADS
+#endif /* ACE_HAS_PTHREADS */
 
     if (env.exception () != 0) 
       {
@@ -391,7 +384,7 @@ ROA::get_request (CORBA_BOA::dsi_handler handler,
   //
   if (do_thr_create) 
     {
-#ifdef	_POSIX_THREADS
+#ifdef	ACE_HAS_PTHREADS
       // Want to handle it in another thread.  That means handing off
       // a bunch of information to that thread and then having it do
       // the work ... the simplest alternative is to heap-allocate the
@@ -432,7 +425,7 @@ ROA::get_request (CORBA_BOA::dsi_handler handler,
 	     strerror (errcode));
       delete context_;
 
-#endif	// _POSIX_THREADS
+#endif /* ACE_HAS_PTHREADS */
     }
 
   // Handle it in this thread.  We can do it without any need to
@@ -534,9 +527,9 @@ request_dispatcher (GIOP::RequestHeader &req,
   //
   svr_req._opname = req.operation;
 
-#if defined (ROA_NEED_REQ_KEY)
+#if defined (ROA_NEEDS_REQ_KEY)
  (void) ACE_Thread::setspecific (p->oa ().req_key_, &req);
-#endif
+#endif /* ROA_NEEDS_REQ_KEY */
 
   CORBA_BOA_ptr oa = p->oa ();
   CORBA_BOA::dsi_handler ptmf = helper->skeleton_;
@@ -649,9 +642,9 @@ request_forwarder (opaque &target_key,
     return GIOP::OBJECT_FORWARD;
 }
 
-#if ! defined (__ACE_INLINE__)
+#if !defined (__ACE_INLINE__)
 #  include "roa.i"
-#endif
+#endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 // Direct
diff --git a/TAO/tao/roa.h b/TAO/tao/roa.h
index 6e26e0de2d0..99771cf3ec7 100644
--- a/TAO/tao/roa.h
+++ b/TAO/tao/roa.h
@@ -72,10 +72,10 @@ public:
   // SHOULD PROBABLY MOVE TO BOA!
 
   // @@ Please make sure that all macros start with TAO_ ...
-#if defined (ROA_NEED_REQ_KEY)
+#if defined (ROA_NEEDS_REQ_KEY)
   CORBA_OctetSeq *get_target_key (CORBA_Environment &env);
   CORBA_Principal_ptr get_client_principal (CORBA_Environment &env);
-#endif /* RAO_NEED_REQ_KEY */
+#endif /* ROA_NEEDSS_REQ_KEY */
 
   virtual int handle_message (TAO_Dispatch_Context &context,
                               CORBA_Environment &env);
@@ -152,7 +152,7 @@ private:
   ACE_Thread_Mutex com_lock_;	
   // Locks critical sections in COM-related code (was tcpoa_lock).
 
-#if defined (ROA_NEED_REQ_KEY)
+#if defined (ROA_NEEDS_REQ_KEY)
   ACE_thread_key_t req_key_;	
   // Key into TSS for a thread's request header
 #endif
diff --git a/TAO/tao/t-sizes.cpp b/TAO/tao/t-sizes.cpp
index 8653ea4196d..99e47ecc678 100644
--- a/TAO/tao/t-sizes.cpp
+++ b/TAO/tao/t-sizes.cpp
@@ -1,4 +1,3 @@
-#include <iostream.h>
 #include "orb.h"
 
 #define SHOWSIZE(t) cout << "sizeof(" #t ") = " << sizeof(t) << endl;
diff --git a/TAO/tao/t-xdr.cpp b/TAO/tao/t-xdr.cpp
index 8a4d82132bd..cc9eb783c76 100644
--- a/TAO/tao/t-xdr.cpp
+++ b/TAO/tao/t-xdr.cpp
@@ -8,13 +8,7 @@
 // It's suitable only for a simple performance test just now ...
 
 
-#include	<string.h>
-#include	<unistd.h>
-
-#include	<sys/types.h>
-#include	<sys/time.h>
-
-#include	<orb.h>
+#include	"orb.h"
 
 #if defined(HAVE_WIDEC_H)
 #  include	<widec.h>
diff --git a/TAO/tao/tc_const.cpp b/TAO/tao/tc_const.cpp
index 2e13e858441..8b898a29360 100644
--- a/TAO/tao/tc_const.cpp
+++ b/TAO/tao/tc_const.cpp
@@ -14,10 +14,7 @@
 // THREADING NOTE:  no issues, these are immutable constants
 //
 
-#include	<assert.h>
-#include	<limits.h>
-#include	<string.h>
-#include	<orb.h>
+#include	"orb.h"
 
 // Null and void
 
diff --git a/TAO/tao/typecode.cpp b/TAO/tao/typecode.cpp
index 7ca3b26575e..8d67970376e 100644
--- a/TAO/tao/typecode.cpp
+++ b/TAO/tao/typecode.cpp
@@ -16,24 +16,16 @@
 // only mutual exclusion relates to reference counting and
 // construction.
 
-#include <assert.h>
-#include <limits.h>
-#include <string.h>
-
-#if !defined (VXWORKS)
-#include <memory.h>
-#endif
-#include <sys/types.h>
-
 #include "orb.h"
 #include "cdr.h"
 #include <initguid.h>
 
-size_t calc_key_union_attributes(CDR *stream,
-				     size_t &alignment,
-				     size_t &size_with_pad,
-				     CORBA_Environment	&env);
-
+// @@ This is a botch...
+size_t 
+calc_key_union_attributes (CDR *stream,
+			   size_t &alignment,
+			   size_t &size_with_pad,
+			   CORBA_Environment	&env);
 
 // constructor for the private state
 TC_PRV_State::TC_PRV_State()
diff --git a/TAO/tao/xdr.h b/TAO/tao/xdr.h
index 0a3ef104e46..677c2f8d20e 100644
--- a/TAO/tao/xdr.h
+++ b/TAO/tao/xdr.h
@@ -17,8 +17,8 @@
 // 
 // ============================================================================
 
-#ifndef	_xdr_hh
-#define	_xdr_hh
+#if !defined (TAO_XDR_H)
+#define	TAO_XDR_H
 
 #include	<sys/types.h>
 #include	<netinet/in.h>
@@ -285,4 +285,4 @@ XDR_stream::put32 (CORBA_Long word) THROWS_NOTHING
     return CORBA_B_FALSE;
 }
 
-#endif	// _xdr_hh
+#endif	/* TAO_XDR_H */